diff --git a/Gemfile b/Gemfile index a2657e12..de6e6d78 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source "http://rubygems.org" gemspec -#gem 'cucumber', :path => '../cucumber' \ No newline at end of file +# gem 'cucumber', :path => '../cucumber' \ No newline at end of file diff --git a/features/.cucumber/stepdefs.json b/features/.cucumber/stepdefs.json index 9df5c358..e2177a9c 100644 --- a/features/.cucumber/stepdefs.json +++ b/features/.cucumber/stepdefs.json @@ -1,227 +1,243 @@ [ { - "source": "^they have arrived$", + "file_colon_line": "features/step_definitions/eyeball_steps.rb:1", "flags": "", + "source": "^they have arrived$", "steps": [ { - "name": "they have arrived", "args": [ - ] + ], + "name": "they have arrived" } ] }, { - "source": "^a \"(ruby|native)\" \"([^\\\"]*)\" parser$", + "file_colon_line": "features/step_definitions/gherkin_steps.rb:1", "flags": "", + "source": "^a \"(ruby|native)\" \"([^\\\"]*)\" parser$", "steps": [ ] }, { - "source": "^the\\ following\\ text\\ is\\ parsed:$", + "file_colon_line": "features/step_definitions/gherkin_steps.rb:5", "flags": "", + "source": "^the\\ following\\ text\\ is\\ parsed:$", "steps": [ { - "name": "the following text is parsed:", "args": [ - ] + ], + "name": "the following text is parsed:" } ] }, { - "source": "^there\\ should\\ be\\ no\\ parse\\ errors$", + "file_colon_line": "features/step_definitions/gherkin_steps.rb:9", "flags": "", + "source": "^there\\ should\\ be\\ no\\ parse\\ errors$", "steps": [ { - "name": "there should be no parse errors", "args": [ - ] + ], + "name": "there should be no parse errors" } ] }, { - "source": "^there should be a parse error on (line \\d+)$", + "file_colon_line": "features/step_definitions/gherkin_steps.rb:13", "flags": "", + "source": "^there should be a parse error on (line \\d+)$", "steps": [ { - "name": "there should be a parse error on line 1", "args": [ { "offset": 33, "val": "line 1" } - ] + ], + "name": "there should be a parse error on line 1" } ] }, { - "source": "^there should be parse errors on (lines .*)$", + "file_colon_line": "features/step_definitions/gherkin_steps.rb:17", "flags": "", + "source": "^there should be parse errors on (lines .*)$", "steps": [ { - "name": "there should be parse errors on lines 1 and 2", "args": [ { "offset": 32, "val": "lines 1 and 2" } - ] + ], + "name": "there should be parse errors on lines 1 and 2" }, { - "name": "there should be parse errors on lines 1 through 3", "args": [ { "offset": 32, "val": "lines 1 through 3" } - ] + ], + "name": "there should be parse errors on lines 1 through 3" }, { - "name": "there should be parse errors on lines 10 and 17", "args": [ { "offset": 32, "val": "lines 10 and 17" } - ] + ], + "name": "there should be parse errors on lines 10 and 17" }, { - "name": "there should be parse errors on lines 3 and 5", "args": [ { "offset": 32, "val": "lines 3 and 5" } - ] + ], + "name": "there should be parse errors on lines 3 and 5" }, { - "name": "there should be parse errors on lines 5, 10 and 12", "args": [ { "offset": 32, "val": "lines 5, 10 and 12" } - ] + ], + "name": "there should be parse errors on lines 5, 10 and 12" } ] }, { - "source": "^a JSON formatter$", + "file_colon_line": "features/step_definitions/json_formatter_steps.rb:13", "flags": "", + "source": "^a JSON formatter$", "steps": [ ] }, { - "source": "^the outputted JSON should be:$", + "file_colon_line": "features/step_definitions/json_formatter_steps.rb:18", "flags": "", + "source": "^the outputted JSON should be:$", "steps": [ { - "name": "the outputted JSON should be:", "args": [ - ] + ], + "name": "the outputted JSON should be:" } ] }, { - "source": "^a PrettyFormatter$", + "file_colon_line": "features/step_definitions/json_parser_steps.rb:5", "flags": "", + "source": "^a PrettyFormatter$", "steps": [ ] }, { - "source": "^a JSON lexer$", + "file_colon_line": "features/step_definitions/json_parser_steps.rb:10", "flags": "", + "source": "^a JSON lexer$", "steps": [ ] }, { - "source": "^the following JSON is parsed:$", + "file_colon_line": "features/step_definitions/json_parser_steps.rb:14", "flags": "", + "source": "^the following JSON is parsed:$", "steps": [ { - "name": "the following JSON is parsed:", "args": [ - ] + ], + "name": "the following JSON is parsed:" } ] }, { - "source": "^the outputted text should be:$", + "file_colon_line": "features/step_definitions/json_parser_steps.rb:18", "flags": "", + "source": "^the outputted text should be:$", "steps": [ { - "name": "the outputted text should be:", "args": [ - ] + ], + "name": "the outputted text should be:" } ] }, { - "source": "^I have Cucumber's source code next to Gherkin's$", + "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:50", "flags": "", + "source": "^I have Cucumber's source code next to Gherkin's$", "steps": [ { - "name": "I have Cucumber's source code next to Gherkin's", "args": [ - ] + ], + "name": "I have Cucumber's source code next to Gherkin's" } ] }, { - "source": "^I find all of the \\.feature files$", + "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:55", "flags": "", + "source": "^I find all of the \\.feature files$", "steps": [ { - "name": "I find all of the .feature files", "args": [ - ] + ], + "name": "I find all of the .feature files" } ] }, { - "source": "^I send each prettified original through the \"([^\"]*)\" machinery$", + "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:59", "flags": "", + "source": "^I send each prettified original through the \"([^\"]*)\" machinery$", "steps": [ { - "name": "I send each prettified original through the \"json\" machinery", "args": [ { "offset": 45, "val": "json" } - ] + ], + "name": "I send each prettified original through the \"json\" machinery" }, { - "name": "I send each prettified original through the \"pretty\" machinery", "args": [ { "offset": 45, "val": "pretty" } - ] + ], + "name": "I send each prettified original through the \"pretty\" machinery" } ] }, { - "source": "^the machinery output should be identical to the prettified original$", + "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:83", "flags": "", + "source": "^the machinery output should be identical to the prettified original$", "steps": [ { - "name": "the machinery output should be identical to the prettified original", "args": [ - ] + ], + "name": "the machinery output should be identical to the prettified original" } ] } diff --git a/gherkin.gemspec b/gherkin.gemspec index 4f2a0b0f..7bcb2022 100644 --- a/gherkin.gemspec +++ b/gherkin.gemspec @@ -2,7 +2,19 @@ Gem::Specification.new do |s| s.name = "gherkin" - # If bumping the major version here, comment out the cucumber dependency below and uncomment in the Gemfile to build against a local cucumber. + # If the major version is bumped, verify that the change is ok: + # + # * Comment out cucumber dependency in gemspec + # * Uncomment cucumber location in Gemspec + # * Bump cucumber's gherkin dependency to the new version + # * bundle update + # * bundle exec rake + # + # Repeat these step for cucumber (swap `cucumber` with `gherkin`). + # + # When both are building OK, do a `bundle exec rake install` in both cucumber and gherkin projects, revert the changes in the first 2 steps + # and release both projects. + # s.version = "2.8.0" s.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"] s.description = "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler." @@ -50,7 +62,7 @@ Gem::Specification.new do |s| s.add_development_dependency('rake', '>= 0.9.2') s.add_development_dependency('bundler', '>= 1.0.22') s.add_development_dependency('rspec', '~> 2.7.0') # No 2.8.0 until this is fixed: https://github.com/rspec/rspec-expectations/issues/112 - s.add_development_dependency('rubyzip', '>= 0.9.5') + s.add_development_dependency('rubyzip', '>= 0.9.6.1') unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION) s.add_development_dependency('therubyracer', '>= 0.9.9') if ENV['GHERKIN_JS']