rubigen 1.4.0 → 1.5.0

data/lib/rubigen/commands.rb

@@ -39,6 +39,7 @@ module RubiGen
       # Replay action manifest.  RewindBase subclass rewinds manifest.
       def invoke!
         manifest.replay(self)
+        after_generate
       end
 
       def dependency(generator_name, args, runtime_options = {})
@@ -56,6 +57,17 @@ module RubiGen
       end
 
       protected
+        def current_migration_number
+          Dir.glob("#{RAILS_ROOT}/#{@migration_directory}/[0-9]*_*.rb").inject(0) do |max, file_path|
+            n = File.basename(file_path).split('_', 2).first.to_i
+            if n > max then n else max end
+          end
+        end
+           
+        def next_migration_number
+          current_migration_number + 1
+        end
+             
         def migration_directory(relative_path)
           directory(@migration_directory = relative_path)
         end
@@ -68,19 +80,12 @@ module RubiGen
           not existing_migrations(file_name).empty?
         end
 
-        def current_migration_number
-          Dir.glob("#{@migration_directory}/[0-9]*.rb").inject(0) do |max, file_path|
-            n = File.basename(file_path).split('_', 2).first.to_i
-            if n > max then n else max end
-          end
-        end
-
-        def next_migration_number
-          current_migration_number + 1
-        end
-
         def next_migration_string(padding = 3)
-          "%.#{padding}d" % next_migration_number
+          if ActiveRecord::Base.timestamped_migrations
+            Time.now.utc.strftime("%Y%m%d%H%M%S")
+          else
+            "%.#{padding}d" % next_migration_number
+          end
         end
 
         def gsub_file(relative_destination, regexp, *args, &block)
@@ -92,29 +97,39 @@ module RubiGen
       private
         # Ask the user interactively whether to force collision.
         def force_file_collision?(destination, src, dst, file_options = {}, &block)
-          $stdout.print "overwrite #{destination}? [Ynaiqd] "
-          $stdout.flush
-          case $stdin.gets
-            when /d/i
+          stdout.print "overwrite #{destination}? (enter \"h\" for help) [Ynaiqd] "
+          stdout.flush
+          case $stdin.gets.chomp
+            when /\Ad\z/i
               Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
                 temp.write render_file(src, file_options, &block)
                 temp.rewind
-                $stdout.stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
+                stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
               end
               stdout.puts "retrying"
               raise 'retry diff'
-            when /a/i
-              $stdout.stdout.puts "forcing #{spec.name}"
+            when /\Aa\z/i
+              stdout.puts "forcing #{spec.name}"
               options[:collision] = :force
-            when /i/i
-              $stdout.stdout.puts "ignoring #{spec.name}"
+            when /\Ai\z/i
+              stdout.puts "ignoring #{spec.name}"
               options[:collision] = :skip
-            when /q/i
-              $stdout.stdout.puts "aborting #{spec.name}"
+            when /\Aq\z/i
+              stdout.puts "aborting #{spec.name}"
               raise SystemExit
-            when /n/i then :skip
-            when /y/i then :force
-            else force_file_collision?(destination, src, dst, file_options, &block)
+            when /\An\z/i then :skip
+            when /\Ay\z/i then :force
+            else
+              $stdout.puts <<-HELP.gsub(/^              /, '')
+              Y - yes, overwrite
+              n - no, do not overwrite
+              a - all, overwrite this and all others
+              i - ignore, skip any conflicts
+              q - quit, abort
+              d - diff, show the differences between the old and the new
+              h - help, show this help
+              HELP
+              raise 'retry'
           end
         rescue
           retry
@@ -201,7 +216,7 @@ module RubiGen
         # Determine full paths for source and destination files.
         source              = source_path(relative_source)
         destination         = destination_path(relative_destination)
-        destination_exists  = File.exists?(destination)
+        destination_exists  = File.exist?(destination)
 
         # If source and destination are identical then we're done.
         if destination_exists and identical?(source, destination, &block)
@@ -249,7 +264,7 @@ module RubiGen
           FileUtils.chmod(file_options[:chmod], destination)
         end
 
-        # Optionally add file to subversion
+        # Optionally add file to subversion or git
         system("svn add #{destination}") if options[:svn]
       end
 
@@ -267,6 +282,7 @@ module RubiGen
         files.each do |file_name|
           file "#{template_path}#{file_name}", "#{path}#{file_name}", options
         end
+        system("git add -v #{relative_destination}") if options[:git]
       end
 
       # Checks if the source and the destination file are identical. If
@@ -280,7 +296,7 @@ module RubiGen
       end
 
       # Generate a file using an ERuby template.
-      # Looks up and evalutes a template by name and writes the result.
+      # Looks up and evaluates a template by name and writes the result.
       #
       # The ERB template uses explicit trim mode to best control the
       # proliferation of whitespace in generated code.  <%- trims leading
@@ -320,22 +336,24 @@ module RubiGen
       end
 
       # Create a directory including any missing parent directories.
-      # Always directories which exist.
+      # Always skips directories which exist.
       def directory(relative_path)
         path = destination_path(relative_path)
-        if File.exists?(path)
+        if File.exist?(path)
           logger.exists relative_path
         else
           logger.create relative_path
           unless options[:pretend]
             FileUtils.mkdir_p(path)
+            # git doesn't require adding the paths, adding the files later will
+            # automatically do a path add.
 
             # Subversion doesn't do path adds, so we need to add
             # each directory individually.
             # So stack up the directory tree and add the paths to
             # subversion in order without recursion.
             if options[:svn]
-              stack=[relative_path]
+              stack = [relative_path]
               until File.dirname(stack.last) == stack.last # dirname('.') == '.'
                 stack.push File.dirname(stack.last)
               end
@@ -356,45 +374,6 @@ module RubiGen
         end
       end
 
-      # Display a README.
-      def write_manifest(relative_destination)
-        files = ([relative_destination] + Dir["#{destination_root}/**/*"])
-        files.reject! { |file| File.directory?(file) }
-        files.map! { |path| path.sub("#{destination_root}/","") }
-        files = files.uniq.sort
-
-
-        destination         = destination_path(relative_destination)
-        destination_exists  = File.exists?(destination)
-
-        # Check for and resolve file collisions.
-        if destination_exists
-          # Always recreate the Manifest (perhaps we need to give the option... like normal files)
-          choice = :force
-          logger.force(relative_destination)
-
-        # File doesn't exist so log its unbesmirched creation.
-        else
-          logger.create relative_destination
-        end
-
-        # If we're pretending, back off now.
-        return if options[:pretend]
-
-        # Write destination file with optional shebang.  Yield for content
-        # if block given so templaters may render the source file.  If a
-        # shebang is requested, replace the existing shebang or insert a
-        # new one.
-        File.open(destination, 'wb') do |dest|
-          dest.write files.join("\n")
-          dest.write "\n"
-        end
-
-        # Optionally add file to subversion
-        system("svn add #{destination}") if options[:svn]
-
-      end
-
       # When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template.
       def migration_template(relative_source, relative_destination, template_options = {})
         migration_directory relative_destination
@@ -436,18 +415,20 @@ module RubiGen
         # Raise a usage error with an informative WordNet suggestion.
         # Thanks to Florian Gross (flgr).
         def raise_class_collision(class_name)
-          message = <<end_message
-The name '#{class_name}' is reserved.
+          message = <<-end_message
+The name '#{class_name}' is either already used in your application or reserved.
 Please choose an alternative and run this generator again.
 end_message
           if suggest = find_synonyms(class_name)
-            message << "\n  Suggestions:  \n\n"
-            message << suggest.join("\n")
+            if suggest.any?
+              message << "\n  Suggestions:  \n\n"
+              message << suggest.join("\n")
+            end
           end
           raise UsageError, message
         end
 
-        SYNONYM_LOOKUP_URI = "http://wordnet.princeton.edu/cgi-bin/webwn2.0?stage=2&word=%s&posnumber=1&searchtypenumber=2&senses=&showglosses=1"
+        SYNONYM_LOOKUP_URI = "http://wordnet.princeton.edu/perl/webwn?s=%s"
 
         # Look up synonyms on WordNet.  Thanks to Florian Gross (flgr).
         def find_synonyms(word)
@@ -455,8 +436,8 @@ end_message
           require 'timeout'
           timeout(5) do
             open(SYNONYM_LOOKUP_URI % word) do |stream|
-              data = stream.read.gsub("&nbsp;", " ").gsub("<BR>", "")
-              data.scan(/^Sense \d+\n.+?\n\n/m)
+              # Grab words linked to dictionary entries as possible synonyms
+              data = stream.read.gsub("&nbsp;", " ").scan(/<a href="webwn.*?">([\w ]*?)<\/a>/s).uniq
             end
           end
         rescue Exception
@@ -471,7 +452,7 @@ end_message
       # Remove a file if it exists and is a file.
       def file(relative_source, relative_destination, file_options = {})
         destination = destination_path(relative_destination)
-        if File.exists?(destination)
+        if File.exist?(destination)
           logger.rm relative_destination
           unless options[:pretend]
             if options[:svn]
@@ -485,6 +466,19 @@ end_message
               # has no modifications so we can simply remove it
                 system("svn rm #{destination}")
               end
+            elsif options[:git]
+              if options[:git][:new][relative_destination]
+                # file has been added, but not committed
+                system("git reset HEAD #{relative_destination}")
+                FileUtils.rm(destination)
+              elsif options[:git][:modified][relative_destination]
+                # file is committed and modified
+                system("git rm -f #{relative_destination}")
+              else
+                # If the directory is not in the status list, it
+                # has no modifications so we can simply remove it
+                system("git rm #{relative_destination}")
+              end
             else
               FileUtils.rm(destination)
             end
@@ -506,7 +500,7 @@ end_message
         until parts.empty?
           partial = File.join(parts)
           path = destination_path(partial)
-          if File.exists?(path)
+          if File.exist?(path)
             if Dir[File.join(path, '*')].empty?
               logger.rmdir partial
               unless options[:pretend]
@@ -521,6 +515,8 @@ end_message
                   # has no modifications so we can simply remove it
                     system("svn rm #{path}")
                   end
+                # I don't think git needs to remove directories?..
+                # or maybe they have special consideration...
                 else
                   FileUtils.rmdir(path)
                 end

data/lib/rubigen/lookup.rb

@@ -8,7 +8,7 @@ class Object
     def lookup_missing_generator(class_id)
       if md = /(.+)Generator$/.match(class_id.to_s)
         name = md.captures.first.demodulize.underscore
-        RubiGen::Base.lookup(name).klass
+        RubiGen::Base.active.lookup(name).klass
       else
         const_missing_before_generators(class_id)
       end
@@ -49,12 +49,12 @@ module RubiGen
   module Lookup
     def self.included(base)
       base.extend(ClassMethods)
-      base.use_component_sources!
+      # base.use_component_sources!  # TODO is this required since it has no scope/source context
     end
 
     # Convenience method to instantiate another generator.
     def instance(generator_name, args, runtime_options = {})
-      self.class.instance(generator_name, args, runtime_options)
+      self.class.active.instance(generator_name, args, runtime_options)
     end
 
     module ClassMethods
@@ -71,7 +71,7 @@ module RubiGen
             end
             write_inheritable_attribute(:sources, diff)
           end
-          use_component_sources! if read_inheritable_attribute(:sources).blank?
+          active.use_component_sources! if read_inheritable_attribute(:sources).blank?
         end
         read_inheritable_attribute(:sources)
       end
@@ -162,7 +162,7 @@ module RubiGen
 
       # Convenience method to lookup and instantiate a generator.
       def instance(generator_name, args = [], runtime_options = {})
-        lookup(generator_name).klass.new(args, full_options(runtime_options))
+        active.lookup(generator_name).klass.new(args, full_options(runtime_options))
       end
 
       private
@@ -202,8 +202,6 @@ module RubiGen
         case filter
         when :visible
           mem << spec.name if spec.visible?
-        else
-          usage_message
         end
         mem
       end.sort

data/lib/rubigen/options.rb

@@ -130,6 +130,13 @@ module RubiGen
             opt
           end
         end
+        opt.on('-g', '--git', 'Modify files with git. (Note: git must be in path)') do
+          options[:git] = `git status`.inject({:new => {}, :modified => {}}) do |opt, e|
+            opt[:new][e.chomp[14..-1]] = true if e =~ /new file:/
+            opt[:modified][e.chomp[14..-1]] = true if e =~ /modified:/
+            opt
+          end
+        end
       end
 
   end

data/lib/rubigen/scripts/destroy.rb

@@ -13,6 +13,9 @@ module RubiGen::Scripts
         usage << "  #{label}: #{names.join(', ')}\n" unless names.empty?
       end
 
+      # TODO - extensible blurbs for rails/newgem/adhearsion etc
+      # e.g. for rails script/destroy
+      # http://github.com/rails/rails/tree/daee6fd92ac16878f6806c3382a9e74592aa9656/railties/lib/rails_generator/scripts/destroy.rb
       usage << <<-end_blurb
 
 This script will destroy all files created by the corresponding 

data/lib/rubigen/scripts.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/options'
+require File.dirname(__FILE__) + '/options' unless Object.const_defined?("RubiGen") && RubiGen.const_defined?("Base")
 
 module RubiGen
   module Scripts
@@ -9,11 +9,13 @@ module RubiGen
     class Base
       include Options
       default_options :collision => :ask, :quiet => false
+      attr_reader :stdout
 
       # Run the generator script.  Takes an array of unparsed arguments
       # and a hash of parsed arguments, takes the generator as an option
       # or first remaining argument, and invokes the requested command.
       def run(args = [], runtime_options = {})
+        @stdout = runtime_options[:stdout] || $stdout
         begin
           parse!(args.dup, runtime_options)
         rescue OptionParser::InvalidOption => e
@@ -29,9 +31,9 @@ module RubiGen
         # Look up generator instance and invoke command on it.
         RubiGen::Base.instance(options[:generator], args, options).command(options[:command]).invoke!
       rescue => e
-        puts e
-        puts "  #{e.backtrace.join("\n  ")}\n" if options[:backtrace]
-        raise SystemExit
+        stdout.puts e
+        stdout.puts "  #{e.backtrace.join("\n  ")}\n" if options[:backtrace]
+        raise SystemExit unless options[:no_exit]
       end
 
       protected
@@ -42,15 +44,20 @@ module RubiGen
 
         def usage_message
           usage = "\nInstalled Generators\n"
-          RubiGen::Base.sources.inject({}) do |mem, source|
+          RubiGen::Base.sources.inject([]) do |mem, source|
+            # Using an association list instead of a hash to preserve order,
+            # for aesthetic reasons more than anything else.
             label = source.label.to_s.capitalize
-            mem[label] ||= []
-            mem[label] |= source.names(:visible)
+            pair = mem.assoc(label)
+            mem << (pair = [label, []]) if pair.nil?
+            pair[1] |= source.names(:visible)
             mem
-          end.each_pair do |label, names|
+          end.each do |label, names|
             usage << "  #{label}: #{names.join(', ')}\n" unless names.empty?
           end
 
+          # TODO - extensible blurbs for rails/newgem/adhearsion etc
+          # e.g. for rails http://github.com/rails/rails/tree/daee6fd92ac16878f6806c3382a9e74592aa9656/railties/lib/rails_generator/scripts.rb#L50-74
           usage << <<-end_blurb
 
 More are available at http://rubigen.rubyforge.org/

data/lib/rubigen.rb

@@ -10,7 +10,7 @@ rescue LoadError
 end
 
 module RubiGen
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end
 
 require 'rubigen/base'
@@ -24,3 +24,8 @@ RubiGen::Base.send(:include, RubiGen::Commands)
 require 'rubigen/simple_logger'
 RubiGen::Base.logger = RubiGen::SimpleLogger.new(STDOUT)
 
+# Use self as default lookup algorithm
+# If your framework needs to subclass RubiGen::Base, then
+# assign it to #active after initialising rubigen and your code.
+RubiGen::Base.active = RubiGen::Base
+

data/rubygems_generators/application_generator/USAGE

@@ -14,10 +14,10 @@ How to create an Application Generator
 6. Run unit tests.
 7. If your application generator uses other generators (m.dependency "gen-name", [arg1, arg2], :option1 => 'value')
    then you must add this into the generated bin/foobar file.
-   For example, if you wanted to use a rubygems and/or merb generator, then replace the use_application_sources! 
+   For example, if you wanted to use a rubygems and/or rails generator, then replace the use_application_sources! 
    call in bin/foobar:
  
-      RubiGen::Base.use_application_sources! :rubygems, :merb
+      RubiGen::Base.use_application_sources! :rubygems, :rails
  
    Without this, RubiGen will not be able to find your dependent generators.
 8. Update your Manifest.txt with the new files (if you are using Hoe; using newgem? it uses Hoe; so you need to do this)

data/rubygems_generators/application_generator/application_generator_generator.rb

@@ -54,7 +54,7 @@ EOS
       # opts.separator 'Options:'
       # opts.on("-a", "--author=\"Your Name\"", String,
       #         "Generated app file will include your name.",
-      #         "Default: none") { |options[:author]| }
+      #         "Default: none") { |o| options[:author] = o }
     end
 
     def extract_options

data/rubygems_generators/application_generator/templates/generator.rb

@@ -48,7 +48,7 @@ EOS
       # at the top of the file next to "default_options"
       # opts.on("-a", "--author=\"Your Name\"", String,
       #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
+      #         "Default: none") { |o| options[:author] = o }
       opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
     end
 

data/rubygems_generators/application_generator/templates/readme

@@ -15,10 +15,10 @@ How to create a Generator (Application Generator)
 6. If your application generator uses other generators (called 'dependencies')
     e.g. (m.dependency "generator-from-rubygems", [arg1, arg2], options)
    then you must add this generators' scope into the executable bin/myapp.
-   For example, if you wanted to use a rubygems and/or merb generator, then 
+   For example, if you wanted to use a rubygems and/or rails generator, then 
    replace the use_application_sources! call in bin/myapp:
 
-      RubiGen::Base.use_application_sources! :rubygems, :merb
+      RubiGen::Base.use_application_sources! :rubygems, :rails
 
    Without this, RubiGen will not be able to find your dependent generators.
 7. Update your Manifest.txt with the new files (rake manifest:refresh)

data/rubygems_generators/component_generator/USAGE

@@ -4,8 +4,7 @@ How to create a Generator (aka Component Generator)
 1. Run this generator: script/generate component_generator mygen scope
    Where "mygen" is the name of the generator, and scope is scope restriction.
    A scope of "rubygems" means this generator will only be available to RubyGems developers. 
-   A scope of "merb" means the generator is only accessible to Merb applications (v0.4+).
-   If you use "rails", then your generator is only accessible by Rails applications (v2.0+).
+   A scope of "rails" means the generator is only accessible to Rails applications
 2. Using the generated test class, assert what directories, files, classes etc should
    be generated.
 3. Add these files into the scope_genearators/mygen/templates folder. Your files can use
@@ -18,8 +17,8 @@ How to create a Generator (aka Component Generator)
 6. Add usage information in the USAGE file.
 7. Update your Manifest.txt with the new files  (if you are using Hoe)
 8. Build and install your RubyGem locally. Run: rake install_gem
-9. Go to a work area for your scope (e.g. go to the root folder of a Merb application 
-   to use a "merb" scoped generator)
+9. Go to a work area for your scope (e.g. go to the root folder of a Rails application 
+   to use a "rails" scoped generator)
 10. Run "script/generate" and your generator should appear in the list of available generators.
 11. Run "script/generate mygen" to see the options and usage information for your generator.
 12. Run "script/generator mygen arguments" to execute the generator.

data/rubygems_generators/component_generator/component_generator_generator.rb

@@ -44,8 +44,6 @@ class ComponentGeneratorGenerator < RubiGen::Base
     case (generator_type.to_sym rescue nil)
     when :rails
       "Rails::Generator::NamedBase"
-    when :merb
-      "Merb::GeneratorBase"
     else
       "RubiGen::Base"
     end
@@ -55,8 +53,6 @@ class ComponentGeneratorGenerator < RubiGen::Base
     case (generator_type.to_sym rescue nil)
     when :rails
       ["rails_generator"]
-    when :merb
-      ["merb-core", "merb-gen"]
     else
       []
     end
@@ -76,7 +72,7 @@ EOS
       # opts.separator 'Options:'
       # opts.on("-a", "--author=\"Your Name\"", String,
       #         "Generated app file will include your name.",
-      #         "Default: none") { |options[:author]| }
+      #         "Default: none") { |o| options[:author] = 0 }
     end
 
     def extract_options

data/rubygems_generators/component_generator/templates/generator.rb

@@ -42,7 +42,7 @@ EOS
       # at the top of the file next to "default_options"
       # opts.on("-a", "--author=\"Your Name\"", String,
       #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
+      #         "Default: none") { |o| options[:author] = o }
       # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
     end
 

data/rubygems_generators/component_generator/templates/readme

@@ -16,7 +16,7 @@ How to create a Generator (Component Generator)
 7. Update your Manifest.txt with the new files  (if you are using Hoe)
 8. Build and install your RubyGem locally. Run: rake install_gem
 9. Go to a work area whose script/generate for your scope (e.g. go to the root folder
-   of a Merb application to use a 'merb' scoped generator.
+   of a Rails application to use a 'rails' scoped generator.
 10. Run "script/generate" and your new generator should appear in the list of available generators.
 11. Run "script/generate mygen" to see the options and usage information for your generator.
 12. Run "script/generator mygen arguments" to execute the generator.

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs =  " -r irb/completion"
+# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/rubigen.rb'}"
+puts "Loading rubigen gem"
+exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -10,5 +10,5 @@ end
 require 'rubigen/scripts/destroy'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme]
+RubiGen::Base.use_component_sources! [:rubygems]
 RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -10,5 +10,5 @@ end
 require 'rubigen/scripts/generate'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme]
+RubiGen::Base.use_component_sources! [:rubygems]
 RubiGen::Scripts::Generate.new.run(ARGV)

data/test/test_component_generator_generator.rb

@@ -88,32 +88,6 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
     end
   end
 
-  def test_generator_with_merb_generator_type
-    name = "genname"
-    gen_type = "merb"
-    run_generator('component_generator', [name, gen_type], sources)
-
-    assert_generated_file   "#{gen_type}_generators/#{name}/#{name}_generator.rb"
-    assert_generated_file   "#{gen_type}_generators/#{name}/USAGE"
-    assert_generated_file   "test/test_#{name}_generator.rb"
-    assert_generated_file   "test/test_generator_helper.rb"
-    assert_directory_exists "#{gen_type}_generators/#{name}/templates"
-    assert_generated_class  "#{gen_type}_generators/#{name}/#{name}_generator" do |body|
-      # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
-      assert_has_method body, "manifest"
-      gen_class, superclass = body.match(%r{class ([\w:_]+) < ([\w:_]+)})[1..2]
-      assert_equal("GennameGenerator", gen_class)
-      assert_equal("Merb::GeneratorBase", superclass)
-    end
-    assert_generated_class "test/test_#{name}_generator" do |body|
-      assert_has_method body, "setup"
-      assert_has_method body, "teardown"
-      assert_has_method body, "test_generator_without_options"
-      assert_has_method body, "sources"
-      assert_has_method body, "generator_path"
-    end
-  end
-
   private
   def sources
     [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"../#{generator_path}"))

data/test/test_generator_helper.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 require 'fileutils'
 
 # Must set before requiring generator libs.
-TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
+TMP_ROOT = File.expand_path(File.dirname(__FILE__) + "/../tmp") unless defined?(TMP_ROOT)
 PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
 app_root = File.join(TMP_ROOT, PROJECT_NAME)
 if defined?(APP_ROOT)
@@ -11,4 +11,6 @@ else
   APP_ROOT = app_root
 end
 
+FileUtils.mkdir_p(APP_ROOT)
+
 require 'rubigen/helpers/generator_test_helper'

data/test/test_helper.rb

@@ -25,3 +25,5 @@ rescue LoadError
 rescue NoMethodError
   load_mocha
 end
+
+require "shoulda"

data/test/test_install_rubigen_scripts_generator.rb

@@ -26,7 +26,7 @@ class TestInstallRubigenScriptsGenerator < Test::Unit::TestCase
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
   
   def test_install_rubigen_scripts_should_create_script_generate
-    run_generator('install_rubigen_scripts', [APP_ROOT] + %w(rubygems merb), sources)
+    run_generator('install_rubigen_scripts', [APP_ROOT] + %w(rubygems foobar), sources)
     assert_directory_exists "script"
     assert_generated_file   "script/generate"
     assert_generated_file   "script/destroy"