make basic gem installation work. closes #88

radiant · Jun 18, 2010 · 7b0c3ae · 7b0c3ae
1 parent 38d49d0
commit 7b0c3ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/radiant/extension/script.rb b/lib/radiant/extension/script.rb
@@ -182,20 +182,25 @@ def checkout_command
   end
 
   class Gem < Download
+    def gem_name(name)
+      name.gsub(/-\d+\.\d+\.\d+(.+)?\.gem/, '')
+    end
+
     def download
       # Don't download the gem if it's already installed
+      extension = gem_name(filename)
       begin
-        gem filename.split('-').first
+        gem extension
       rescue ::Gem::LoadError
         super
-        `gem install #{filename}`
+        `gem install #{extension}`
       end
     end
 
     def unpack
       output = nil
       cd(Dir.tmpdir) do
-        output = `gem unpack #{filename.split('-').first}`
+        output = `gem unpack #{gem_name(filename)}`
       end
       self.path = output.match(/'(.*)'/)[1]
     end

diff --git a/spec/lib/radiant/extension/script_spec.rb b/spec/lib/radiant/extension/script_spec.rb
@@ -398,7 +398,7 @@
     File.should_receive(:open).with(/example-1.0.0\.gem/, 'w').and_yield(@file)
     @gem.should_receive(:open).and_return(StringIO.new('test'))
     @file.should_receive(:write).with('test')
-    @gem.should_receive(:`).with("gem install example-1.0.0.gem")
+    @gem.should_receive(:`).with("gem install example")
     @gem.download
   end