@@ -1,4 +1,4 @@ -== 1.3.1 2009-03-17 +== 1.3.1 2009-03-17 NOT RELEASED * install_shoulda - use "newgem -T shoulda" to use shoulda for testing instead of test_unit or rspec * common_steps.rb - When steps all started with 'I ...' History.txt @@ -1,4 +1,5 @@ -%w[rubygems rake rake/clean fileutils rubigen].each { |f| require f } +require 'rubygems' unless ENV['NO_RUBYGEMS'] +%w[rake rake/clean fileutils rubigen].each { |f| require f } require File.dirname(__FILE__) + '/lib/newgem' # Generate all the Rake tasks Rakefile @@ -1,4 +1,4 @@ -require 'rubygems' +require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'rake/gempackagetask' require 'rubygems/specification' require 'date' app_generators/newgem_simple/templates/Rakefile @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require 'rubygems' +require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'rubigen' if %w(-v --version).include? ARGV.first bin/newgem @@ -11,6 +11,8 @@ 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 + When I run unit tests for test file 'test/test_my_app_cli.rb' + Then all 1 tests pass Scenario: Run executable generator with name of executable on rspec project Given an existing newgem scaffold using options '-T rspec' [called 'my_project'] @@ -19,6 +21,17 @@ Feature: Generate an executable/CLI scaffold 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 + When I enable rspec autorun + And I run unit tests for test file 'spec/my_app_cli_spec.rb' + Then all 1 examples pass + + Scenario: Run executable generator with name of executable on shoulda project + Given an existing newgem scaffold using options '-T shoulda' [called 'my_project'] + When I invoke 'executable' generator 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 'test/test_my_app_cli.rb' is created Scenario: Run CLI app from executable generator to show help Given an existing newgem scaffold [called 'my_project'] @@ -29,7 +42,7 @@ Feature: Generate an executable/CLI scaffold Scenario: Run CLI app from executable generator should not fail Given an existing newgem scaffold [called 'my_project'] - Given I invoke 'executable' generator with arguments 'my_app' + And I invoke 'executable' generator with arguments 'my_app' When I run project executable 'bin/my_app' with arguments '' Then output does match /lib\/my_app\/cli.rb/ @@ -42,5 +55,6 @@ Feature: Generate an executable/CLI scaffold Scenario: Run examples after executable generator should all pass for rspec Given an existing newgem scaffold using options '-T rspec' [called 'my_project'] And I invoke 'executable' generator with arguments 'my_app' - When I run unit tests for test file 'spec/my_app_cli_spec.rb' + When I enable rspec autorun + And I run unit tests for test file 'spec/my_app_cli_spec.rb' Then all 1 examples pass features/executable_generator.feature @@ -27,12 +27,13 @@ Feature: Write and test C-extensions Given an existing newgem scaffold [called 'my_project'] And I invoke 'extconf' generator with arguments 'my_ext' When I invoke task 'rake compile' - And run unit tests for test file 'test/test_my_ext_extn.rb' + And I run unit tests for test file 'test/test_my_ext_extn.rb' Then all 1 tests pass Scenario: Run examples after executable generator should all pass for rspec Given an existing newgem scaffold using options '-T rspec' [called 'my_project'] And I invoke 'extconf' generator with arguments 'my_ext' When I invoke task 'rake compile' - And run unit tests for test file 'spec/my_ext_extn_spec.rb' + And I enable rspec autorun + And I run unit tests for test file 'spec/my_ext_extn_spec.rb' Then all 1 examples pass features/extconf.feature @@ -77,6 +77,14 @@ When /^I run unit tests for test file '(.*)'$/ do |test_file| end end +When /^I enable rspec autorun$/ do + in_project_folder do + File.open("spec/spec_helper.rb", "a") do |f| + f << "require 'spec/autorun'" + end + end +end + Then /^remote folder '(.*)' is created/ do |folder| FileUtils.chdir @remote_folder do File.exists?(folder).should be_true features/step_definitions/cli_steps.rb @@ -5,7 +5,7 @@ require 'spec' require 'pp' require 'fileutils' -require 'rubygems' +require 'rubygems' unless ENV['NO_RUBYGEMS'] # Following lines from original Rails cucumber generator. # Not sure how to translate/reuse etc yet. @@ -22,12 +22,7 @@ require 'rubygems' # code from test/test_generator_helper.rb TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT) -begin - require 'rubigen' -rescue LoadError - require 'rubygems' - require 'rubigen' -end +require 'rubigen' require 'rubigen/helpers/generator_test_helper' include RubiGen::GeneratorTestHelper features/support/env.rb @@ -1,7 +1,7 @@ begin require 'rubyforge' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] gem 'rubyforge' require 'rubyforge' end lib/newgem/rubyforge-ext.rb @@ -1,7 +1,7 @@ begin require 'spec' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] gem 'rspec' require 'spec' end rubygems_generators/install_rspec/templates/spec/spec_helper.rb @@ -1,7 +1,7 @@ begin require 'spec' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'spec' end begin rubygems_generators/install_rspec/templates/tasks/rspec.rake @@ -1,7 +1,7 @@ begin require 'shoulda' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'shoulda' end rubygems_generators/install_shoulda/templates/tasks/shoulda.rake @@ -1,7 +1,7 @@ begin require 'shoulda' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'shoulda' end rubygems_generators/install_shoulda/templates/test/test_helper.rb @@ -4,7 +4,7 @@ APP_ROOT = File.join(File.dirname(__FILE__), '..') begin require 'rubigen' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'rubigen' end require 'rubigen/scripts/destroy' script/destroy @@ -4,7 +4,7 @@ APP_ROOT = File.join(File.dirname(__FILE__), '..') begin require 'rubigen' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'rubigen' end require 'rubigen/scripts/generate' script/generate @@ -23,7 +23,7 @@ end begin require 'rubigen' rescue LoadError - require 'rubygems' + require 'rubygems' unless ENV['NO_RUBYGEMS'] require 'rubigen' end require 'rubigen/helpers/generator_test_helper' test/test_generator_helper.rb f35e5c7fc9ca8dd3d3784deae90daec8b99a2ac0 Dr Nic Williams drnicwilliams@gmail.com http://github.com/drnic/newgem/commit/5ad9bb19aab569d5e86c89b6dc4dd7a74dc060a0 5ad9bb19aab569d5e86c89b6dc4dd7a74dc060a0 2009-03-17T09:11:51-07:00 2009-03-17T09:11:51-07:00 all require 'rubygems' are conditional unless ENV['NO_RUBYGEMS']; rspec 1.2 requires our steps to add a spec/autorun load first 59d34a56ed4c0f63ee3604ce10bd5416d114c574 Dr Nic Williams drnicwilliams@gmail.com