newgem 1.3.0 → 1.4.0

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/newgem.rb

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

data/lib/newgem/rubyforge-ext.rb

@@ -1,7 +1,7 @@
 begin
   require 'rubyforge'
 rescue LoadError
-  require 'rubygems'
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
   gem 'rubyforge'
   require 'rubyforge'
 end

data/newgem_generators/install_website/install_website_generator.rb

@@ -17,7 +17,7 @@ class InstallWebsiteGenerator < RubiGen::Base
     super
     @destination_root   = File.expand_path(destination_root)
     @gem_name           = base_name
-    @module_name        = @gem_name.camelcase
+    @module_name        = @gem_name.gsub('-','_').camelize
     @rubyforge_username = ENV['RUBYFORGE_USERNAME'].nil? || ENV['RUBYFORGE_USERNAME'].empty? ? 'unknown' : ENV['RUBYFORGE_USERNAME']
     extract_options
   end

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

@@ -7,8 +7,8 @@ Feature: Can deploy a website to a remote server via rsycn
     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
+    When I invoke task "rake website"
+    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/newgem_theme_generators/long_box_theme/long_box_theme_generator.rb

@@ -11,7 +11,7 @@ class LongBoxThemeGenerator < RubiGen::Base
     @destination_root = File.expand_path(destination_root)
     @gem_name = base_name
     
-    @module_name  = @gem_name.camelcase
+    @module_name  = @gem_name.gsub('-','_').camelize
 
     extract_options
   end

data/rubygems_generators/executable/executable_generator.rb

@@ -11,7 +11,7 @@ class ExecutableGenerator < RubiGen::Base
     super
     usage if args.empty?
     @bin_name     = args.shift
-    @module_name  = @bin_name.classify
+    @module_name  = @bin_name.gsub('-','_').camelize
     @project_name = File.basename(File.expand_path(destination_root))
     extract_options
   end

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

@@ -9,7 +9,7 @@ describe <%= module_name %>::CLI, "execute" do
     @stdout = @stdout_io.read
   end
   
-  it "should do something" do
-    @stdout.should_not =~ /To update this executable/
+  it "should print default output" do
+    @stdout.should =~ /To update this executable/
   end
 end

data/rubygems_generators/executable/templates/test/test_cli.rb.erb

@@ -8,7 +8,7 @@ class Test<%= module_name %>Cli < Test::Unit::TestCase
     @stdout = @stdout_io.read
   end
   
-  def test_not_print_default_output
-    assert_no_match(/To update this executable/, @stdout)
+  def test_print_default_output
+    assert_match(/To update this executable/, @stdout)
   end
 end

data/rubygems_generators/extconf/extconf_generator.rb

@@ -8,7 +8,7 @@ class ExtconfGenerator < RubiGen::Base
     super
     usage if args.empty?
     @name = args.shift
-    @module_name = name.camelcase
+    @module_name = name.gsub('-','_').camelize
     @test_module_name = @module_name + "Extn"
   end
 

data/rubygems_generators/install_cucumber/install_cucumber_generator.rb

@@ -21,6 +21,8 @@ class InstallCucumberGenerator < RubiGen::Base
       m.file      'features/development.feature', 'features/development.feature'
       m.file      'features/step_definitions/common_steps.rb', 'features/step_definitions/common_steps.rb'
       m.template  'features/support/env.rb.erb', 'features/support/env.rb'
+      m.file      'features/support/common.rb', 'features/support/common.rb'
+      m.file      'features/support/matchers.rb', 'features/support/matchers.rb'
     end
   end
 

data/rubygems_generators/install_cucumber/templates/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/

data/rubygems_generators/install_cucumber/templates/features/step_definitions/common_steps.rb

@@ -1,51 +1,27 @@
-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
+Given /^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}'"
+  Given %Q{env variable $HOME set to "#{@home_path}"}
 end
 
-Given %r{^this project is active project folder} do
+Given /^this project is active project folder/ do
   Given "a safe folder"
   @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
-end
-
-Given %r{'(.*)' folder is deleted} do |folder|
-  in_project_folder do
-    FileUtils.rm_rf folder
-  end
+Given /"(.*)" folder is deleted/ do |folder|
+  in_project_folder { FileUtils.rm_rf folder }
 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,21 +35,21 @@ 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}"
   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"))
   executable = File.expand_path(File.join(File.dirname(__FILE__), "/../../bin", executable))
   in_project_folder do
@@ -81,32 +57,41 @@ When %r{run local executable '(.*)' with arguments '(.*)'} do |executable, argum
   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}")
@@ -114,77 +99,70 @@ 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(@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 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/rubygems_generators/install_cucumber/templates/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/rubygems_generators/install_rspec/install_rspec_generator.rb

@@ -9,7 +9,7 @@ class InstallRspecGenerator < RubiGen::Base
     super
     @destination_root = File.expand_path(destination_root)
     @gem_name = base_name
-    @module_name  = @gem_name.camelcase
+    @module_name  = @gem_name.gsub('-','_').camelize
     extract_options
   end
 

data/rubygems_generators/install_rspec/templates/spec.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe "Place your specs here" do
   
   it "find this spec in spec directory" do
-    violated "Be sure to write your specs"
+    # violated "Be sure to write your specs"
   end
   
 end

data/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']
   gem 'rspec'
   require 'spec'
 end

data/rubygems_generators/install_rspec/templates/tasks/rspec.rake

@@ -1,7 +1,7 @@
 begin
   require 'spec'
 rescue LoadError
-  require 'rubygems'
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
   require 'spec'
 end
 begin

data/rubygems_generators/install_shoulda/USAGE

@@ -0,0 +1,5 @@
+Description:
+  
+  
+Usage:
+  

data/rubygems_generators/install_shoulda/install_shoulda_generator.rb

@@ -0,0 +1,35 @@
+
+class InstallShouldaGenerator < RubiGen::Base
+  attr_reader :gem_name, :module_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @destination_root = File.expand_path(destination_root)
+    @gem_name = base_name
+    @module_name  = @gem_name.gsub('-','_').camelize
+  end
+
+  def manifest
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory 'test'
+      m.directory 'tasks'
+
+      m.template 'test/test.rb', "test/test_#{gem_name}.rb"
+      m.template "test/test_helper.rb", "test/test_helper.rb"
+      
+      m.file_copy_each %w( shoulda.rake ), 'tasks'
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Install Shoulda testing support. 
+
+Includes a rake task (tasks/shoulda.rake) to be loaded by the root Rakefile,
+which provides a "test" task.
+
+EOS
+    end
+end