newgem 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.7 2008-11-08
+
+* Removed 'rake local_deploy' and changed website to reference 'rake install_gem' for same purpose [fixed #9]
+* Fixed --version option (+ added cucumber scenario) [fixed #8]
+* Cleaned up the common.rb steps
+
 == 1.0.6 2008-11-05
 
 * Removed cucumber references in newgem's Rakefile, hopefully fixing #7

data/bin/newgem

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

data/features/development.feature

@@ -9,5 +9,5 @@ Feature: Development processes of newgem itself (rake tasks)
     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 file with name 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/install_cucumber.feature

@@ -24,6 +24,6 @@ Feature: RubyGems have features to be described and tested
     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 match /And file with name matching 'pkg/\*\.gem' is created/
     And output does not match /You can use these snippets to implement pending steps/
 

data/features/newgem_cli.feature

@@ -58,3 +58,8 @@ Feature: Can run 'newgem' to create RubyGem scaffolds
     And does not invoke generator 'install_rspec'
     And Rakefile can display tasks successfully
 
+  Scenario: Run newgem and show current version number
+    Given a safe folder
+    When newgem is executed only with options '--version'
+    Then shows version number
+  

data/features/rubygem_tasks.feature

@@ -8,7 +8,7 @@ Feature: Generated RubyGems have various rake tasks to aide their development
     And 'pkg' folder is deleted
     When task 'rake gem' is invoked
     Then folder 'pkg' is created
-    And file matching 'pkg/my_project-0.0.1.gem' is created
+    And file with name matching 'pkg/my_project-0.0.1.gem' is created
     And gem spec key 'rdoc_options' contains /--mainREADME.rdoc/
     And gem spec key 'dependencies' contains /newgem \(>= [\d.]+, development\)/
 

data/features/steps/cli.rb

@@ -32,26 +32,39 @@ Given /^project website configuration for safe folder on local machine$/ do
   end  
 end
 
+def newgem_cmd
+  File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
+end
+
 When %r{^newgem is executed for project '(.*)' with no options$} do |project_name|
-  newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
+  @newgem_cmd = newgem_cmd
   setup_active_project_folder project_name
   FileUtils.chdir @tmp_root do
     @stdout = "newgem.out"
-    system "ruby #{newgem} #{project_name} > #{@stdout}"
+    system "ruby #{@newgem_cmd} #{project_name} > #{@stdout}"
     force_local_lib_override
   end
 end
 
 When %r{^newgem is executed for project '(.*)' with options '(.*)'$} do |project_name, arguments|
-  newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
+  @newgem_cmd = newgem_cmd
   setup_active_project_folder project_name
   FileUtils.chdir @tmp_root do
     @stdout = "newgem.out"
-    system "ruby #{newgem} #{arguments} #{project_name} > #{@stdout}"
+    system "ruby #{@newgem_cmd} #{arguments} #{project_name} > #{@stdout}"
     force_local_lib_override
   end
 end
 
+When /^newgem is executed only with options '(.*)'$/ do |arguments|
+  @newgem_cmd = newgem_cmd
+  FileUtils.chdir @tmp_root do
+    @stdout = "newgem.out"
+    system "ruby #{@newgem_cmd} #{arguments} > #{@stdout}"
+  end
+end
+
+
 When /^run unit tests for test file '(.*)'$/ do |test_file|
   @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
   FileUtils.chdir(@active_project_folder) do
@@ -70,3 +83,8 @@ Then %r{^remote file '(.*)' (is|is not) created} do |file, is|
     File.exists?(file).should(is == 'is' ? be_true : be_false)
   end
 end
+
+Then /^shows version number$/ do
+  stdout = File.read(File.join(@tmp_root, @stdout))
+  stdout.should =~ /#{Newgem::VERSION}/
+end

data/features/steps/common.rb

@@ -9,12 +9,12 @@ Given %r{^a safe folder} do
   @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
 end
 
-Given /^this project is active project folder/ do
+Given %r{^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|
+Given %r{^env variable \$([\w_]+) set to '(.*)'} do |env_var, value|
   ENV[env_var] = value
 end
 
@@ -31,7 +31,7 @@ def setup_active_project_folder project_name
   @project_name = project_name
 end
 
-Given /^'(.*)' folder is deleted/ do |folder|
+Given %r{'(.*)' folder is deleted} do |folder|
   in_project_folder do
     FileUtils.rm_rf folder
   end
@@ -48,14 +48,14 @@ When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, argu
   end
 end
 
-When /^run executable '(.*)' with arguments '(.*)'$/ do |executable, arguments|
+When %r{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|
+When %r{^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}"
@@ -74,13 +74,13 @@ Then %r{^file '(.*)' (is|is not) created} do |file, is|
   end
 end
 
-Then /^file matching '(.*)' is created/ do |pattern|
+Then %r{^file with name matching '(.*)' is created} do |pattern|
   in_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|
+Then %r{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}")
@@ -101,39 +101,39 @@ Then %r{^(does|does not) invoke generator '(.*)'$} do |does_invoke, generator|
     actual_output.should_not(match(/dependency\s+#{generator}/))
 end
 
-Then /^help options '(.*)' and '(.*)' are displayed$/ do |opt1, opt2|
+Then %r{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|
+Then %r{^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|
+Then %r{^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|
+Then %r{^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|
+Then %r{^yaml file '(.*)' contains (\{.*\})} do |file, yaml|
   in_project_folder do
     yaml = eval yaml
     YAML.load(File.read(file)).should == yaml
   end
 end
 
-Then /^Rakefile can display tasks successfully$/ do
+Then %r{^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}"
@@ -142,14 +142,14 @@ Then /^Rakefile can display tasks successfully$/ do
   actual_output.should match(/^rake\s+\w+\s+#\s.*/)
 end
 
-Then /^task 'rake (.*)' is executed successfully$/ do |task|
+Then %r{^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|
+Then %r{^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/lib/newgem.rb

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

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

@@ -9,5 +9,5 @@ Feature: Development processes of newgem itself (rake tasks)
     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 file with name 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

@@ -9,12 +9,12 @@ Given %r{^a safe folder} do
   @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
 end
 
-Given /^this project is active project folder/ do
+Given %r{^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|
+Given %r{^env variable \$([\w_]+) set to '(.*)'} do |env_var, value|
   ENV[env_var] = value
 end
 
@@ -31,7 +31,7 @@ def setup_active_project_folder project_name
   @project_name = project_name
 end
 
-Given /^'(.*)' folder is deleted/ do |folder|
+Given %r{'(.*)' folder is deleted} do |folder|
   in_project_folder do
     FileUtils.rm_rf folder
   end
@@ -48,14 +48,14 @@ When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, argu
   end
 end
 
-When /^run executable '(.*)' with arguments '(.*)'$/ do |executable, arguments|
+When %r{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|
+When %r{^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}"
@@ -74,13 +74,13 @@ Then %r{^file '(.*)' (is|is not) created} do |file, is|
   end
 end
 
-Then /^file matching '(.*)' is created/ do |pattern|
+Then %r{^file with name matching '(.*)' is created} do |pattern|
   in_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|
+Then %r{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}")
@@ -101,39 +101,39 @@ Then %r{^(does|does not) invoke generator '(.*)'$} do |does_invoke, generator|
     actual_output.should_not(match(/dependency\s+#{generator}/))
 end
 
-Then /^help options '(.*)' and '(.*)' are displayed$/ do |opt1, opt2|
+Then %r{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|
+Then %r{^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|
+Then %r{^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|
+Then %r{^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|
+Then %r{^yaml file '(.*)' contains (\{.*\})} do |file, yaml|
   in_project_folder do
     yaml = eval yaml
     YAML.load(File.read(file)).should == yaml
   end
 end
 
-Then /^Rakefile can display tasks successfully$/ do
+Then %r{^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}"
@@ -142,14 +142,14 @@ Then /^Rakefile can display tasks successfully$/ do
   actual_output.should match(/^rake\s+\w+\s+#\s.*/)
 end
 
-Then /^task 'rake (.*)' is executed successfully$/ do |task|
+Then %r{^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|
+Then %r{^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/tasks/deployment.rake

@@ -15,9 +15,6 @@ task :release do
   EOS
 end
 
-desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
-task :local_deploy => [:generator_report, :website_generate, :install_gem]
-
 task :check_version do
   unless ENV['VERSION']
     puts 'Must pass a VERSION=x.y.z release version'
@@ -34,9 +31,7 @@ task :install_gem_no_doc => [:clean, :package] do
   sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"
 end
 
-namespace :manifest do
-  desc 'Recreate Manifest.txt to include ALL files'
-  task :refresh do
-    `rake check_manifest | patch -p0 > Manifest.txt`
-  end
+desc 'Recreate Manifest.txt to include ALL files'
+task :manifest do
+  `rake check_manifest | patch -p0 > Manifest.txt`
 end

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.6</a>
+        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.0.7</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>
@@ -138,8 +138,8 @@ Important
 <p>The results show a <em>diff</em> of the two.</p>
 <h2>Package and test locally</h2>
 <p>Before releasing a new version of a gem, it is a great idea to install the gem locally and do some sanity checks. You know, to limit the chance of you looking like a noob.</p>
-<pre>rake local_deploy</pre>
-<p>This generates the website html files into your website folder, and locally installs the gem, ready for testing and local use.</p>
+<pre>rake install_gem</pre>
+<p>This locally installs the gem, ready for testing and local use.</p>
 <p>Now pretend to be a user, and do some tests &#8211; especially of new functionality &#8211; so you are comfortable all the files have been packaged up, and you haven&#8217;t missed anything in the <code>Manifest.txt</code>.</p>
 <p>One set of tests you should do is to repeat any tutorials you include in your website. If your gem is dependent on other gems that are rapidly changing, its possible your tutorial might be invalid even if your unit tests are successful. Best you find any errors before the users start emailing you!</p>
 <h2>Releasing your gem to the world</h2>
@@ -225,7 +225,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>, 5th November 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 8th November 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -115,9 +115,9 @@ h2. Package and test locally
 
 Before releasing a new version of a gem, it is a great idea to install the gem locally and do some sanity checks. You know, to limit the chance of you looking like a noob.
 
-<pre>rake local_deploy</pre>
+<pre>rake install_gem</pre>
 
-This generates the website html files into your website folder, and locally installs the gem, ready for testing and local use.
+This locally installs the gem, ready for testing and local use.
 
 Now pretend to be a user, and do some tests - especially of new functionality - so you are comfortable all the files have been packaged up, and you haven't missed anything in the <code>Manifest.txt</code>.
 

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.6</a>
+        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.0.7</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.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 +10:00
+date: 2008-11-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency