merb-gen 1.0.7 → 1.0.7.1

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

@@ -49,6 +49,10 @@ module Gem
   end
   
   class MultiSourceIndex
+    # Used by merb.thor to confirm; not needed when MSI is in use
+    def load_gems_in(*args)
+    end
+    
     def search(*args)
       try = MAIN_INDEX.search(*args)
       return try unless try.empty?

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

@@ -1,8 +1,6 @@
 require "erb"
 
 Gem.pre_install_hooks.push(proc do |installer|
-  $INSTALLING << installer.spec
-  
   unless File.file?(installer.bin_dir / "common.rb")
     FileUtils.mkdir_p(installer.bin_dir)
     FileUtils.cp(File.dirname(__FILE__) / "common.rb", installer.bin_dir / "common.rb")
@@ -14,7 +12,7 @@ Gem.pre_install_hooks.push(proc do |installer|
     dep = Gem::Dependency.new(name, versions)
     unless dep.version_requirements.satisfied_by?(installer.spec.version)
       error "Cannot install #{installer.spec.full_name} " \
-            "for #{$INSTALLING.map {|x| x.full_name}.join(", ")}; " \
+            "for #{$INSTALLING}; " \
             "you required #{dep}"
       ::Thor::Tasks::Merb::Gem.rollback_trans
       exit!
@@ -58,7 +56,6 @@ class ::Gem::Uninstaller
 end
 
 Gem.post_install_hooks.push(proc do |installer|
-  $INSTALLING.pop
   source_index = installer.instance_variable_get("@source_index")
   ::Gem::Uninstaller._uninstall_others(
     source_index, installer.spec.name, installer.spec.version
@@ -84,7 +81,11 @@ class ::Gem::SpecFetcher
   def fetch(dependency, all = false, matching_platform = true)
     idx = Gem::SourceIndex.from_installed_gems
     
-    dep = idx.search(dependency).sort.last
+    reqs = dependency.version_requirements.requirements
+    
+    if reqs.size == 1 && reqs[0][0] == "="
+      dep = idx.search(dependency).sort.last
+    end
     
     if dep
       file = dep.loaded_from.dup

data/lib/generators/templates/application/common/merb_thor/main.thor

@@ -119,7 +119,7 @@ module Merb
         end
         
         rescue_failures do
-          $INSTALLING = []
+          $INSTALLING = dep
           _install(dep)
         end
       end

data/lib/generators/thor.rb

@@ -10,7 +10,7 @@ module Merb
       end
 
       def destination_root
-        File.join(@destination_root, 'tasks')
+        File.join(@destination_root)
       end
 
       def common_templates_dir
@@ -18,9 +18,14 @@ module Merb
                                    'templates', 'application', 'common'))
       end
 
+      file :common_file do |file|
+        file.source = File.join(common_templates_dir, "merb_thor", "common.rb")
+        file.destination = File.join("bin", "common.rb")
+      end
+
       directory :thor_file do |directory|
         directory.source = File.join(common_templates_dir, "merb_thor")
-        directory.destination = File.join("merb.thor")
+        directory.destination = File.join("tasks", "merb.thor")
       end
     end
     add :thor,   ThorGenerator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.7.1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-28 00:00:00 -08:00
+date: 2008-12-31 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.7
+        version: 1.0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater