ref: refs/heads/master
commit 5ee03e32c220912faac67bc392cf3b9b82690c1d
Author: Ladislav Slezak
Date: Mon Oct 26 09:39:29 2009 +0100
do not require rubygems
see http://weblog.rubyonrails.org/2009/9/1/gem-packaging-best-practices
section "Don’t depend on rubygems"
---
Rakefile | 1 -
.../eulas/test/functional/eulas_controller_test.rb | 1 -
.../test/functional/language_controller_test.rb | 1 -
.../network/test/functional/dns_controller_test.rb | 1 -
.../test/functional/hostname_controller_test.rb | 1 -
.../test/functional/interfaces_controller_test.rb | 1 -
.../test/functional/routes_controller_test.rb | 1 -
.../test/functional/patches_controller_test.rb | 1 -
plugins/patches/test/packagekit.rb | 1 -
.../test/functional/sambashares_controller_test.rb | 1 -
plugins/samba_server/test/unit/samba_share_test.rb | 1 -
.../test/functional/services_controller_test.rb | 1 -
.../test/functional/status_controller_test.rb | 1 -
.../test/functional/systemtime_controller_test.rb | 1 -
.../users/test/functional/users_controller_test.rb | 1 -
plugins/users/test/unit/user_test.rb | 1 -
webservice-tasks/lib/tasks/restdoc.rake | 4 +---
webservice/app/models/account.rb | 1 -
.../plugin_test/functional/plugin_index_test.rb | 1 -
.../plugin_test/functional/plugin_show_test.rb | 1 -
.../test/functional/permissions_controller_test.rb | 1 -
webservice/test/plugin_basic_tests.rb | 1 -
22 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/Rakefile b/Rakefile
index 9702513..12ba43c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,6 @@ tracing = (Rake.application.options.trace)?"--trace":""
verbose = (Rake.application.options.verbose)?"--verbose":""
require 'rake'
-require 'rubygems'
def sudo(cmd)
puts "#{cmd}"
diff --git a/plugins/eulas/test/functional/eulas_controller_test.rb b/plugins/eulas/test/functional/eulas_controller_test.rb
index 2a851b3..b78a095 100644
--- a/plugins/eulas/test/functional/eulas_controller_test.rb
+++ b/plugins/eulas/test/functional/eulas_controller_test.rb
@@ -1,7 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
require 'license'
-require 'rubygems'
require 'mocha'
class EulasControllerTest < ActionController::TestCase
diff --git a/plugins/language/test/functional/language_controller_test.rb b/plugins/language/test/functional/language_controller_test.rb
index bb934b0..160043d 100644
--- a/plugins/language/test/functional/language_controller_test.rb
+++ b/plugins/language/test/functional/language_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require 'mocha'
require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
diff --git a/plugins/network/test/functional/dns_controller_test.rb b/plugins/network/test/functional/dns_controller_test.rb
index 152bdf9..a915ffe 100644
--- a/plugins/network/test/functional/dns_controller_test.rb
+++ b/plugins/network/test/functional/dns_controller_test.rb
@@ -1,7 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
#require 'dns'
-require 'rubygems'
require 'mocha'
require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
diff --git a/plugins/network/test/functional/hostname_controller_test.rb b/plugins/network/test/functional/hostname_controller_test.rb
index a28d07d..4b26c69 100644
--- a/plugins/network/test/functional/hostname_controller_test.rb
+++ b/plugins/network/test/functional/hostname_controller_test.rb
@@ -1,7 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
require 'hostname'
-require 'rubygems'
require 'mocha'
require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
diff --git a/plugins/network/test/functional/interfaces_controller_test.rb b/plugins/network/test/functional/interfaces_controller_test.rb
index c2043cf..90eb947 100644
--- a/plugins/network/test/functional/interfaces_controller_test.rb
+++ b/plugins/network/test/functional/interfaces_controller_test.rb
@@ -1,7 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
require 'interface'
-require 'rubygems'
require 'mocha'
require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
diff --git a/plugins/network/test/functional/routes_controller_test.rb b/plugins/network/test/functional/routes_controller_test.rb
index 889189f..da8631a 100644
--- a/plugins/network/test/functional/routes_controller_test.rb
+++ b/plugins/network/test/functional/routes_controller_test.rb
@@ -1,7 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
require 'route'
-require 'rubygems'
require 'mocha'
require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
diff --git a/plugins/patches/test/functional/patches_controller_test.rb b/plugins/patches/test/functional/patches_controller_test.rb
index 0fce115..26cdd9c 100644
--- a/plugins/patches/test/functional/patches_controller_test.rb
+++ b/plugins/patches/test/functional/patches_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
require 'mocha'
diff --git a/plugins/patches/test/packagekit.rb b/plugins/patches/test/packagekit.rb
index ab1103a..ebb50b9 100644
--- a/plugins/patches/test/packagekit.rb
+++ b/plugins/patches/test/packagekit.rb
@@ -3,7 +3,6 @@
#
# *** This test requires a 'live' system with D-Bus running ***
#
-require "rubygems"
require "dbus"
require File.join(File.dirname(__FILE__), "test_helper")
diff --git a/plugins/samba_server/test/functional/sambashares_controller_test.rb b/plugins/samba_server/test/functional/sambashares_controller_test.rb
index 8fc07dd..d7ef010 100644
--- a/plugins/samba_server/test/functional/sambashares_controller_test.rb
+++ b/plugins/samba_server/test/functional/sambashares_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
require 'mocha'
diff --git a/plugins/samba_server/test/unit/samba_share_test.rb b/plugins/samba_server/test/unit/samba_share_test.rb
index 8185eaf..095e689 100644
--- a/plugins/samba_server/test/unit/samba_share_test.rb
+++ b/plugins/samba_server/test/unit/samba_share_test.rb
@@ -2,7 +2,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "yast_service"
require "samba_share"
require 'mocha'
diff --git a/plugins/services/test/functional/services_controller_test.rb b/plugins/services/test/functional/services_controller_test.rb
index cfc04ff..26ad1e1 100644
--- a/plugins/services/test/functional/services_controller_test.rb
+++ b/plugins/services/test/functional/services_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
require 'mocha'
diff --git a/plugins/status/test/functional/status_controller_test.rb b/plugins/status/test/functional/status_controller_test.rb
index e75c085..17ee388 100644
--- a/plugins/status/test/functional/status_controller_test.rb
+++ b/plugins/status/test/functional/status_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
require 'mocha'
require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
diff --git a/plugins/time/test/functional/systemtime_controller_test.rb b/plugins/time/test/functional/systemtime_controller_test.rb
index 8e3d39a..d963310 100644
--- a/plugins/time/test/functional/systemtime_controller_test.rb
+++ b/plugins/time/test/functional/systemtime_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require 'systemtime'
require "scr"
require 'mocha'
diff --git a/plugins/users/test/functional/users_controller_test.rb b/plugins/users/test/functional/users_controller_test.rb
index fdd7067..18f981a 100644
--- a/plugins/users/test/functional/users_controller_test.rb
+++ b/plugins/users/test/functional/users_controller_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
require "yast_service"
require 'mocha'
diff --git a/plugins/users/test/unit/user_test.rb b/plugins/users/test/unit/user_test.rb
index 87bc737..d85872f 100644
--- a/plugins/users/test/unit/user_test.rb
+++ b/plugins/users/test/unit/user_test.rb
@@ -1,6 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "yast_service"
require 'mocha'
require 'pp'
diff --git a/webservice-tasks/lib/tasks/restdoc.rake b/webservice-tasks/lib/tasks/restdoc.rake
index c0dba55..0de7e2d 100644
--- a/webservice-tasks/lib/tasks/restdoc.rake
+++ b/webservice-tasks/lib/tasks/restdoc.rake
@@ -8,9 +8,7 @@ require 'rake'
desc "Generate REST API documentation using 'restility'"
task :restdoc do
- require 'rubygems'
- if Gem.available? 'restility'
-
+ if File.exist? '/usr/bin/restility'
# input file in root plugin directory
api_file = 'restdoc/api.txt'
# output directory
diff --git a/webservice/app/models/account.rb b/webservice/app/models/account.rb
index 9be2d08..8c1be70 100644
--- a/webservice/app/models/account.rb
+++ b/webservice/app/models/account.rb
@@ -1,7 +1,6 @@
# generated by technoweenie's restful-authentication:
# http://github.com/technoweenie/restful-authentication/tree/master
-require 'rubygems'
require 'session'
require "rpam"
diff --git a/webservice/lib/tasks/plugin_test/functional/plugin_index_test.rb b/webservice/lib/tasks/plugin_test/functional/plugin_index_test.rb
index d799c8e..8cfc8ef 100644
--- a/webservice/lib/tasks/plugin_test/functional/plugin_index_test.rb
+++ b/webservice/lib/tasks/plugin_test/functional/plugin_index_test.rb
@@ -21,7 +21,6 @@ end
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
class Module
diff --git a/webservice/lib/tasks/plugin_test/functional/plugin_show_test.rb b/webservice/lib/tasks/plugin_test/functional/plugin_show_test.rb
index 4b2a18d..e767da4 100644
--- a/webservice/lib/tasks/plugin_test/functional/plugin_show_test.rb
+++ b/webservice/lib/tasks/plugin_test/functional/plugin_show_test.rb
@@ -21,7 +21,6 @@ end
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
class Module
diff --git a/webservice/test/functional/permissions_controller_test.rb b/webservice/test/functional/permissions_controller_test.rb
index d6ae26a..a4ca07a 100644
--- a/webservice/test/functional/permissions_controller_test.rb
+++ b/webservice/test/functional/permissions_controller_test.rb
@@ -5,7 +5,6 @@
require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
require 'test/unit'
-require 'rubygems'
require "scr"
require 'mocha'
diff --git a/webservice/test/plugin_basic_tests.rb b/webservice/test/plugin_basic_tests.rb
index 03c69f5..f51c7dc 100644
--- a/webservice/test/plugin_basic_tests.rb
+++ b/webservice/test/plugin_basic_tests.rb
@@ -15,7 +15,6 @@
# This example show basic testing of controller of plugin
# require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
# require 'test/unit'
-# require 'rubygems'
# require 'mocha'
# require File.expand_path( File.join("test","plugin_basic_tests"), RailsParent.parent )
#
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
