newgem 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.4 2008-11-01
+
+* Hard-coded cucumber >= 0.1.8 dependency to avoid accidently requiring unreleased versions that are only in development
+* local tasks/*.rake are loaded in generated gems
+* install_cucumber: adds a development.feature to check that gem building can succeed
+* cleaned up some require statements to explicitly load code from local src not an installed gem
+* rake default => [:test, :features] - for continuous integration via runcoderun.com
+
 == 1.0.3 2008-10-31
 
 * GitHub RubyGem support. `rake gemspec` generates a clean `my_project.gemspec` file that will work with GitHub

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 PostInstall.txt
 README.rdoc
 Rakefile
+TODO.markdown
 app_generators/newgem/newgem_generator.rb
 app_generators/newgem/templates/History.txt
 app_generators/newgem/templates/PostInstall.txt
@@ -39,6 +40,7 @@ features/install_website.feature
 features/newgem_cli.feature
 features/rubygem_tasks.feature
 features/steps/cli.rb
+features/steps/common.rb
 features/steps/env.rb
 features/steps/rubygems.rb
 lib/hoe-patched.rb
@@ -50,6 +52,7 @@ lib/newgem/tasks.rb
 newgem_generators/install_website/USAGE
 newgem_generators/install_website/install_website_generator.rb
 newgem_generators/install_website/templates/config/website.yml.sample.erb
+newgem_generators/install_website/templates/features/website.feature
 newgem_generators/install_website/templates/script/txt2html
 newgem_generators/install_website/templates/script/win_script.cmd
 newgem_generators/install_website/templates/tasks/website.rake
@@ -71,6 +74,7 @@ rubygems_generators/executable/USAGE
 rubygems_generators/executable/executable_generator.rb
 rubygems_generators/executable/templates/bin/app.rb.erb
 rubygems_generators/executable/templates/lib/app/cli.rb.erb
+rubygems_generators/executable/templates/spec/cli_spec.rb.erb
 rubygems_generators/executable/templates/test/test_cli.rb.erb
 rubygems_generators/extconf/USAGE
 rubygems_generators/extconf/extconf_generator.rb
@@ -82,8 +86,9 @@ rubygems_generators/extconf/templates/tasks/extconf.rake
 rubygems_generators/extconf/templates/tasks/extconf_name.rake
 rubygems_generators/extconf/templates/test/test.rb.erb
 rubygems_generators/install_cucumber/install_cucumber_generator.rb
-rubygems_generators/install_cucumber/templates/cucumber.rake
-rubygems_generators/install_cucumber/templates/env.rb
+rubygems_generators/install_cucumber/templates/features/development.feature
+rubygems_generators/install_cucumber/templates/features/steps/common.rb
+rubygems_generators/install_cucumber/templates/features/steps/env.rb.erb
 rubygems_generators/install_jruby/USAGE
 rubygems_generators/install_jruby/install_jruby_generator.rb
 rubygems_generators/install_jruby/templates/tasks/jruby.rake

data/README.rdoc

@@ -83,6 +83,14 @@ Alternately, download the gem and install manually.
 
 Tickets or suggestions can be raised at http://drnic.lighthouseapp.com/projects/18881-newgem/overview
 
+== DOES IT WORK?
+
+Much of newgem's behaviour is covered by functional tests (see features at http://github.com/drnic/newgem/tree/master/features).
+
+With each commit to the master branch of the git repository, these functional tests and the unit tests are run via a continuous integration server. 
+
+Current build status: http://runcoderun.com/drnic/newgem
+
 == TUTORIALS:
 
 * Home page is a full tutorial - http://newgem.rubyforge.org

data/Rakefile

@@ -15,7 +15,7 @@ $hoe = Hoe.new('newgem', Newgem::VERSION) do |p|
     ['syntax','>= 1.0.0']
   ]
   p.extra_dev_deps = [
-    ['cucumber', ">= #{::Cucumber::VERSION::STRING}"]
+    ['cucumber', ">= 1.1.8"]
   ]
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
@@ -54,3 +54,6 @@ namespace :hoe do
     end
   end
 end
+
+remove_task :default
+task :default => :features

data/TODO.markdown

@@ -0,0 +1,5 @@
+## install_cucumber
+
+* don't generate tasks/cucumber.rake since its already loaded from newgem
+
+## Rakefile

data/app_generators/newgem/newgem_generator.rb

@@ -151,7 +151,7 @@ EOS
       @author            = options[:author]
       @email             = options[:email]
       unless @author && @email
-        require 'newgem/rubyforge'
+        require File.dirname(__FILE__) + '/../../lib/newgem/rubyforge'
         rubyforge_config = Newgem::Rubyforge.new
         @author ||= rubyforge_config.full_name
         @email  ||= rubyforge_config.email

data/app_generators/newgem/templates/Rakefile

@@ -24,4 +24,7 @@ $hoe = Hoe.new('<%= gem_name %>', <%= module_name %>::VERSION) do |p|
 end
 
 require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
 
+# TODO - want other tests/tasks run by default? Add them to the list
+# task :default => [:spec, :features]

data/features/development.feature

@@ -3,20 +3,11 @@ Feature: Development processes of newgem itself (rake tasks)
   As a Newgem maintainer or contributor
   I want rake tasks to maintain and release the gem
   So that I can spend time on the tests and code, and not excessive time on maintenance processes
-  
-  # Scenario: Deploy project website via local rsync
-  #   Given copy this project for test
-  #   Given a safe folder for dummy deployment
-  #   Given project website configuration for safe folder on local machine
-  #   When task 'rake website' is invoked
-  #   Then file 'website/index.html' is created
-  #   Then remote file 'index.html' is created after local rsync
-  #   Then remote folder 'rdoc' is created after local rsync
-  # 
+    
   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 matching 'pkg/newgem-*.gem' is created
+    And file matching 'pkg/*.gem' is created else you should run "rake manifest:refresh" to fix this
     And gem spec key 'rdoc_options' contains /--mainREADME.rdoc/

data/features/executable_generator.feature

@@ -11,6 +11,14 @@ Feature: Generate an executable/CLI scaffold
     And file 'bin/my_app' is created
     And file 'lib/my_app/cli.rb' is created
     And file 'test/test_my_app_cli.rb' is created
+
+  Scenario: Run executable generator with name of executable on rspec project
+    Given an existing newgem scaffold using options '-T rspec' [called 'my_project']
+    When 'executable' generator is invoked with arguments 'my_app'
+    Then folder 'bin/my_app' is created
+    And file 'bin/my_app' is created
+    And file 'lib/my_app/cli.rb' is created
+    And file 'spec/my_app_cli_spec.rb' is created
   
   Scenario: Run CLI app from executable generator to show help
     Given an existing newgem scaffold [called 'my_project']
@@ -25,9 +33,14 @@ Feature: Generate an executable/CLI scaffold
     When run executable 'bin/my_app' with arguments ''
     Then output does match /lib\/my_app\/cli.rb/
   
-  Scenario: Run unit tests after executable generator should all pass
+  Scenario: Run unit tests after executable generator should all pass for test/unit
     Given an existing newgem scaffold [called 'my_project']
-    Given 'executable' generator is invoked with arguments 'my_app'
+    And 'executable' generator is invoked with arguments 'my_app'
     When run unit tests for test file 'test/test_my_app_cli.rb'
     Then all 1 tests pass
-  
+
+  Scenario: Run unit tests after executable generator should all pass for rspec
+    Given an existing newgem scaffold using options '-T rspec' [called 'my_project']
+    And 'executable' generator is invoked with arguments 'my_app'
+    When run unit tests for test file 'spec/my_app_cli_spec.rb'
+    Then all 1 examples pass

data/features/install_cucumber.feature

@@ -8,10 +8,22 @@ Feature: RubyGems have features to be described and tested
     Given an existing newgem scaffold [called 'my_project']
     When 'install_cucumber' generator is invoked with arguments ''
     Then folder 'features/steps' is created
-    And file 'tasks/cucumber.rake' is created
+    And file 'features/development.feature' is created
+    And file 'features/steps/common.rb' is created
+    And file 'tasks/cucumber.rake' is not created as it is loaded via newgem itself
+
+  Scenario: NewGem and generated gems should share some common files
+    Given an existing newgem scaffold [called 'my_project']
+    When 'install_cucumber' generator is invoked with arguments ''
+    Then gem file 'features/steps/common.rb' and generated file 'features/steps/common.rb' should be the same
+    Then gem file 'features/development.feature' and generated file 'features/development.feature' should be the same
 
   Scenario: Installed Cucumber includes a 'rake features' task
     Given an existing newgem scaffold [called 'my_project']
     And 'install_cucumber' generator is invoked with arguments ''
     When task 'rake features' is invoked
     Then task 'rake features' is executed successfully
+    And output does match /Feature: Development processes of newgem itself \(rake tasks\)/
+    And output does match /And file matching 'pkg/\*\.gem' is created/
+    And output does not match /You can use these snippets to implement pending steps/
+

data/features/steps/cli.rb

@@ -1,39 +1,22 @@
-Given %r{^a safe folder} do
-  FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
-  FileUtils.mkdir_p @tmp_root
-  @newgem_lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
-end
-
-Given /^this project is active project folder/ do
+Given %r{^an existing newgem scaffold \[called '(.*)'\]} do |project_name|
   Given "a safe folder"
-  @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
-end
-
-Given /^env variable \$([\w_]+) set to '(.*)'/ do |env_var, value|
-  ENV[env_var] = value
-end
-
-def force_local_newgem_priority(project_name = @project_name)
-  rakefile = File.read(File.join(project_name, 'Rakefile'))
-  File.open(File.join(project_name, 'Rakefile'), "w+") do |f|
-    f << "$:.unshift('#{@newgem_lib_path}')\n"
-    f << rakefile
+  newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
+  setup_active_project_folder project_name
+  FileUtils.chdir @tmp_root do
+    @stdout = "newgem.out"
+    system "ruby #{newgem} #{project_name} > #{@stdout}"
+    force_local_lib_override
   end
 end
 
-def setup_active_project_folder project_name
-  @active_project_folder = File.join(@tmp_root, project_name)
-  @project_name = project_name
-end
-
-Given %r{^an existing newgem scaffold \[called '(.*)'\]} do |project_name|
+Given %r{^an existing newgem scaffold using options '(.*)' \[called '(.*)'\]} do |arguments, project_name|
   Given "a safe folder"
   newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
   setup_active_project_folder project_name
   FileUtils.chdir @tmp_root do
     @stdout = "newgem.out"
-    system "ruby #{newgem} #{project_name} > #{@stdout}"
-    force_local_newgem_priority
+    system "ruby #{newgem} #{arguments} #{project_name} > #{@stdout}"
+    force_local_lib_override
   end
 end
 
@@ -49,19 +32,13 @@ Given /^project website configuration for safe folder on local machine$/ do
   end  
 end
 
-Given /^'(.*)' folder is deleted/ do |folder|
-  FileUtils.chdir @active_project_folder do
-    FileUtils.rm_rf folder
-  end
-end
-
 When %r{^newgem is executed for project '(.*)' with no options$} do |project_name|
   newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
   setup_active_project_folder project_name
   FileUtils.chdir @tmp_root do
     @stdout = "newgem.out"
     system "ruby #{newgem} #{project_name} > #{@stdout}"
-    force_local_newgem_priority
+    force_local_lib_override
   end
 end
 
@@ -71,25 +48,7 @@ When %r{^newgem is executed for project '(.*)' with options '(.*)'$} do |project
   FileUtils.chdir @tmp_root do
     @stdout = "newgem.out"
     system "ruby #{newgem} #{arguments} #{project_name} > #{@stdout}"
-    force_local_newgem_priority
-  end
-end
-
-When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, arguments|
-  FileUtils.chdir(@active_project_folder) do
-    if Object.const_defined?("APP_ROOT")
-      APP_ROOT.replace(FileUtils.pwd)
-    else 
-      APP_ROOT = FileUtils.pwd
-    end
-    run_generator(generator, arguments.split(' '), SOURCES)
-  end
-end
-
-When /^run executable '(.*)' with arguments '(.*)'$/ do |executable, arguments|
-  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "ruby #{executable} #{arguments} > #{@stdout}"
+    force_local_lib_override
   end
 end
 
@@ -100,103 +59,14 @@ When /^run unit tests for test file '(.*)'$/ do |test_file|
   end
 end
 
-When /^task 'rake (.*)' is invoked$/ do |task|
-  @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
-  end
-end
-
-Then %r{^folder '(.*)' is created} do |folder|
-  FileUtils.chdir @active_project_folder do
-    File.exists?(folder).should be_true
-  end
-end
-
 Then %r{^remote folder '(.*)' is created} do |folder|
   FileUtils.chdir @remote_folder do
     File.exists?(folder).should be_true
   end
 end
 
-Then %r{^file '(.*)' (is|is not) created} do |file, is|
-  FileUtils.chdir @active_project_folder do
-    File.exists?(file).should(is == 'is' ? be_true : be_false)
-  end
-end
-
 Then %r{^remote file '(.*)' (is|is not) created} do |file, is|
   FileUtils.chdir @remote_folder do
     File.exists?(file).should(is == 'is' ? be_true : be_false)
   end
 end
-
-Then /^file matching '(.*)' is created$/ do |pattern|
-  FileUtils.chdir @active_project_folder do
-    Dir[pattern].should_not be_empty
-  end
-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|
-  actual_output = File.read(File.dirname(__FILE__) + "/../../tmp/#{@stdout}")
-  does_invoke == "does" ?
-    actual_output.should(match(/dependency\s+#{generator}/)) :
-    actual_output.should_not(match(/dependency\s+#{generator}/))
-end
-
-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 /^output (does|does not) match \/(.*)\/$/ do |does, regex|
-  actual_output = File.read(@stdout)
-  (does == 'does') ?
-    actual_output.should(match(/#{regex}/)) :
-    actual_output.should_not(match(/#{regex}/)) 
-end
-
-Then /^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 /^yaml file '(.*)' contains (\{.*\})/ do |file, yaml|
-  FileUtils.chdir @active_project_folder do
-    yaml = eval yaml
-    YAML.load(File.read(file)).should == yaml
-  end
-end
-
-Then /^gem spec key '(.*)' contains \/(.*)\/$/ do |key, regex|
-  FileUtils.chdir @active_project_folder do
-    gem_file = Dir["pkg/*.gem"].first
-    gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)
-    spec_value = gem_spec.send(key.to_sym)
-    spec_value.to_s.should match(/#{regex}/)
-  end
-end
-
-Then /^Rakefile can display tasks successfully$/ do
-  @rake_stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "rake -T > #{@rake_stdout} 2> #{@rake_stdout}"
-  end
-  actual_output = File.read(@rake_stdout)
-  actual_output.should match(/^rake\s+\w+\s+#\s.*/)
-end
-
-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

data/features/steps/common.rb

@@ -0,0 +1,154 @@
+Given %r{^a safe folder} do
+  FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
+  FileUtils.mkdir_p @tmp_root
+  @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
+end
+
+Given /^this project is active project folder/ do
+  Given "a safe folder"
+  @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
+end
+
+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
+end
+
+Given /^'(.*)' folder is deleted/ do |folder|
+  FileUtils.chdir @active_project_folder do
+    FileUtils.rm_rf folder
+  end
+end
+
+When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, arguments|
+  FileUtils.chdir(@active_project_folder) do
+    if Object.const_defined?("APP_ROOT")
+      APP_ROOT.replace(FileUtils.pwd)
+    else 
+      APP_ROOT = FileUtils.pwd
+    end
+    run_generator(generator, arguments.split(' '), SOURCES)
+  end
+end
+
+When /^run executable '(.*)' with arguments '(.*)'$/ do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  FileUtils.chdir(@active_project_folder) do
+    system "ruby #{executable} #{arguments} > #{@stdout}"
+  end
+end
+
+When /^task 'rake (.*)' is invoked$/ do |task|
+  @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
+  FileUtils.chdir(@active_project_folder) do
+    system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
+  end
+end
+
+Then %r{^folder '(.*)' is created} do |folder|
+  FileUtils.chdir @active_project_folder do
+    File.exists?(folder).should be_true
+  end
+end
+
+Then %r{^file '(.*)' (is|is not) created} do |file, is|
+  FileUtils.chdir @active_project_folder do
+    File.exists?(file).should(is == 'is' ? be_true : be_false)
+  end
+end
+
+Then /^file matching '(.*)' is created/ do |pattern|
+  FileUtils.chdir @active_project_folder do
+    Dir[pattern].should_not be_empty
+  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}")
+  project_file_contents = File.read(File.join(@active_project_folder, project_file))
+  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|
+  actual_output = File.read(File.dirname(__FILE__) + "/../../tmp/#{@stdout}")
+  does_invoke == "does" ?
+    actual_output.should(match(/dependency\s+#{generator}/)) :
+    actual_output.should_not(match(/dependency\s+#{generator}/))
+end
+
+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 /^output (does|does not) match \/(.*)\/$/ do |does, regex|
+  actual_output = File.read(@stdout)
+  (does == 'does') ?
+    actual_output.should(match(/#{regex}/)) :
+    actual_output.should_not(match(/#{regex}/)) 
+end
+
+Then /^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 /^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 /^yaml file '(.*)' contains (\{.*\})/ do |file, yaml|
+  FileUtils.chdir @active_project_folder do
+    yaml = eval yaml
+    YAML.load(File.read(file)).should == yaml
+  end
+end
+
+Then /^Rakefile can display tasks successfully$/ do
+  @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
+  FileUtils.chdir(@active_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 /^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 /^gem spec key '(.*)' contains \/(.*)\/$/ do |key, regex|
+  FileUtils.chdir @active_project_folder do
+    gem_file = Dir["pkg/*.gem"].first
+    gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)
+    spec_value = gem_spec.send(key.to_sym)
+    spec_value.to_s.should match(/#{regex}/)
+  end
+end

data/lib/newgem.rb

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 require "hoe-patched"
 
 module Newgem
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/newgem_generators/install_website/install_website_generator.rb

@@ -87,7 +87,7 @@ EOS
 
     def github_username
       @github_username ||= begin
-        require 'newgem/rubyforge'
+        require File.dirname(__FILE__) + '/../../lib/newgem/rubyforge'
         rubyforge_config = Newgem::Rubyforge.new
         rubyforge_config.github_username
       end

data/newgem_generators/install_website/templates/features/website.feature

@@ -0,0 +1,14 @@
+Feature: Can deploy a website to a remote server via rsycn
+  In order to promote and educate people about this project
+  As a website maintainer
+  I want a simple helper to generate and push a website to a remote server
+
+  Scenario: Deploy project website via local rsync
+    Given copy this project for test
+    Given a safe folder for dummy deployment
+    Given project website configuration for safe folder on local machine
+    When task 'rake website' is invoked
+    Then file 'website/index.html' is created
+    Then remote file 'index.html' is created after local rsync
+    Then remote folder 'rdoc' is created after local rsync
+  

data/rubygems_generators/executable/executable_generator.rb

@@ -31,7 +31,11 @@ class ExecutableGenerator < RubiGen::Base
       # App stub
       m.template "bin/app.rb.erb", "bin/#{bin_name}"
       m.template "lib/app/cli.rb.erb", "lib/#{bin_name}/cli.rb"
-      m.template "test/test_cli.rb.erb", "test/test_#{bin_name}_cli.rb"
+      if using_rspec?
+        m.template "spec/cli_spec.rb.erb", "spec/#{bin_name}_cli_spec.rb"
+      else
+        m.template "test/test_cli.rb.erb", "test/test_#{bin_name}_cli.rb"
+      end
     end
   end
 
@@ -56,4 +60,8 @@ EOS
     def extract_options
       @author = options[:author]
     end
+    
+    def using_rspec?
+      !Dir[File.join(destination_root, 'spec')].empty?
+    end
 end

data/rubygems_generators/executable/templates/bin/app.rb.erb

@@ -7,4 +7,4 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/<%= project_name %>")
 
 require "<%= bin_name %>/cli"
 
-<%= module_name %>::CLI.execute
+<%= module_name %>::CLI.execute(ARGV)

data/rubygems_generators/executable/templates/lib/app/cli.rb.erb

@@ -2,7 +2,7 @@ require 'optparse'
 
 module <%= module_name %>
   class CLI
-    def self.execute
+    def self.execute(arguments=[])
 
       # NOTE: the option -p/--path= is given as an example, and should be replaced in your application.
 
@@ -26,7 +26,7 @@ module <%= module_name %>
                 "Default: ~") { |arg| OPTIONS[:path] = arg }
         opts.on("-h", "--help",
                 "Show this help message.") { puts opts; exit }
-        opts.parse!(ARGV)
+        opts.parse!(arguments)
 
         if mandatory_options && mandatory_options.find { |option| options[option.to_sym].nil? }
           puts opts; exit

data/rubygems_generators/executable/templates/spec/cli_spec.rb.erb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require '<%= bin_name %>/cli'
+
+describe "Execute CLI" do
+  it "should execute" do
+    <%= module_name %>::CLI.execute
+  end
+end

data/rubygems_generators/install_cucumber/install_cucumber_generator.rb

@@ -17,10 +17,9 @@ class InstallCucumberGenerator < RubiGen::Base
       script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
 
       m.directory 'features/steps'
-      m.template  'env.rb', 'features/steps/env.rb'
-
-      m.directory 'tasks'
-      m.file      'cucumber.rake', 'tasks/cucumber.rake'
+      m.file      'features/development.feature', 'features/development.feature'
+      m.file      'features/steps/common.rb', 'features/steps/common.rb'
+      m.template  'features/steps/env.rb.erb', 'features/steps/env.rb'
     end
   end
 

data/rubygems_generators/install_cucumber/templates/features/development.feature

@@ -0,0 +1,13 @@
+Feature: Development processes of newgem itself (rake tasks)
+
+  As a Newgem maintainer or contributor
+  I want rake tasks to maintain and release the gem
+  So that I can spend time on the tests and code, and not excessive time on maintenance processes
+    
+  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 matching 'pkg/*.gem' is created else you should run "rake manifest:refresh" to fix this
+    And gem spec key 'rdoc_options' contains /--mainREADME.rdoc/

data/rubygems_generators/install_cucumber/templates/features/steps/common.rb

@@ -0,0 +1,154 @@
+Given %r{^a safe folder} do
+  FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
+  FileUtils.mkdir_p @tmp_root
+  @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
+end
+
+Given /^this project is active project folder/ do
+  Given "a safe folder"
+  @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
+end
+
+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
+end
+
+Given /^'(.*)' folder is deleted/ do |folder|
+  FileUtils.chdir @active_project_folder do
+    FileUtils.rm_rf folder
+  end
+end
+
+When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, arguments|
+  FileUtils.chdir(@active_project_folder) do
+    if Object.const_defined?("APP_ROOT")
+      APP_ROOT.replace(FileUtils.pwd)
+    else 
+      APP_ROOT = FileUtils.pwd
+    end
+    run_generator(generator, arguments.split(' '), SOURCES)
+  end
+end
+
+When /^run executable '(.*)' with arguments '(.*)'$/ do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  FileUtils.chdir(@active_project_folder) do
+    system "ruby #{executable} #{arguments} > #{@stdout}"
+  end
+end
+
+When /^task 'rake (.*)' is invoked$/ do |task|
+  @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
+  FileUtils.chdir(@active_project_folder) do
+    system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
+  end
+end
+
+Then %r{^folder '(.*)' is created} do |folder|
+  FileUtils.chdir @active_project_folder do
+    File.exists?(folder).should be_true
+  end
+end
+
+Then %r{^file '(.*)' (is|is not) created} do |file, is|
+  FileUtils.chdir @active_project_folder do
+    File.exists?(file).should(is == 'is' ? be_true : be_false)
+  end
+end
+
+Then /^file matching '(.*)' is created/ do |pattern|
+  FileUtils.chdir @active_project_folder do
+    Dir[pattern].should_not be_empty
+  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}")
+  project_file_contents = File.read(File.join(@active_project_folder, project_file))
+  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|
+  actual_output = File.read(File.dirname(__FILE__) + "/../../tmp/#{@stdout}")
+  does_invoke == "does" ?
+    actual_output.should(match(/dependency\s+#{generator}/)) :
+    actual_output.should_not(match(/dependency\s+#{generator}/))
+end
+
+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 /^output (does|does not) match \/(.*)\/$/ do |does, regex|
+  actual_output = File.read(@stdout)
+  (does == 'does') ?
+    actual_output.should(match(/#{regex}/)) :
+    actual_output.should_not(match(/#{regex}/)) 
+end
+
+Then /^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 /^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 /^yaml file '(.*)' contains (\{.*\})/ do |file, yaml|
+  FileUtils.chdir @active_project_folder do
+    yaml = eval yaml
+    YAML.load(File.read(file)).should == yaml
+  end
+end
+
+Then /^Rakefile can display tasks successfully$/ do
+  @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
+  FileUtils.chdir(@active_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 /^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 /^gem spec key '(.*)' contains \/(.*)\/$/ do |key, regex|
+  FileUtils.chdir @active_project_folder do
+    gem_file = Dir["pkg/*.gem"].first
+    gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)
+    spec_value = gem_spec.send(key.to_sym)
+    spec_value.to_s.should match(/#{regex}/)
+  end
+end

data/tasks/deployment.rake

@@ -24,7 +24,7 @@ task :check_version do
     exit
   end
   unless ENV['VERSION'] == $hoe.version
-    puts "Please update your version.rb to match the release version, currently #{$hoe.version}"
+    puts "Please update your lib/#{$hoe.name}.rb to match the release version, currently #{$hoe.version}"
     exit
   end
 end

data/test/test_install_cucumber_generator.rb

@@ -31,8 +31,6 @@ class TestInstallCucumberGenerator < Test::Unit::TestCase
     assert_generated_file("features/steps/env.rb") do |body|
       assert_match(/#{PROJECT_NAME}/, body)
     end
-    assert_directory_exists("tasks")
-    assert_generated_file("tasks/cucumber.rake")
   end
   
   private

data/test/test_install_website_generator.rb

@@ -20,7 +20,6 @@ class TestInstallWebsiteGenerator < Test::Unit::TestCase
     end
     assert_generated_file("config/website.yml.sample")
     assert_generated_file("script/txt2html")
-    assert_generated_file("tasks/website.rake")
   end
   
   private

data/test/test_newgem_generator.rb

@@ -39,8 +39,8 @@ class TestNewgemGenerator < Test::Unit::TestCase
     assert_manifest_complete
   end
 
-  def test_newgem_with_website_by_default
-    run_generator('newgem', [APP_ROOT], sources)
+  def test_newgem_with_website
+    run_generator('newgem', [APP_ROOT], sources, {:enable_website => true})
 
     %w[txt2html].each do |file|
       assert_generated_file("script/#{file}")
@@ -54,7 +54,7 @@ class TestNewgemGenerator < Test::Unit::TestCase
   end
 
   def test_newgem_with_no_website
-    run_generator('newgem', [APP_ROOT], sources, {:disable_website => true})
+    run_generator('newgem', [APP_ROOT], sources)
 
     assert !File.exists?("#{APP_ROOT}/script/txt2html"), "No script/txt2html should be generated"
     assert !File.exists?("#{APP_ROOT}/website"), "No website folder should be generated"

data/website/index.html

@@ -39,7 +39,7 @@
     
       <div id="version"> <!--  class="clickable" onclick='document.location = "http://rubyforge.org/projects/newgem"; return true' -->
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.0.3</a>
+        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.0.4</a>
         <p>Featured in</p>
         <a  href="http://www.amazon.com/gp/redirect.html?ie=UTF8&location=http%3A%2F%2Fwww.amazon.com%2FBeginning-Ruby-Novice-Professional-Experts%2Fdp%2F1590597664%2F&tag=drnic-20&linkCode=ur2&camp=1789&creative=9325" class="book"><img src="images/beginning-ruby.jpg" /></a>
       </div>
@@ -128,7 +128,7 @@ Important
 <p><span class="caps">NOTE</span>: Currently, the initial <code>index.txt</code> file includes my details not yours. Currently you need to change this manually.</p>
 <p>If you don&#8217;t want a website, remove the <code>website</code> related files from the Manifest.txt.</p>
 <h3>Change the gems version number</h3>
-<p>The version number is set in the file <code>lib/#gem name#/version.rb</code>. Update it as appropriate with major, minor and bug fix numbers. This value will be used when generating your website, for example.</p>
+<p>The version number is set in the file <code>lib/#gem name#.rb</code>. Update it as appropriate with major, minor and bug fix numbers. This value will be used when generating your website, for example.</p>
 <h3>Check the manifest</h3>
 <blockquote>Manifest: a customs document listing the contents put on a ship or plane.</blockquote>
 <p><cite><a href="http://www.google.com/search?q=define%3Amanifest">Google &#8211; define:manifest</a></cite></p>
@@ -224,7 +224,7 @@ rake install_gem</pre>
 <h2>Contact</h2>
 <p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 28th October 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 31st October 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -96,7 +96,7 @@ If you don't want a website, remove the <code>website</code> related files from
 
 h3. Change the gems version number
 
-The version number is set in the file <code>lib/#gem name#/version.rb</code>. Update it as appropriate with major, minor and bug fix numbers. This value will be used when generating your website, for example.
+The version number is set in the file <code>lib/#gem name#.rb</code>. Update it as appropriate with major, minor and bug fix numbers. This value will be used when generating your website, for example.
 
 h3. Check the manifest
 

data/website/rubyforge.html

@@ -39,7 +39,7 @@
     
       <div id="version"> <!--  class="clickable" onclick='document.location = "http://rubyforge.org/projects/newgem"; return true' -->
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.0.3</a>
+        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.0.4</a>
         <p>Featured in</p>
         <a  href="http://www.amazon.com/gp/redirect.html?ie=UTF8&location=http%3A%2F%2Fwww.amazon.com%2FBeginning-Ruby-Novice-Professional-Experts%2Fdp%2F1590597664%2F&tag=drnic-20&linkCode=ur2&camp=1789&creative=9325" class="book"><img src="images/beginning-ruby.jpg" /></a>
       </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 00:00:00 +10:00
+date: 2008-11-01 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.9
+        version: 1.1.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -111,6 +111,7 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
+- TODO.markdown
 - app_generators/newgem/newgem_generator.rb
 - app_generators/newgem/templates/History.txt
 - app_generators/newgem/templates/PostInstall.txt
@@ -147,6 +148,7 @@ files:
 - features/newgem_cli.feature
 - features/rubygem_tasks.feature
 - features/steps/cli.rb
+- features/steps/common.rb
 - features/steps/env.rb
 - features/steps/rubygems.rb
 - lib/hoe-patched.rb
@@ -158,6 +160,7 @@ files:
 - newgem_generators/install_website/USAGE
 - newgem_generators/install_website/install_website_generator.rb
 - newgem_generators/install_website/templates/config/website.yml.sample.erb
+- newgem_generators/install_website/templates/features/website.feature
 - newgem_generators/install_website/templates/script/txt2html
 - newgem_generators/install_website/templates/script/win_script.cmd
 - newgem_generators/install_website/templates/tasks/website.rake
@@ -179,6 +182,7 @@ files:
 - rubygems_generators/executable/executable_generator.rb
 - rubygems_generators/executable/templates/bin/app.rb.erb
 - rubygems_generators/executable/templates/lib/app/cli.rb.erb
+- rubygems_generators/executable/templates/spec/cli_spec.rb.erb
 - rubygems_generators/executable/templates/test/test_cli.rb.erb
 - rubygems_generators/extconf/USAGE
 - rubygems_generators/extconf/extconf_generator.rb
@@ -190,8 +194,9 @@ files:
 - rubygems_generators/extconf/templates/tasks/extconf_name.rake
 - rubygems_generators/extconf/templates/test/test.rb.erb
 - rubygems_generators/install_cucumber/install_cucumber_generator.rb
-- rubygems_generators/install_cucumber/templates/cucumber.rake
-- rubygems_generators/install_cucumber/templates/env.rb
+- rubygems_generators/install_cucumber/templates/features/development.feature
+- rubygems_generators/install_cucumber/templates/features/steps/common.rb
+- rubygems_generators/install_cucumber/templates/features/steps/env.rb.erb
 - rubygems_generators/install_jruby/USAGE
 - rubygems_generators/install_jruby/install_jruby_generator.rb
 - rubygems_generators/install_jruby/templates/tasks/jruby.rake

data/rubygems_generators/install_cucumber/templates/cucumber.rake

@@ -1,6 +0,0 @@
-gem 'cucumber'
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
-end