[Git][noosfero/noosfero][master] 2 commits: plugins: drop `require 'rubygems'` statements

[Antonio Terceiro]

Antonio Terceiro pushed to branch master at Noosfero / noosfero


Commits:
41bd7519 by Antonio Terceiro at 2015-10-05T09:19:42Z
plugins: drop `require 'rubygems'` statements

On Ruby 1.9+ these are no-ops

- - - - -
9c497c0b by Antonio Terceiro at 2015-10-05T09:22:01Z
plugins/ldap: add missing dependency declaration

- - - - -


13 changed files:

- plugins/lattes_curriculum/lib/html_parser.rb
- plugins/ldap/Gemfile
- plugins/ldap/dependencies.rb
- plugins/ldap/lib/ldap_authentication.rb
- plugins/solr/dependencies.rb
- plugins/solr/install.rb
- plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile
- plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
- plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
- plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
- plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
- plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
- plugins/spaminator/dependencies.rb


Changes:

=====================================
plugins/lattes_curriculum/lib/html_parser.rb
=====================================
--- a/plugins/lattes_curriculum/lib/html_parser.rb
+++ b/plugins/lattes_curriculum/lib/html_parser.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'nokogiri'
 require 'open-uri'
 


=====================================
plugins/ldap/Gemfile
=====================================
--- a/plugins/ldap/Gemfile
+++ b/plugins/ldap/Gemfile
@@ -1 +1,2 @@
 gem "net-ldap"
+gem "magic", ">= 0.2.8"


=====================================
plugins/ldap/dependencies.rb
=====================================
--- a/plugins/ldap/dependencies.rb
+++ b/plugins/ldap/dependencies.rb
@@ -1,2 +1 @@
-require 'rubygems'
 require 'net/ldap'


=====================================
plugins/ldap/lib/ldap_authentication.rb
=====================================
--- a/plugins/ldap/lib/ldap_authentication.rb
+++ b/plugins/ldap/lib/ldap_authentication.rb
@@ -15,7 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'rubygems'
 require 'iconv'
 require 'net/ldap'
 require 'net/ldap/dn'


=====================================
plugins/solr/dependencies.rb
=====================================
--- a/plugins/solr/dependencies.rb
+++ b/plugins/solr/dependencies.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'active_record'
 require "#{File.dirname(__FILE__)}/lib/acts_as_searchable"
 require "#{File.dirname(__FILE__)}/lib/acts_as_faceted"


=====================================
plugins/solr/install.rb
=====================================
--- a/plugins/solr/install.rb
+++ b/plugins/solr/install.rb
@@ -1,5 +1,4 @@
 #raise "Not ready yet. Some tests are failing."
-require 'rubygems'
 require 'rake'
 
 tasks_dir = File.join(File.dirname(__FILE__), 'vendor', 'plugins', 'acts_as_solr_reloaded', 'lib', 'tasks', '*.rake')


=====================================
plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile
=====================================
--- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile
+++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'


=====================================
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
=====================================
--- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
+++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
@@ -1,5 +1,4 @@
 dir = File.dirname(__FILE__)
-require 'rubygems'
 require 'rake'
 require 'net/http'
 require 'active_record'


=====================================
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
=====================================
--- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
+++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
@@ -16,7 +16,6 @@ end
 begin
   
   # If we can load rubygems and libxml-ruby...
-  require 'rubygems'
   require 'xml/libxml'
   raise "acts_as_solr requires libxml-ruby 0.7 or greater" unless XML::Node.public_instance_methods.collect{|x| x.to_sym}.include?(:attributes)
 


=====================================
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
=====================================
--- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
+++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake'
 dir = File.dirname(__FILE__)
 $:.unshift("#{dir}/lib")


=====================================
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
=====================================
--- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
+++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'


=====================================
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
=====================================
--- a/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
+++ b/plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
@@ -1,7 +1,6 @@
 dir = File.dirname(__FILE__)
 $:.unshift(File.join(File.expand_path(dir), "..", "..", "lib"))
 
-require 'rubygems'
 require 'test/unit'
 require 'acts_as_solr'
 require 'mocha'


=====================================
plugins/spaminator/dependencies.rb
=====================================
--- a/plugins/spaminator/dependencies.rb
+++ b/plugins/spaminator/dependencies.rb
@@ -1,2 +1 @@
-require 'rubygems'
 require 'benchmark'



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/e2feaba3c19d38a977898fe3c7367361bddb06eb...9c497c0bb53de7df26c76e7bdb4dfb639cd06c5a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151005/02d115bb/attachment.html>