gherkin 2.12.0 → 2.12.1

data/ext/gherkin_lexer_vi/gherkin_lexer_vi.c

@@ -1096,7 +1096,7 @@ _resume:
 			else if ( (*p) > *_mid )
 				_lower = _mid + 1;
 			else {
-				_trans += (_mid - _keys);
+				_trans += (unsigned int)(_mid - _keys);
 				goto _match;
 			}
 		}
@@ -1119,7 +1119,7 @@ _resume:
 			else if ( (*p) > _mid[1] )
 				_lower = _mid + 2;
 			else {
-				_trans += ((_mid - _keys)>>1);
+				_trans += (unsigned int)((_mid - _keys)>>1);
 				goto _match;
 			}
 		}

data/ext/gherkin_lexer_zh_cn/gherkin_lexer_zh_cn.c

@@ -952,7 +952,7 @@ _resume:
 			else if ( (*p) > *_mid )
 				_lower = _mid + 1;
 			else {
-				_trans += (_mid - _keys);
+				_trans += (unsigned int)(_mid - _keys);
 				goto _match;
 			}
 		}
@@ -975,7 +975,7 @@ _resume:
 			else if ( (*p) > _mid[1] )
 				_lower = _mid + 2;
 			else {
-				_trans += ((_mid - _keys)>>1);
+				_trans += (unsigned int)((_mid - _keys)>>1);
 				goto _match;
 			}
 		}

data/ext/gherkin_lexer_zh_tw/gherkin_lexer_zh_tw.c

@@ -945,7 +945,7 @@ _resume:
 			else if ( (*p) > *_mid )
 				_lower = _mid + 1;
 			else {
-				_trans += (_mid - _keys);
+				_trans += (unsigned int)(_mid - _keys);
 				goto _match;
 			}
 		}
@@ -968,7 +968,7 @@ _resume:
 			else if ( (*p) > _mid[1] )
 				_lower = _mid + 2;
 			else {
-				_trans += ((_mid - _keys)>>1);
+				_trans += (unsigned int)((_mid - _keys)>>1);
 				goto _match;
 			}
 		}

data/features/.cucumber/stepdefs.json

@@ -1,243 +1,243 @@
 [
   {
-    "source": "^they have arrived$",
-    "flags": "",
     "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$",
-    "flags": "",
     "file_colon_line": "features/step_definitions/gherkin_steps.rb:1",
+    "flags": "",
+    "source": "^a \"(ruby|native)\" \"([^\\\"]*)\" parser$",
     "steps": [
 
     ]
   },
   {
-    "source": "^the\\ following\\ text\\ is\\ parsed:$",
-    "flags": "",
     "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$",
-    "flags": "",
     "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+)$",
-    "flags": "",
     "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 .*)$",
-    "flags": "",
     "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$",
-    "flags": "",
     "file_colon_line": "features/step_definitions/json_formatter_steps.rb:13",
+    "flags": "",
+    "source": "^a JSON formatter$",
     "steps": [
 
     ]
   },
   {
-    "source": "^the outputted JSON should be:$",
-    "flags": "",
     "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$",
-    "flags": "",
     "file_colon_line": "features/step_definitions/json_parser_steps.rb:6",
+    "flags": "",
+    "source": "^a PrettyFormatter$",
     "steps": [
 
     ]
   },
   {
-    "source": "^a JSON lexer$",
-    "flags": "",
     "file_colon_line": "features/step_definitions/json_parser_steps.rb:11",
+    "flags": "",
+    "source": "^a JSON lexer$",
     "steps": [
 
     ]
   },
   {
-    "source": "^the following JSON is parsed:$",
-    "flags": "",
     "file_colon_line": "features/step_definitions/json_parser_steps.rb:15",
+    "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:$",
-    "flags": "",
     "file_colon_line": "features/step_definitions/json_parser_steps.rb:19",
+    "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$",
-    "flags": "",
     "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$",
-    "flags": "",
     "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$",
-    "flags": "",
     "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$",
-    "flags": "",
     "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"
       }
     ]
   }

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",