upgrade rubygems/setup code

whymirror · Mar 15, 2012 · 9c23f10 · 9c23f10
1 parent 58fd5b6
commit 9c23f10
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/lib/shoes/setup.rb b/lib/shoes/setup.rb
@@ -24,12 +24,13 @@ class Shoes::Setup
 
   def self.init
     gem_reset
-    install_sources if Gem.source_index.find_name('sources').empty?
+    Gem::Specification.find_by_name('sources')
+  rescue Gem::LoadError
+    install_sources
   end
 
   def self.gem_reset
     Gem.use_paths(GEM_DIR, [GEM_DIR, GEM_CENTRAL_DIR])
-    Gem.source_index.refresh!
   end
 
   def self.setup_app(setup)
@@ -97,20 +98,17 @@ def no_steps?
   def gem name, version = nil
     arg = "#{name} #{version}".strip
     name, version = arg.split(/\s+/, 2)
-    if Gem.source_index.find_name(name, version).empty?
+    Gem::Specification.find_by_name(name, version)
-      @steps << [:gem, arg]
+  rescue Gem::LoadError
-    else
+    @steps << [:gem, arg]
-      activate_gem(name, version)
-    end
   end
 
   def source uri
     @steps << [:source, uri]
   end
 
   def activate_gem(name, version)
-    gem = Gem.source_index.find_name(name, version).first
+    Gem::Specification.find_by_name(name, version).activate
-    Gem.activate(gem.name, "= #{gem.version}")
   end
 
   def start(app)
@@ -125,7 +123,9 @@ def start(app)
         name, version = arg.split(/\s+/, 2)
         count += 1
         ui.say "Looking for #{name}"
-        if Gem.source_index.find_name(name, version).empty?
+        begin
+          Gem::Specification.find_by_name(name, version)
+        rescue Gem::LoadError
           ui.title "Installing #{name}"
           installer = Gem::DependencyInstaller.new
           begin