lib/generators/thor.rb in merb-gen-1.0.7 vs lib/generators/thor.rb in merb-gen-1.0.7.1

@@ -8,20 +8,25 @@
       def self.source_root
         File.join(super, 'application', 'common', 'merb_thor')
       end
 
       def destination_root
-        File.join(@destination_root, 'tasks')
+        File.join(@destination_root)
       end
 
       def common_templates_dir
         File.expand_path(File.join(File.dirname(__FILE__),
                                    '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
   end
 end