merb-gen 1.0.5 → 1.0.6

data/lib/generators/templates/application/common/merb_thor/gem_ext.rb

@@ -34,7 +34,7 @@ class ::Gem::Uninstaller
     yield
     
     class << Gem::DefaultUserInteraction.ui
-      undef :say
+      remove_method :say
     end 
   end
   

data/lib/generators/templates/application/common/merb_thor/ops.rb

@@ -14,6 +14,7 @@ module Thor::Tasks
       end
 
       def dependency(name, *versions)
+        versions.pop if versions.last.is_a?(Hash)
         @dependencies << [name, versions]
       end
     end
@@ -23,13 +24,14 @@ module Thor::Tasks
         @idx.load_gems_in("gems/specifications")
 
         @list.map do |name, versions|
-          dep = @idx.find_name(name).last
-          unless dep
+          dep = ::Gem::Dependency.new(name, versions)
+          spec = @idx.search(dep).last
+          unless spec
             self.class.error "A required dependency #{dep} was not found"
             self.class.rollback_trans
           end
-          deps = dep.recursive_dependencies(dep, @idx)
-          [dep] + deps
+          deps = spec.recursive_dependencies(dep, @idx)
+          [spec] + deps
         end.flatten.uniq
       end
       
@@ -68,6 +70,9 @@ module Thor::Tasks
       
       private
       def _install(dep)
+        @idx.load_gems_in("gems/specifications")
+        return if @idx.search(dep).last
+        
         installer = ::Gem::DependencyInstaller.new(
           :bin_dir => Dir.pwd / "bin",
           :install_dir => Dir.pwd / "gems",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater