rubigen 1.5.2 → 1.5.3

data/History.txt

@@ -1,3 +1,8 @@
+== 1.5.3 2010-02-11
+
+* Forced rubigen to use activesupport 2.3.5 (as the last < 3.0 version). It will upgrade to use 3.0.0 when it is released.
+
+
 == 1.5.2 2009-01-12
 
 * Trying to remove a circular rubigen->newgem->rubigen dependency issue

data/Manifest.txt

@@ -14,11 +14,14 @@ app_generators/ruby_app/templates/test/test_helper.rb.erb
 bin/install_rubigen_scripts
 bin/rubigen
 bin/ruby_app
+config/website.yml
 features/development.feature
 features/help.feature
 features/rubigen_cli.feature
-features/steps/common.rb
-features/steps/env.rb
+features/step_definitions/common_steps.rb
+features/support/common.rb
+features/support/env.rb
+features/support/matchers.rb
 generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb
 generators/install_rubigen_scripts/templates/script/destroy
 generators/install_rubigen_scripts/templates/script/generate
@@ -38,6 +41,7 @@ lib/rubigen/scripts/generate.rb
 lib/rubigen/scripts/update.rb
 lib/rubigen/simple_logger.rb
 lib/rubigen/spec.rb
+rubigen.gemspec
 rubygems_generators/application_generator/USAGE
 rubygems_generators/application_generator/application_generator_generator.rb
 rubygems_generators/application_generator/templates/bin

data/Rakefile

@@ -1,20 +1,21 @@
-%w[rubygems rake rake/clean].each { |f| require f }
-require 'newgem' rescue nil # still work if newgem not available
-require File.dirname(__FILE__) + '/lib/rubigen'
+require 'rubygems'
+require 'hoe'
+require './lib/rubigen'
+
+Hoe.plugin :newgem
+Hoe.plugin :website
+Hoe.plugin :cucumberfeatures
+Hoe.plugin :git
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('rubigen', RubiGen::VERSION) do |p|
-  p.developer('Dr Nic Williams', 'drnicwilliams@gmail.com')
-  p.developer('Jeremy Kemper', 'jeremy@bitsweat.net')
-  p.changes        = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps     = [['activesupport','>= 2.2.2']]
-  # p.extra_dev_deps = [['newgem', ">= #{::Newgem::VERSION}"]] - TODO causes a circular dependency < rubygems 1.2
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+Hoe.spec 'rubigen' do
+  developer 'Dr Nic Williams', 'drnicwilliams@gmail.com'
+  developer 'Jeremy Kemper', 'jeremy@bitsweat.net'
+  extra_deps << ['activesupport','2.3.5']
+  extra_deps << ['mocha','>= 0.9.7']
+  extra_deps << ['cucumber','>= 0.3.6']
+  extra_deps << ['thoughtbot-shoulda','>= 2.10.2']
 end
 
 require 'newgem/tasks' rescue nil # load /tasks/*.rake

data/bin/rubigen

@@ -3,6 +3,8 @@
 #  Created on 2008-12-27.
 #  Copyright (c) 2008. All rights reserved.
 
+require "rubygems"
+gem 'activesupport', '2.3.5'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/rubigen")
 
 require "rubigen/cli"

data/config/website.yml

@@ -0,0 +1,2 @@
+host: nicwilliams@rubyforge.org
+remote_dir: /var/www/gforge-projects/rubigen/

data/features/development.feature

@@ -6,8 +6,8 @@ Feature: Development processes of newgem itself (rake tasks)
     
   Scenario: Generate RubyGem
     Given this project is active project folder
-    And 'pkg' folder is deleted
-    When task 'rake gem' is invoked
-    Then folder 'pkg' is created
-    And file with name matching 'pkg/*.gem' is created else you should run "rake manifest" to fix this
-    And gem spec key 'rdoc_options' contains /--mainREADME.rdoc/
+    And "pkg" folder is deleted
+    When I invoke task "rake gem"
+    Then folder "pkg" is created
+    And file with name matching "pkg/*.gem" is created else you should run "rake manifest" to fix this
+    And gem spec key "rdoc_options" contains /(--mainREADME.rdoc|\[\"--main\", \"README.rdoc\"\])/

data/features/help.feature

@@ -4,11 +4,10 @@ Feature: Generators offer help/usage details
   I want help/usage details about generators
   
   Scenario: List of visible generators for rubygems
-    Given a safe folder
-    When run local executable 'rubigen rubygems' with arguments ''
-    Then output does match /application_generator/
-    And output does match /component_generator/
-    And output does not match /migration/ # from rails scope
+    When I run local executable "rubigen rubygems" with arguments ""
+    Then I should see "application_generator"
+    Then I should see "component_generator"
+    Then I should not see "migration" # from rails scope
   
 
   

data/features/rubigen_cli.feature

@@ -4,7 +4,6 @@ Feature: rubigen command-line interface to access generators anywhere
   I want to execute generators anywhere without a script/generate helper script
   
   Scenario: Run a component generator
-    Given a safe folder
-    When run local executable 'rubigen' with arguments 'rubygems component_generator foo bar'
-    Then file 'bar_generators/foo/foo_generator.rb' is created
+    When I run local executable "rubigen" with arguments "rubygems component_generator foo bar"
+    Then file "bar_generators/foo/foo_generator.rb" is created
   

data/features/{steps/common.rb → step_definitions/common_steps.rb}

@@ -1,51 +1,18 @@
-def in_project_folder(&block)
-  project_folder = @active_project_folder || @tmp_root
-  FileUtils.chdir(project_folder, &block)
-end
-
-def in_home_folder(&block)
-  FileUtils.chdir(@home_path, &block)
-end
-
-Given %r{^a safe folder} do
-  FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
-  FileUtils.mkdir_p @tmp_root
-  FileUtils.mkdir_p @home_path = File.expand_path(File.join(@tmp_root, "home"))
-  @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-  Given "env variable $HOME set to '#{@home_path}'"
-end
-
-Given %r{^this project is active project folder} do
-  Given "a safe folder"
+Given /^this project is active project folder/ do
   @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
 end
 
-Given %r{^env variable \$([\w_]+) set to '(.*)'} do |env_var, value|
+Given /^env variable \$([\w_]+) set to "(.*)"/ do |env_var, value|
   ENV[env_var] = value
 end
 
-def force_local_lib_override(project_name = @project_name)
-  rakefile = File.read(File.join(project_name, 'Rakefile'))
-  File.open(File.join(project_name, 'Rakefile'), "w+") do |f|
-    f << "$:.unshift('#{@lib_path}')\n"
-    f << rakefile
-  end
-end
-
-def setup_active_project_folder project_name
-  @active_project_folder = File.join(@tmp_root, project_name)
-  @project_name = project_name
+Given /"(.*)" folder is deleted/ do |folder|
+  in_project_folder { FileUtils.rm_rf folder }
 end
 
-Given %r{'(.*)' folder is deleted} do |folder|
-  in_project_folder do
-    FileUtils.rm_rf folder
-  end
-end
-
-When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, arguments|
+When /^I invoke "(.*)" generator with arguments "(.*)"$/ do |generator, arguments|
   @stdout = StringIO.new
-  FileUtils.chdir(@active_project_folder) do
+  in_project_folder do
     if Object.const_defined?("APP_ROOT")
       APP_ROOT.replace(FileUtils.pwd)
     else 
@@ -59,55 +26,63 @@ When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, argu
   end
 end
 
-When %r{run executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+When /^I run executable "(.*)" with arguments "(.*)"/ do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   in_project_folder do
     system "#{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
   end
 end
 
-When %r{run project executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+When /^I run project executable "(.*)" with arguments "(.*)"/ do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   in_project_folder do
-    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+    system "ruby -rubygems #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
   end
 end
 
-When %r{run local executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+When /^I run local executable "(.*)" with arguments "(.*)"/ do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  @stderr = File.expand_path(File.join(@tmp_root, "executable.err"))
   executable = File.expand_path(File.join(File.dirname(__FILE__), "/../../bin", executable))
   in_project_folder do
-    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stderr}"
+    system "ruby -rubygems #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
   end
 end
 
-When %r{^task 'rake (.*)' is invoked$} do |task|
+When /^I invoke task "rake (.*)"/ do |task|
   @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
-  FileUtils.chdir(@active_project_folder) do
+  in_project_folder do
     system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
   end
 end
 
-Then %r{^folder '(.*)' (is|is not) created} do |folder, is|
+Then /^folder "(.*)" (is|is not) created/ do |folder, is|
   in_project_folder do
     File.exists?(folder).should(is == 'is' ? be_true : be_false)
   end
 end
 
-Then %r{^file '(.*)' (is|is not) created} do |file, is|
+Then /^file "(.*)" (is|is not) created/ do |file, is|
   in_project_folder do
     File.exists?(file).should(is == 'is' ? be_true : be_false)
   end
 end
 
-Then %r{^file with name matching '(.*)' is created} do |pattern|
+Then /^file with name matching "(.*)" is created/ do |pattern|
   in_project_folder do
     Dir[pattern].should_not be_empty
   end
 end
 
-Then %r{gem file '(.*)' and generated file '(.*)' should be the same} do |gem_file, project_file|
+Then /^file "(.*)" contents (does|does not) match \/(.*)\// do |file, does, regex|
+  in_project_folder do
+    actual_output = File.read(file)
+    (does == 'does') ?
+      actual_output.should(match(/#{regex}/)) :
+      actual_output.should_not(match(/#{regex}/))
+  end
+end
+
+Then /gem file "(.*)" and generated file "(.*)" should be the same/ do |gem_file, project_file|
   File.exists?(gem_file).should be_true
   File.exists?(project_file).should be_true
   gem_file_contents = File.read(File.dirname(__FILE__) + "/../../#{gem_file}")
@@ -115,77 +90,80 @@ Then %r{gem file '(.*)' and generated file '(.*)' should be the same} do |gem_fi
   project_file_contents.should == gem_file_contents
 end
 
-Then %r{^output same as contents of '(.*)'$} do |file|
-  expected_output = File.read(File.join(File.dirname(__FILE__) + "/../expected_outputs", file))
-  actual_output = File.read(File.dirname(__FILE__) + "/../../tmp/#{@stdout}")
-  actual_output.should == expected_output
-end
-
-Then %r{^(does|does not) invoke generator '(.*)'$} do |does_invoke, generator|
+Then /^(does|does not) invoke generator "(.*)"$/ do |does_invoke, generator|
   actual_output = File.read(@stdout)
   does_invoke == "does" ?
     actual_output.should(match(/dependency\s+#{generator}/)) :
     actual_output.should_not(match(/dependency\s+#{generator}/))
 end
 
-Then %r{help options '(.*)' and '(.*)' are displayed} do |opt1, opt2|
+Then /help options "(.*)" and "(.*)" are displayed/ do |opt1, opt2|
   actual_output = File.read(@stdout)
   actual_output.should match(/#{opt1}/)
   actual_output.should match(/#{opt2}/)
 end
 
-Then %r{^output (does|does not) match \/(.*)\/} do |does, regex|
+Then /^I should see "([^\"]*)"/ do |text|
   actual_output = File.read(@stdout)
-  (does == 'does') ?
-    actual_output.should(match(/#{regex}/)) :
-    actual_output.should_not(match(/#{regex}/)) 
+  actual_output.should contain(text)
 end
 
-Then %r{^contents of file '(.*)' (does|does not) match \/(.*)\/} do |file, does, regex|
-  in_project_folder do
-    actual_output = File.read(file)
-    (does == 'does') ?
-      actual_output.should(match(/#{regex}/)) :
-      actual_output.should_not(match(/#{regex}/))
-  end
+Then /^I should not see "([^\"]*)"/ do |text|
+  actual_output = File.read(@stdout)
+  actual_output.should_not contain(text)
 end
 
-Then %r{^all (\d+) tests pass} do |expected_test_count|
+Then /^I should see$/ do |text|
+  actual_output = File.read(@stdout)
+  actual_output.should contain(text)
+end
+
+Then /^I should not see$/ do |text|
+  actual_output = File.read(@stdout)
+  actual_output.should_not contain(text)
+end
+
+Then /^I should see exactly$/ do |text|
+  actual_output = File.read(@stdout)
+  actual_output.should == text
+end
+
+Then /^I should see all (\d+) tests pass/ do |expected_test_count|
   expected = %r{^#{expected_test_count} tests, \d+ assertions, 0 failures, 0 errors}
   actual_output = File.read(@stdout)
   actual_output.should match(expected)
 end
 
-Then %r{^all (\d+) examples pass} do |expected_test_count|
+Then /^I should see all (\d+) examples pass/ do |expected_test_count|
   expected = %r{^#{expected_test_count} examples?, 0 failures}
   actual_output = File.read(@stdout)
   actual_output.should match(expected)
 end
 
-Then %r{^yaml file '(.*)' contains (\{.*\})} do |file, yaml|
+Then /^yaml file "(.*)" contains (\{.*\})/ do |file, yaml|
   in_project_folder do
     yaml = eval yaml
     YAML.load(File.read(file)).should == yaml
   end
 end
 
-Then %r{^Rakefile can display tasks successfully} do
+Then /^Rakefile can display tasks successfully/ do
   @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
-  FileUtils.chdir(@active_project_folder) do
+  in_project_folder do
     system "rake -T > #{@stdout} 2> #{@stdout}"
   end
   actual_output = File.read(@stdout)
   actual_output.should match(/^rake\s+\w+\s+#\s.*/)
 end
 
-Then %r{^task 'rake (.*)' is executed successfully} do |task|
+Then /^task "rake (.*)" is executed successfully/ do |task|
   @stdout.should_not be_nil
   actual_output = File.read(@stdout)
   actual_output.should_not match(/^Don't know how to build task '#{task}'/)
   actual_output.should_not match(/Error/i)
 end
 
-Then %r{^gem spec key '(.*)' contains \/(.*)\/} do |key, regex|
+Then /^gem spec key "(.*)" contains \/(.*)\// do |key, regex|
   in_project_folder do
     gem_file = Dir["pkg/*.gem"].first
     gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)

data/features/support/common.rb

@@ -0,0 +1,29 @@
+module CommonHelpers
+  def in_tmp_folder(&block)
+    FileUtils.chdir(@tmp_root, &block)
+  end
+
+  def in_project_folder(&block)
+    project_folder = @active_project_folder || @tmp_root
+    FileUtils.chdir(project_folder, &block)
+  end
+
+  def in_home_folder(&block)
+    FileUtils.chdir(@home_path, &block)
+  end
+
+  def force_local_lib_override(project_name = @project_name)
+    rakefile = File.read(File.join(project_name, 'Rakefile'))
+    File.open(File.join(project_name, 'Rakefile'), "w+") do |f|
+      f << "$:.unshift('#{@lib_path}')\n"
+      f << rakefile
+    end
+  end
+
+  def setup_active_project_folder project_name
+    @active_project_folder = File.join(@tmp_root, project_name)
+    @project_name = project_name
+  end
+end
+
+World(CommonHelpers)

data/features/support/env.rb

@@ -0,0 +1,14 @@
+gem 'cucumber'
+require 'cucumber'
+gem 'rspec'
+require 'spec'
+
+require File.dirname(__FILE__) + "/../../lib/rubigen"
+
+Before do
+  @tmp_root = File.dirname(__FILE__) + "/../../tmp"
+  @home_path = File.expand_path(File.join(@tmp_root, "home"))
+  FileUtils.rm_rf   @tmp_root
+  FileUtils.mkdir_p @home_path
+  ENV['HOME'] = @home_path
+end

data/features/support/matchers.rb

@@ -0,0 +1,11 @@
+module Matchers
+  def contain(expected)
+    simple_matcher("contain #{expected.inspect}") do |given, matcher|
+      matcher.failure_message = "expected #{given.inspect} to contain #{expected.inspect}"
+      matcher.negative_failure_message = "expected #{given.inspect} not to contain #{expected.inspect}"
+      given.index expected
+    end
+  end
+end
+
+World(Matchers)

data/lib/rubigen.rb

@@ -2,15 +2,15 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 begin
-  require 'active_support' 
-rescue LoadError
-  require 'rubygems'
-  gem 'activesupport'
-  require 'active_support' 
+  # if you are using rubygems, fix to 2.3.5
+  gem 'activesupport', '2.3.5'
+rescue
 end
 
+require 'active_support' 
+
 module RubiGen
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end
 
 require 'rubigen/base'

data/lib/rubigen/commands.rb

@@ -124,7 +124,7 @@ module RubiGen
             when /\An\z/i then :skip
             when /\Ay\z/i then :force
             else
-              $stdout.puts <<-HELP.gsub(/^              /, '')
+              stdout.puts <<-HELP.gsub(/^              /, '')
               Y - yes, overwrite
               n - no, do not overwrite
               a - all, overwrite this and all others

data/rubigen.gemspec

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rubigen}
+  s.version = "1.5.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Dr Nic Williams", "Jeremy Kemper"]
+  s.date = %q{2009-01-12}
+  s.description = %q{A framework to allow Ruby applications to generate file/folder stubs  (like the `rails` command does for Ruby on Rails, and the 'script/generate' command within a Rails application during development).}
+  s.email = ["drnicwilliams@gmail.com", "jeremy@bitsweat.net"]
+  s.executables = ["install_rubigen_scripts", "rubigen", "ruby_app"]
+  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Todo.txt", "app_generators/ruby_app/templates/README.txt", "website/index.txt", "website/version-raw.txt", "website/version.txt"]
+  s.files = [".autotest", "History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "Todo.txt", "app_generators/ruby_app/USAGE", "app_generators/ruby_app/ruby_app_generator.rb", "app_generators/ruby_app/templates/README.txt", "app_generators/ruby_app/templates/Rakefile", "app_generators/ruby_app/templates/lib/module.rb", "app_generators/ruby_app/templates/test/test_helper.rb.erb", "bin/install_rubigen_scripts", "bin/rubigen", "bin/ruby_app", "features/development.feature", "features/help.feature", "features/rubigen_cli.feature", "features/steps/common.rb", "features/steps/env.rb", "generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb", "generators/install_rubigen_scripts/templates/script/destroy", "generators/install_rubigen_scripts/templates/script/generate", "generators/install_rubigen_scripts/templates/script/win_script.cmd", "lib/rubigen.rb", "lib/rubigen/base.rb", "lib/rubigen/cli.rb", "lib/rubigen/commands.rb", "lib/rubigen/generated_attribute.rb", "lib/rubigen/helpers/generator_test_helper.rb", "lib/rubigen/lookup.rb", "lib/rubigen/manifest.rb", "lib/rubigen/options.rb", "lib/rubigen/scripts.rb", "lib/rubigen/scripts/destroy.rb", "lib/rubigen/scripts/generate.rb", "lib/rubigen/scripts/update.rb", "lib/rubigen/simple_logger.rb", "lib/rubigen/spec.rb", "rubygems_generators/application_generator/USAGE", "rubygems_generators/application_generator/application_generator_generator.rb", "rubygems_generators/application_generator/templates/bin", "rubygems_generators/application_generator/templates/generator.rb", "rubygems_generators/application_generator/templates/readme", "rubygems_generators/application_generator/templates/test.rb", "rubygems_generators/application_generator/templates/test_generator_helper.rb", "rubygems_generators/application_generator/templates/usage", "rubygems_generators/component_generator/USAGE", "rubygems_generators/component_generator/component_generator_generator.rb", "rubygems_generators/component_generator/templates/generator.rb", "rubygems_generators/component_generator/templates/rails_generator.rb", "rubygems_generators/component_generator/templates/readme", "rubygems_generators/component_generator/templates/test.rb", "rubygems_generators/component_generator/templates/test_generator_helper.rb", "rubygems_generators/component_generator/templates/usage", "script/console", "script/destroy", "script/generate", "script/txt2html", "test/test_application_generator_generator.rb", "test/test_component_generator_generator.rb", "test/test_generate_builtin_application.rb", "test/test_generate_builtin_test_unit.rb", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_install_rubigen_scripts_generator.rb", "test/test_lookup.rb", "test/test_rubigen_cli.rb", "test_unit_generators/test_unit/USAGE", "test_unit_generators/test_unit/templates/test.rb", "test_unit_generators/test_unit/test_unit_generator.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.js", "website/template.rhtml", "website/version-raw.js", "website/version-raw.txt", "website/version.js", "website/version.txt"]
+  s.has_rdoc = true
+  s.homepage = %q{http://drnic.github.com/rubigen}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rubigen}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{A framework to allow Ruby applications to generate file/folder stubs  (like the `rails` command does for Ruby on Rails, and the 'script/generate' command within a Rails application during development).}
+  s.test_files = ["test/test_application_generator_generator.rb", "test/test_component_generator_generator.rb", "test/test_generate_builtin_application.rb", "test/test_generate_builtin_test_unit.rb", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_install_rubigen_scripts_generator.rb", "test/test_lookup.rb", "test/test_rubigen_cli.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+  end
+end

data/rubygems_generators/application_generator/templates/bin

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'rubigen'
 
 if %w(-v --version).include? ARGV.first
-  require '<%= name %>/version'
+  require '<%= name %>'
   puts "#{File.basename($0)} #{<%= app_model_name %>::VERSION}"
   exit(0)
 end

data/test/test_helper.rb

@@ -1,29 +1,8 @@
+require 'rubygems'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/rubigen'
 require 'rubigen/helpers/generator_test_helper'
 include RubiGen
-
-def load_mocha
-  require 'rubygems'
-  begin
-    gem 'mocha'
-  rescue LoadError
-    puts <<-EOS
-#{$!}
-
-This RubyGem is required to run the tests.
-
-Install: gem install mocha    
-EOS
-  end
-  require 'mocha'
-end
-begin
-  gem 'mocha'
-rescue LoadError
-  load_mocha
-rescue NoMethodError
-  load_mocha
-end
-
-require "shoulda"
+require "shoulda"
+require "shoulda/test_unit"
+require 'mocha'

data/test/test_lookup.rb

@@ -4,15 +4,15 @@ class TestLookup < Test::Unit::TestCase
   include RubiGen
   
   def setup
-    Base.reset_sources
+    RubiGen::Base.reset_sources
   end
   
   def test_lookup_component
-    assert_nothing_raised(GeneratorError, "Could not find install_rubigen_scripts generator") { Base.lookup('install_rubigen_scripts') }
+    assert_nothing_raised(GeneratorError, "Could not find install_rubigen_scripts generator") { RubiGen::Base.lookup('install_rubigen_scripts') }
   end
   
   def test_lookup_unknown_component
-    assert_raise(GeneratorError, "Should not find generator") { Base.lookup('dummy') }
+    assert_raise(GeneratorError, "Should not find generator") { RubiGen::Base.lookup('dummy') }
   end
   
   # There are 5 sources of generators
@@ -25,7 +25,7 @@ class TestLookup < Test::Unit::TestCase
   # Note, this differs from Rails generator:
   # * RubyGems whose name is suffixed with _generator are not loaded (e.g. ajax_scaffold_generator)
   def test_sources
-    sources = Base.sources
+    sources = RubiGen::Base.sources
     assert(sources.find do |source|
       source.path =~ /\.rubigen\/generators$/ if source.respond_to? :path
     end, "One source should be HOME/.rubigen/generators")
@@ -69,38 +69,38 @@ class TestLookup < Test::Unit::TestCase
   end
   
   def test_use_component_sources_without_scope
-    Base.use_component_sources!
-    gem_path_source = Base.sources.find { |source| source.is_a?(GemPathSource) }
+    RubiGen::Base.use_component_sources!
+    gem_path_source = RubiGen::Base.sources.find { |source| source.is_a?(GemPathSource) }
     assert_not_nil(gem_path_source, "Where is the GemPathSource?")
     assert_equal("", gem_path_source.send(:filter_str))
   end
   
   def test_use_component_sources_with_scope
-    Base.use_component_sources! :rubygems, :ruby
-    gem_path_source = Base.sources.find { |source| source.is_a?(GemPathSource) }
+    RubiGen::Base.use_component_sources! :rubygems, :ruby
+    gem_path_source = RubiGen::Base.sources.find { |source| source.is_a?(GemPathSource) }
     assert_not_nil(gem_path_source, "Where is the GemPathSource?")
     assert_equal("{rubygems_,ruby_,}", gem_path_source.send(:filter_str))
-    user_path_source = Base.sources.find { |source| source.is_a?(PathFilteredSource) }
+    user_path_source = RubiGen::Base.sources.find { |source| source.is_a?(PathFilteredSource) }
     assert_not_nil(user_path_source, "Where is the PathFilteredSource?")
     assert_match(/\.rubigen\/\{rubygems_,ruby_,\}generators/, user_path_source.path)
   end
   
   def test_use_application_sources
-    Base.use_application_sources!
+    RubiGen::Base.use_application_sources!
     expected_path = File.expand_path(File.join(File.dirname(__FILE__), %w[.. app_generators]))
-    builtin_source = Base.sources.find { |s| s.path == expected_path if s.respond_to?(:path) }
+    builtin_source = RubiGen::Base.sources.find { |s| s.path == expected_path if s.respond_to?(:path) }
     assert_not_nil(builtin_source, "Cannot find builtin generators")
     assert_nothing_raised(GeneratorError) do
-      generator = Base.lookup('ruby_app')
+      generator = RubiGen::Base.lookup('ruby_app')
     end
   end
 
   def test_use_application_sources_with_scope
-    Base.use_application_sources! :rubygems, :newgem
-    gem_path_source = Base.sources.find { |source| source.is_a?(GemPathSource) }
+    RubiGen::Base.use_application_sources! :rubygems, :newgem
+    gem_path_source = RubiGen::Base.sources.find { |source| source.is_a?(GemPathSource) }
     assert_not_nil(gem_path_source, "Where is the GemPathSource?")
     assert_equal("{app_,rubygems_,newgem_,}", gem_path_source.send(:filter_str))
-    user_path_source = Base.sources.find { |source| source.is_a?(PathFilteredSource) }
+    user_path_source = RubiGen::Base.sources.find { |source| source.is_a?(PathFilteredSource) }
     assert_not_nil(user_path_source, "Where is the PathFilteredSource?")
     assert_match(/\.rubigen\/\{app_,rubygems_,newgem_,\}generators/, user_path_source.path)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubigen
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -10,18 +10,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-12 00:00:00 +10:00
+date: 2010-02-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   type: :runtime
   version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.3.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :runtime
+  version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 0.9.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.10.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -31,9 +61,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.4.0
     version: 
-description: A framework to allow Ruby applications to generate file/folder stubs  (like the `rails` command does for Ruby on Rails, and the 'script/generate' command within a Rails application during development).
+description: |-
+  A framework to allow Ruby applications to generate file/folder stubs 
+  (like the `rails` command does for Ruby on Rails, and the 'script/generate'
+  command within a Rails application during development).
 email: 
 - drnicwilliams@gmail.com
 - jeremy@bitsweat.net
@@ -47,7 +80,6 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
-- README.rdoc
 - Todo.txt
 - app_generators/ruby_app/templates/README.txt
 - website/index.txt
@@ -70,11 +102,14 @@ files:
 - bin/install_rubigen_scripts
 - bin/rubigen
 - bin/ruby_app
+- config/website.yml
 - features/development.feature
 - features/help.feature
 - features/rubigen_cli.feature
-- features/steps/common.rb
-- features/steps/env.rb
+- features/step_definitions/common_steps.rb
+- features/support/common.rb
+- features/support/env.rb
+- features/support/matchers.rb
 - generators/install_rubigen_scripts/install_rubigen_scripts_generator.rb
 - generators/install_rubigen_scripts/templates/script/destroy
 - generators/install_rubigen_scripts/templates/script/generate
@@ -94,6 +129,7 @@ files:
 - lib/rubigen/scripts/update.rb
 - lib/rubigen/simple_logger.rb
 - lib/rubigen/spec.rb
+- rubigen.gemspec
 - rubygems_generators/application_generator/USAGE
 - rubygems_generators/application_generator/application_generator_generator.rb
 - rubygems_generators/application_generator/templates/bin
@@ -138,6 +174,8 @@ files:
 - website/version.txt
 has_rdoc: true
 homepage: http://drnic.github.com/rubigen
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -159,9 +197,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubigen
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A framework to allow Ruby applications to generate file/folder stubs  (like the `rails` command does for Ruby on Rails, and the 'script/generate' command within a Rails application during development).
 test_files: 
 - test/test_application_generator_generator.rb

data/features/steps/env.rb

@@ -1,6 +0,0 @@
-require File.dirname(__FILE__) + "/../../lib/rubigen"
-
-gem 'cucumber'
-require 'cucumber'
-gem 'rspec'
-require 'spec'