gherkin 2.12.0-x86-mingw32 → 2.12.1-x86-mingw32

data/gherkin.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   # 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. Do this for both ruby 1.8.7, ruby 1.9.3 and jruby.
+  # and release both projects. Do this for both ruby 1.9.3, ruby 2.0.0 and jruby.
   #
   s.version     = Gherkin::VERSION
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.summary     = "#{s.name}-#{s.version}"
   s.email       = "cukes@googlegroups.com"
   s.homepage    = "http://github.com/cucumber/gherkin"
+  s.license     = 'MIT'
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
@@ -51,29 +52,29 @@ Gem::Specification.new do |s|
   when /dotnet/
     s.files += Dir['lib/*.dll']
   else # MRI or Rubinius
-    s.files += Dir['lib/gherkin/rb_lexer/*.rb']
+    s.files += Dir['lib/gherkin/lexer/*.rb']
     s.files += Dir['ext/**/*.c']
     s.extensions = Dir['ext/**/extconf.rb']
-    s.add_development_dependency('rake-compiler', '>= 0.8.2')
+    s.add_development_dependency('rake-compiler', '= 0.8.2')
   end
   s.files -= Dir['**/.gitignore']
 
   s.add_runtime_dependency('multi_json', '~> 1.3')
 
-  s.add_development_dependency('cucumber', '>= 1.2.0')
-  s.add_development_dependency('rake', '>= 10.0.3')
-  s.add_development_dependency('bundler', '>= 1.2.3') # Make sure it's in sync with /.travis.yml
-  s.add_development_dependency('rspec', '~> 2.13.0')
+  s.add_development_dependency('cucumber', '>= 1.3.4')
+  s.add_development_dependency('rake', '>= 10.1.0')
+  s.add_development_dependency('bundler', '>= 1.3.5') # Make sure it's in sync with /.travis.yml
+  s.add_development_dependency('rspec', '~> 2.14.1')
   s.add_development_dependency('rubyzip', '>= 0.9.9')
 
   unless ENV['RUBY_CC_VERSION'] || Gherkin::JRUBY
     s.add_development_dependency('therubyracer', '>= 0.11.4') if ENV['GHERKIN_JS']
     # For Documentation:
-    s.add_development_dependency('yard', '>= 0.8.3')
-    s.add_development_dependency('rdiscount', '>= 1.6.8')
+    s.add_development_dependency('yard', '>= 0.8.6.2')
+    s.add_development_dependency('rdiscount', '>= 2.1.6')
   end
 
   # Only needed by Cucumber. Remove when Cucumber no longer needs those.
-  s.add_development_dependency('term-ansicolor', '>= 1.0.7')
-  s.add_development_dependency('builder', '>= 3.1.4')
+  s.add_development_dependency('term-ansicolor', '>= 1.2.2')
+  s.add_development_dependency('builder', '>= 3.2.2')
 end

data/lib/gherkin/formatter/filter_formatter.rb

@@ -130,7 +130,7 @@ module Gherkin
         end
 
         @examples_events.clear
-        @examples_tags.clear
+        @examples_tags = []
         @examples_name = nil
         @examples_range = nil
       end

data/lib/gherkin/i18n.json

@@ -32,14 +32,14 @@
 	  "native": "Bahasa Melayu",
 	  "feature": "Fungsi",
 	  "background": "Latar Belakang",
-	  "scenario": "Senario",
-	  "scenario_outline": "Menggariskan Senario ",
-	  "examples": "Contoh ",
-	  "given": "*|Bagi",
+	  "scenario": "Senario|Situai|Keadaan",
+	  "scenario_outline": "Template Senario|Template Situai|Template Keadaan|Menggariskan Senario",
+	  "examples": "Contoh",
+	  "given": "*|Diberi|Bagi",
 	  "when": "*|Apabila",
-	  "then": "*|Kemudian",
+	  "then": "*|Maka|Kemudian",
 	  "and": "*|Dan",
-	  "but": "*|Tetapi"
+	  "but": "*|Tetapi|Tapi"
 	},
 	"bg": {
 	  "name": "Bulgarian",
@@ -119,7 +119,7 @@
 	  "scenario": "Szenario",
 	  "scenario_outline": "Szenariogrundriss",
 	  "examples": "Beispiele",
-	  "given": "*|Angenommen|Gegeben sei",
+	  "given": "*|Angenommen|Gegeben sei|Gegeben seien",
 	  "when": "*|Wenn",
 	  "then": "*|Dann",
 	  "and": "*|Und",
@@ -344,10 +344,10 @@
 	  "scenario_outline": "परिदृश्य रूपरेखा",
 	  "examples": "उदाहरण",
 	  "given": "*|अगर|यदि|चूंकि",
-	  "when": "*|जब",
-	  "then": "*|तब",
+	  "when": "*|जब|कदा",
+	  "then": "*|तब|तदा",
 	  "and": "*|और|तथा",
-	  "but": "*|पर"
+	  "but": "*|पर|परन्तु|किन्तु"
 	},
 	"hr": {
 	  "name": "Croatian",
@@ -517,6 +517,20 @@
 	  "and": "*|Og",
 	  "but": "*|Men"
 	},
+	"pa": {
+	  "name": "Panjabi",
+	  "native": "ਪੰਜਾਬੀ",
+	  "feature": "ਖਾਸੀਅਤ|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ",
+	  "background": "ਪਿਛੋਕੜ",
+	  "scenario": "ਪਟਕਥਾ",
+	  "scenario_outline": "ਪਟਕਥਾ ਢਾਂਚਾ|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ",
+	  "examples": "ਉਦਾਹਰਨਾਂ",
+	  "given": "*|ਜੇਕਰ|ਜਿਵੇਂ ਕਿ",
+	  "when": "*|ਜਦੋਂ",
+	  "then": "*|ਤਦ",
+	  "and": "*|ਅਤੇ",
+	  "but": "*|ਪਰ"
+	},
 	"pl": {
 	  "name": "Polish",
 	  "native": "polski",
@@ -643,6 +657,20 @@
 	  "and": "*|మరియు",
 	  "but": "*|కాని"
 	},
+	"th": {
+	  "name": "Thai",
+	  "native": "ไทย",
+	  "feature": "โครงหลัก|ความต้องการทางธุรกิจ|ความสามารถ",
+	  "background": "แนวคิด",
+	  "scenario": "เหตุการณ์",
+	  "scenario_outline": "สรุปเหตุการณ์|โครงสร้างของเหตุการณ์",
+	  "examples": "ชุดของตัวอย่าง|ชุดของเหตุการณ์",
+	  "given": "*|กำหนดให้",
+	  "when": "*|เมื่อ",
+	  "then": "*|ดังนั้น",
+	  "and": "*|และ",
+	  "but": "*|แต่"
+	},
 	"tr": {
 	  "name": "Turkish",
 	  "native": "Türkçe",

data/lib/gherkin/i18n.rb

@@ -94,7 +94,7 @@ module Gherkin
     end
 
     def lexer(listener, force_ruby=false)
-      if force_ruby
+      if force_ruby || ENV['GHERKIN_RUBY'] =~ /true/i
         rb(listener)
       else
         begin

data/lib/gherkin/platform.rb

@@ -3,10 +3,10 @@
 module Gherkin
 unless defined?(Gherkin::VERSION)
   # See the comment in gherkin.gemspec if you bump the MINOR version (MAJOR.MINOR.PATCH).
-  VERSION       = '2.12.0'
+  VERSION       = '2.12.1'
   JRUBY         = defined?(JRUBY_VERSION)
 
-  if !JRUBY && !(RUBY_VERSION =~ /^(1\.8\.7|1\.9\.3|2\.0)/)
+  if !JRUBY && !(RUBY_VERSION =~ /^(1\.9\.3|2\.0)/)
     warn("WARNING: Unsupported Ruby version - #{RUBY_VERSION}")
   end
 end

data/spec/gherkin/formatter/json_formatter_spec.rb

@@ -21,6 +21,7 @@ module Gherkin
           data = data.to_java_bytes
         end
         f.embedding("mime-type", data)
+        f.write("step output")
 
         f.result(Model::Result.new(:passed, 1, nil))
 
@@ -64,6 +65,9 @@ module Gherkin
                           "data": "YWJj"
                         }
                       ],
+                      "output": [
+                        "step output"
+                      ],
                       "result": {
                         "status": "passed",
                         "duration": 1

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -12,10 +12,10 @@ module Gherkin
     describe PrettyFormatter do
       include AnsiEscapes
 
-      def assert_io(s)
+      def assert_io_include(s)
         actual = @io.string
         actual.gsub!(/\e\[m/, "\e[0m") # JANSI resets without the 0.
-        actual.should == s
+        actual.should include(s)
       end
       
       def assert_pretty(input, expected_output=input)
@@ -48,14 +48,16 @@ module Gherkin
         @f.match(Model::Match.new([], "features/step_definitions/bar.rb:96"))
         @f.result(Model::Result.new('passed', 33, nil))
 
-        assert_io(%{Feature: Hello
+        @f.eof()
+
+        assert_io_include(%{Feature: Hello
   World
 
   Scenario: The scenario #{comments}# features/foo.feature:4#{reset}
-    #{executing}Given #{reset}#{executing}some stuff#{reset}     #{comments}# features/step_definitions/bar.rb:56#{reset}
-#{up(1)}    #{passed}Given #{reset}#{passed}some stuff#{reset}     #{comments}# features/step_definitions/bar.rb:56#{reset}
-    #{executing}When #{reset}#{executing}foo#{reset}             #{comments}# features/step_definitions/bar.rb:96#{reset}
-#{up(1)}    #{passed}When #{reset}#{passed}foo#{reset}             #{comments}# features/step_definitions/bar.rb:96#{reset}
+})
+        assert_io_include(%{    #{passed}Given #{reset}#{passed}some stuff#{reset}     #{comments}# features/step_definitions/bar.rb:56#{reset}
+})
+        assert_io_include(%{    #{passed}When #{reset}#{passed}foo#{reset}             #{comments}# features/step_definitions/bar.rb:96#{reset}
 })
       end
 
@@ -71,12 +73,14 @@ module Gherkin
         @f.match(match)
         @f.result(result)
 
-        assert_io(%{Feature: Hello
+        @f.eof()
+
+        assert_io_include(%{Feature: Hello
   World
 
   Scenario: The scenario            #{comments}# features/foo.feature:4#{reset}
-    #{executing}Given #{reset}#{executing}some stuff that is longer#{reset} #{comments}# features/step_definitions/bar.rb:56#{reset}
-#{up(1)}    #{passed}Given #{reset}#{passed}some stuff that is longer#{reset} #{comments}# features/step_definitions/bar.rb:56#{reset}
+})
+        assert_io_include(%{    #{passed}Given #{reset}#{passed}some stuff that is longer#{reset} #{comments}# features/step_definitions/bar.rb:56#{reset}
 })
       end
 
@@ -86,12 +90,13 @@ module Gherkin
         @f.step(Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3, nil, nil))
         @f.match(Model::Match.new([Gherkin::Formatter::Argument.new(7, '999')], nil))
         @f.result(Model::Result.new('passed', 6, nil))
+        @f.eof()
 
-        assert_io(
+        assert_io_include(
           "\n" +
-          "  Scenario: Lots of cukes              \e[90m# foo.feature:3\e[0m\n" +
-          "    #{executing}Given #{reset}#{executing}I have #{reset}#{executing_arg}999#{reset}#{executing} cukes in my belly#{reset}\n" +
-          "#{up(1)}    #{passed}Given #{reset}#{passed}I have #{reset}#{passed_arg}999#{reset}#{passed} cukes in my belly#{reset}\n"
+          "  Scenario: Lots of cukes              \e[90m# foo.feature:3\e[0m\n")
+        assert_io_include(
+          "    #{passed}Given #{reset}#{passed}I have #{reset}#{passed_arg}999#{reset}#{passed} cukes in my belly#{reset}\n"
         )
       end
 
@@ -105,12 +110,14 @@ module Gherkin
           Gherkin::Formatter::Argument.new(7, '999')
         ], nil))
         @f.result(Model::Result.new('passed', 6, nil))
+        @f.eof()
 
-        assert_io(
+        assert_io_include(
           "\n" +
-          "  Scenario: Lots of cukes              \e[90m# foo.feature:3\e[0m\n" +
-          "    #{executing}Given #{reset}#{executing}I have #{reset}#{executing_arg}999#{reset}#{executing} cukes in my belly#{reset}\n" +
-          "#{up(1)}    #{passed}Given #{reset}#{passed}I have #{reset}#{passed_arg}999#{reset}#{passed} cukes in my belly#{reset}\n"
+          "  Scenario: Lots of cukes              \e[90m# foo.feature:3\e[0m\n"
+        )
+        assert_io_include(
+          "    #{passed}Given #{reset}#{passed}I have #{reset}#{passed_arg}999#{reset}#{passed} cukes in my belly#{reset}\n"
         )
       end