diff --git a/History.txt b/History.txt index a83ac2fed5b..ae16bf719ed 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,9 @@ +== In Git + +=== New features +=== Bugfixes +=== Removed features + == 0.1.13 2008-12-20 It's time for some new features again. Output is now much better since you can use diffing, tweak diff --git a/cucumber.gemspec b/cucumber.gemspec index f845b4679a3..03d73969edc 100644 --- a/cucumber.gemspec +++ b/cucumber.gemspec @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{cucumber} - s.version = "0.1.13" + s.version = "0.1.13.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Aslak Helles\303\270y"] - s.date = %q{2008-12-20} + s.date = %q{2008-12-22} s.default_executable = %q{cucumber} s.description = %q{Executable Feature scenarios} s.email = ["aslak.hellesoy@gmail.com"] diff --git a/gem_tasks/deployment.rake b/gem_tasks/deployment.rake index 2f437425b2c..22016ff53d7 100644 --- a/gem_tasks/deployment.rake +++ b/gem_tasks/deployment.rake @@ -1,26 +1,3 @@ -desc 'Release the website and new gem version' -task :deploy => [:check_version, :website, :release] do - puts "Remember to create SVN tag:" - puts "svn copy svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/trunk " + - "svn+ssh://#{rubyforge_username}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} " - puts "Suggested comment:" - puts "Tagging release #{CHANGES}" -end - -desc 'Runs tasks website_generate and install_gem as a local deployment of the gem' -task :local_deploy => [:website_generate, :install_gem] - -task :check_version do - unless ENV['VERSION'] - puts 'Must pass a VERSION=x.y.z release version' - exit - end - unless ENV['VERSION'] == VERS - puts "Please update your version.rb to match the release version, currently #{VERS}" - exit - end -end - desc 'Install the package as a gem, without generating documentation(ri/rdoc)' task :install_gem_no_doc => [:clean, :package] do sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri" diff --git a/gem_tasks/gemspec.rake b/gem_tasks/gemspec.rake index ce59ad29232..88a6a72fab5 100644 --- a/gem_tasks/gemspec.rake +++ b/gem_tasks/gemspec.rake @@ -2,5 +2,9 @@ namespace :gemspec do desc 'Refresh cucumber.gemspec to include ALL files' task :refresh => 'manifest:refresh' do File.open('cucumber.gemspec', 'w') {|io| io.write($hoe.spec.to_ruby)} + puts "1) git commit -a -m \"Release #{Cucumber::VERSION::STRING}\"" + puts "2) git tag -a \"v#{Cucumber::VERSION::STRING}\" -m \"Release #{Cucumber::VERSION::STRING}\"" + puts "3) git push --tags" + puts "4) Bounce the version in version.rb" end end \ No newline at end of file diff --git a/lib/cucumber/version.rb b/lib/cucumber/version.rb index 7b5fcb4b80b..448c7eb138f 100644 --- a/lib/cucumber/version.rb +++ b/lib/cucumber/version.rb @@ -3,7 +3,8 @@ class VERSION #:nodoc: MAJOR = 0 MINOR = 1 TINY = 13 + PATCH = 2 # Set to nil for official release - STRING = [MAJOR, MINOR, TINY].join('.') + STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.') end end diff --git a/spec/cucumber/model/table_spec.rb b/spec/cucumber/model/table_spec.rb index 0a6ac1da984..0a136341d6e 100644 --- a/spec/cucumber/model/table_spec.rb +++ b/spec/cucumber/model/table_spec.rb @@ -3,18 +3,32 @@ module Cucumber module Model describe Table do - it "should convert into hash-array" do - raw = [ + before do + @raw = [ %w{name gender}, %w{aslak male}, %w{patty female}, - ] - ha = Table.new(raw).hashes + ] + end + + it "should convert into hash-array" do + ha = Table.new(@raw).hashes ha.should == [ {'name' => 'aslak', 'gender' => 'male'}, {'name' => 'patty', 'gender' => 'female'} ] end + + it "should iterate over each row" do + rows = [] + Table.new(@raw).raw[1..-1].each do |name, gender| + rows << [name, gender] + end + rows.should == [ + %w{aslak male}, + %w{patty female} + ] + end end end -end \ No newline at end of file +end