[Groonga-commit] ranguba/rroonga at b367187 [master] Remove needless explicit "rubygems" requires

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Apr 15 12:55:58 JST 2015


Kouhei Sutou	2015-04-15 12:55:58 +0900 (Wed, 15 Apr 2015)

  New Revision: b367187ca4ffd57681c6b0963a6d2f6cdded00e3
  https://github.com/ranguba/rroonga/commit/b367187ca4ffd57681c6b0963a6d2f6cdded00e3

  Message:
    Remove needless explicit "rubygems" requires

  Modified files:
    example/bookmark.rb
    example/index-html.rb
    example/search/config.ru
    ext/groonga/extconf.rb

  Modified: example/bookmark.rb (+1 -6)
===================================================================
--- example/bookmark.rb    2015-04-15 12:55:44 +0900 (2cf92d4)
+++ example/bookmark.rb    2015-04-15 12:55:58 +0900 (37751e1)
@@ -7,12 +7,7 @@ groonga_lib_dir = File.join(base_dir, "lib")
 $LOAD_PATH.unshift(groonga_ext_dir)
 $LOAD_PATH.unshift(groonga_lib_dir)
 
-begin
-  require "groonga"
-rescue LoadError
-  require "rubygems"
-  require "groonga"
-end
+require "groonga"
 
 require "time"
 

  Modified: example/index-html.rb (+0 -1)
===================================================================
--- example/index-html.rb    2015-04-15 12:55:44 +0900 (a8c071e)
+++ example/index-html.rb    2015-04-15 12:55:58 +0900 (00e0279)
@@ -11,7 +11,6 @@ base_directory = Pathname(__FILE__).dirname + ".."
 $LOAD_PATH.unshift((base_directory + "ext").to_s)
 $LOAD_PATH.unshift((base_directory + "lib").to_s)
 
-require "rubygems"
 require "groonga"
 require "nokogiri"
 

  Modified: example/search/config.ru (+0 -1)
===================================================================
--- example/search/config.ru    2015-04-15 12:55:44 +0900 (1264f42)
+++ example/search/config.ru    2015-04-15 12:55:58 +0900 (44405df)
@@ -4,7 +4,6 @@ base_dir = File.join(File.dirname(__FILE__), "..", "..")
 $LOAD_PATH.unshift(File.join(base_dir, "ext"))
 $LOAD_PATH.unshift(File.join(base_dir, "lib"))
 
-require "rubygems"
 require "rack"
 require "groonga"
 

  Modified: ext/groonga/extconf.rb (+1 -6)
===================================================================
--- ext/groonga/extconf.rb    2015-04-15 12:55:44 +0900 (95fd45b)
+++ ext/groonga/extconf.rb    2015-04-15 12:55:58 +0900 (17187d9)
@@ -95,12 +95,7 @@ def download(url)
 end
 
 def extract_zip(filename, destrination_dir)
-  begin
-    require "archive/zip"
-  rescue LoadError
-    require "rubygems"
-    require "archive/zip"
-  end
+  require "archive/zip"
 
   Archive::Zip.extract(filename, destrination_dir)
 rescue LoadError
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index