Merge branch 'master' into gga/methods-for-step-defs

.travis.yml

@@ -1,7 +1,13 @@
-rvm:
+rvm: 
+  - 1.9.3
   - 1.9.2
-  - 1.8.7
-  - rbx
-  - ree
-  - jruby
-  - 1.8.6
+# whitelist
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - cukes-devs@googlegroups.com
+  irc:
+    - "irc.freenode.org#cucumber"

Gemfile

@@ -1,2 +1,4 @@
 source "http://rubygems.org"
 gemspec
+
+# gem 'gherkin', :path => '../gherkin'

History.md

@@ -1,4 +1,76 @@
-## [v1.1.1](https://github.com/cucumber/cucumber/compare/v1.1.0...v1.1.1)
+## [v1.2.0](https://github.com/cucumber/cucumber/compare/v1.1.9...v1.2.0)
+
+## New Features
+* Extracted the PDF formatter into a separate gem. (#241 Matt Wynne)
+* Remove dependency on term/ansicolor (#43 Joe Fiorini)
+
+## [v1.1.9](https://github.com/cucumber/cucumber/compare/v1.1.8...v1.1.9)
+
+## Bugfixes
+* Removed deprecation warning for `source_tag_names`. It's not deprecated anymore. (Aslak Hellesøy)
+
+## [v1.1.8](https://github.com/cucumber/cucumber/compare/v1.1.7...v1.1.8)
+
+## Bugfixes
+* Column mapping dangerously applied twice to the same cell! ([#202](https://github.com/cucumber/cucumber/issues/202), [#208](https://github.com/cucumber/cucumber/pull/208) Brian Dunn)
+
+## New Features
+* Don't pollute RbWorld with the AnsiEscapes methods ([#219](https://github.com/cucumber/cucumber/issues/219), [#221](https://github.com/cucumber/cucumber/pull/221) Ben Woosley)
+
+## [v1.1.7](https://github.com/cucumber/cucumber/compare/v1.1.6...v1.1.7)
+
+### Bugfixes
+
+* Finish off backwards compatability fix for Capybara ([#229](https://github.com/cucumber/cucumber/pull/229) Cezary Baginski)
+
+## [v1.1.6](https://github.com/cucumber/cucumber/compare/v1.1.5...v1.1.6)
+
+### New features
+
+* Added `file_colon_line` to `stepdefs.json` (outputted by `--dotcucumber`). ([#214](https://github.com/cucumber/cucumber/pull/214) MOROHASHI Kyosuke)
+
+### Bugfixes
+
+* Release 1.1.5 unintentionally broke backwards compatibility in some APIs we hadn't considered were used outside of cucumber.
+  Well, it was, in the popular Capybara browser automation tool, so we added back the API we removed. See the history for details. (Aslak Hellesøy)
+* After some infantile bickering about a trivial bug that any hipster startup ruby programmer could have circumvented by using a fork with a fix,
+  I finally sucked up to a horde of people and made HTML reports work again (I'm gonna rename them TPS reports). ([#203](https://github.com/cucumber/cucumber/pull/203) Jon Merrifield)
+
+## [v1.1.5](https://github.com/cucumber/cucumber/compare/v1.1.4...v1.1.5)
+
+### New Features
+
+* Upgraded to gherkin 2.8.0 (Aslak Hellesøy)
+
+### Bugfixes
+
+* Background fails, but build succeeds ([#205](https://github.com/cucumber/cucumber/issues/205) tcwitte)
+
+## [v1.1.4](https://github.com/cucumber/cucumber/compare/v1.1.3...v1.1.4)
+
+### New Features
+
+* Upgrade to Gherkin 2.7.1 (Aslak Hellesøy)
+
+## [v1.1.3](https://github.com/cucumber/cucumber/compare/v1.1.2...v1.1.3)
+
+### New Features
+
+* Generate stepdef metadata with --dotcucumber. Useful for Cukepatch. (Aslak Hellesøy)
+* Show class name of exceptions in the HTML formatter ([#159](https://github.com/cucumber/cucumber/pull/159) Jari Bakken)
+* Deferred table header and column mappings ([#163](https://github.com/cucumber/cucumber/pull/163) Richard Lawrence)
+
+### Bugfixes
+
+* Escape exceptions in HTML formatter ([#178](https://github.com/cucumber/cucumber/pull/178) leachdaniel)
+* Retry when feature_element returns failed ([#172](https://github.com/cucumber/cucumber/pull/172) Charles Finkel)
+* Rerun formatter output does not include failing scenario outline examples ([#57](https://github.com/cucumber/cucumber/issues/57) Jan Brauer)
+
+## [v1.1.2](https://github.com/cucumber/cucumber/compare/v1.1.1...v1.1.2)
+
+### Changed features
+
+* Break long lines in output. Only needed for better output formatting in the Cucumber Book! (Aslak Hellesøy)
 
 ### Changed features
 

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/cucumber/cucumber.png)](http://travis-ci.org/cucumber/cucumber) [![Dependency Status](https://gemnasium.com/cucumber/cucumber.png)](https://gemnasium.com/cucumber/cucumber)
+
 The main website is at http://cukes.info/
 The documentation is at https://wiki.github.com/cucumber/cucumber/
 

cucumber.gemspec

@@ -23,26 +23,23 @@ for important information about this release. Happy cuking!
 
 }
 
-  s.add_runtime_dependency 'gherkin', '~> 2.6.0'
-  s.add_runtime_dependency 'term-ansicolor', '>= 1.0.6'
+  s.add_runtime_dependency 'gherkin', '~> 2.9.0'
   s.add_runtime_dependency 'builder', '>= 2.1.2'
   s.add_runtime_dependency 'diff-lcs', '>= 1.1.2'
   s.add_runtime_dependency 'json', '>= 1.4.6'
 
-  s.add_development_dependency 'aruba', '~> 0.4.6'
+  s.add_development_dependency 'aruba', '~> 0.4.11'
   s.add_development_dependency 'rake', '>= 0.9.2'
-  s.add_development_dependency 'rspec', '>= 2.7.0'
+  s.add_development_dependency 'rspec', '~> 2.7.0' # We'll bump when gherkin is ready to bump
   s.add_development_dependency 'nokogiri', '>= 1.5.0'
-  s.add_development_dependency 'prawn', '~> 0.8.4'
-  s.add_development_dependency 'prawn-layout', '~> 0.8.4'
   s.add_development_dependency 'syntax', '>= 1.0.0'
   s.add_development_dependency 'spork', '>= 0.9.0.rc9'
   s.add_development_dependency 'simplecov', '>= 0.5.4'
 
   # For Documentation:
-  s.add_development_dependency('yard', '~> 0.7.3')
+  s.add_development_dependency('yard', '~> 0.7.4')
   s.add_development_dependency('rdiscount', '~> 1.6.8')
-  s.add_development_dependency('bcat', '~> 0.6.1')
+  s.add_development_dependency('bcat', '~> 0.6.2')
 
   # Needed for examples (rake examples)
   s.add_development_dependency 'ramaze'
@@ -52,7 +49,7 @@ for important information about this release. Happy cuking!
   s.add_development_dependency 'capybara', '>= 1.1.1'
 
   s.rubygems_version = ">= 1.6.1"
-  s.files            = `git ls-files`.split("\n")
+  s.files            = `git ls-files`.split("\n").reject {|path| path =~ /\.gitignore$/ }
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.rdoc_options     = ["--charset=UTF-8"]

cucumber.yml

@@ -10,7 +10,7 @@ rescue LoadError
   std_opts << ' --tags ~@rspec2'
 end
 %>
-default: <%= std_opts %>
+default: <%= std_opts %> --dotcucumber features/.cucumber
 jruby: <%= std_opts %> --tags ~@spork --tags ~@wire
 jruby_win: <%= std_opts %> --tags ~@spork --tags ~@wire CUCUMBER_FORWARD_SLASH_PATHS=true
 windows_mri: <%= std_opts %> --tags ~@spork --tags ~@wire --tags ~@needs-many-fonts CUCUMBER_FORWARD_SLASH_PATHS=true