Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cucumber/gherkin
...
head fork: cucumber/gherkin
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jul 14, 2010
@aslakhellesoy aslakhellesoy Avoid java.io.IOException: channel is broken when uploading jar files 6da5aa7
Commits on Jul 15, 2010
@aslakhellesoy aslakhellesoy All JSON elements must have a type attribute. It's a litte bit redund…
…ant (for feature and examples), but it simplifies parsing and outputting logic)
fd78734
@aslakhellesoy aslakhellesoy Use awesome_print for comparing JSON. Make sure there is always a des…
…cription.
5343c03
Commits on Jul 17, 2010
@aslakhellesoy aslakhellesoy Add missing i18n method 51e6844
@aslakhellesoy aslakhellesoy Deal with keywords containing exlamation mark, like Pirate. f09cdfb
@aslakhellesoy aslakhellesoy Line filter works on JRuby with Scenarios without steps 6ca4e1b
@aslakhellesoy aslakhellesoy Comments and Tags now have line numbers in JSON, making it possible t…
…o properly filter features coming from JSON
e58885f
@aslakhellesoy aslakhellesoy Release 2.1.5 7735a54
Commits on Jul 19, 2010
@aslakhellesoy aslakhellesoy Pure Java FilterFormatter 94d131b
Commits on Jul 20, 2010
@aslakhellesoy aslakhellesoy Pure Java JSONFormatter 77e72f0
@aslakhellesoy aslakhellesoy All formatter events take exactly one argument. Each argument is a si…
…ngle object with all data.
181e391
@aslakhellesoy aslakhellesoy Lose dead code ff0f4a9
Commits on Jul 21, 2010
@aslakhellesoy aslakhellesoy More work on JSON c4e85e2
@aslakhellesoy aslakhellesoy All passing on jruby and mri 1c272a7
Commits on Jul 26, 2010
@aslakhellesoy aslakhellesoy table doesn't have to be an interface method 5e68fb7
@aslakhellesoy aslakhellesoy Words 032c614
@aslakhellesoy aslakhellesoy Moving stuff around e51213f
@aslakhellesoy aslakhellesoy [BUGFIX] I18nLexer doesn't recognise language header with \r\n on OS …
…X. Closes #70.
8cf2be6
@aslakhellesoy aslakhellesoy Added a facade for GherkinParser 8c33e0e
@aslakhellesoy aslakhellesoy Release 2.2.0 1249efb
@aslakhellesoy aslakhellesoy dll hell d02d731
@aslakhellesoy aslakhellesoy Avoid warnings for the exe b06eb82
@aslakhellesoy aslakhellesoy Add some messages 38f862b
@aslakhellesoy aslakhellesoy Make Step not have a description attribute 3ec8ba7
Commits on Aug 01, 2010
@aslakhellesoy aslakhellesoy Fix bad number of arguments f2b4481
Commits on Aug 19, 2010
@aslakhellesoy aslakhellesoy Update to more recent API. f3344f2
@aslakhellesoy aslakhellesoy Use bundler 6411602
Commits on Aug 31, 2010
@aslakhellesoy aslakhellesoy Removed .rbc files f9b92d6
Commits on Sep 12, 2010
@aslakhellesoy aslakhellesoy Getting rid of jeweler, but having some Pathname woes with bundler. c990a73
@aslakhellesoy aslakhellesoy Fighting with bundler fc3009d
@aslakhellesoy aslakhellesoy New release process based on various trouble with bundler and rake_co…
…mpiler
df2c4ea
@aslakhellesoy aslakhellesoy make release dir 9237ded
@aslakhellesoy aslakhellesoy Add a gemspec 4de0aff
@aslakhellesoy aslakhellesoy Words 604615c
@aslakhellesoy aslakhellesoy Wrong place to check sanity 2d3f61a
@aslakhellesoy aslakhellesoy I gave up trying to script github file uploads 3c33f37
@aslakhellesoy aslakhellesoy STDIN.gets stupid 98cea0e
Commits on Sep 16, 2010
@aslakhellesoy aslakhellesoy Update RSpec. Ignore Gemfile.lock. 28d1632
Commits on Sep 21, 2010
@aslakhellesoy aslakhellesoy JSON parser can both take a String and a preparsed Hash. JSONFormatte…
…r only emits JSON if a Stream is passed. These changes allow for fewer JSON roundtrips in other libraries. Also added some missing deps to the gemspec.
e1d7d86
@aslakhellesoy aslakhellesoy Using the uri in JSON was not a good idea. Use native JSON for speed. 8fde0ae
@aslakhellesoy aslakhellesoy Prep for release fb9d2a1
@aslakhellesoy aslakhellesoy Release 2.2.2 ee01e10
@aslakhellesoy aslakhellesoy RSpec mocks can't be coerced into Java types 7338eae
@aslakhellesoy aslakhellesoy Update dates 49df02a
@aslakhellesoy aslakhellesoy Add back missing development dependency on cucumber. Release 2.2.3. 1d93819
@graza graza Removed use of C99 variable length array in lexer.c.rl.erb
Switched to allocating a new string instead.  Because the string
is used to throw an exception, it was allocated as a Ruby String
object so that GC can free it.
4eb29c5
@aslakhellesoy aslakhellesoy Merge remote branch 'remotes/graza/master' into c89-not-c99-ticket-75 d881108
Commits on Sep 22, 2010
@aslakhellesoy aslakhellesoy Attribution. Closes #75. 66a8e1b
@aslakhellesoy aslakhellesoy Release 2.2.4 093a3e8
Commits on Sep 28, 2010
@aslakhellesoy aslakhellesoy Typo. Remove dead code. 4b4c358
Commits on Sep 29, 2010
@aslakhellesoy aslakhellesoy Gherkin will look for the language comment for all the comments at th…
…e top of the feature.
dd88275
@aslakhellesoy aslakhellesoy Skip past empty lines when scanning the top of the file for language …
…comments. Also made it work for Java.
6e47392
Commits on Oct 01, 2010
@aslakhellesoy aslakhellesoy Release 2.2.5 f9d8eb9
@aslakhellesoy aslakhellesoy Remove undefined constant 10f3755
@aslakhellesoy aslakhellesoy Use x86 instead of i386. That's what other native windows gems (json,…
… nokogiri etc) seem to use, so I assume that's more mainstream.
1858874
Commits on Oct 02, 2010
@aslakhellesoy aslakhellesoy I18n.getCodeKeywords() on Java included '*'. Not anymore. Release 2.2.6. c6f3188
Commits on Oct 03, 2010
@aslakhellesoy aslakhellesoy I18n.getCodeKeywords() on Java didn't strip exclamation mark. Not any…
…more. Release 2.2.7.
88d5c7f
Commits on Oct 04, 2010
@aslakhellesoy aslakhellesoy Removed Trollop based CLI - didn't find a good use for it yet. 2b0ccbd
Commits on Oct 07, 2010
@aslakhellesoy aslakhellesoy Small improvement in the formatter API. Make steps() part of the publ…
…ic interface.
9226119
Commits on Oct 08, 2010
@aslakhellesoy aslakhellesoy Bump version, update History.txt 4172709
@aslakhellesoy aslakhellesoy Add Jansi and clean up some warnings. eaa350f
Commits on Oct 12, 2010
@aslakhellesoy aslakhellesoy Pretty formatter now prints in colour (at least mostly) da8e06a
@aslakhellesoy aslakhellesoy Started on js lexer. 9a776b2
Commits on Oct 14, 2010
@aslakhellesoy aslakhellesoy Colours are starting to work nicely on both ruby and java 552f647
Commits on Oct 15, 2010
@aslakhellesoy aslakhellesoy ANSI colors can be easily turned off without overhead abf03a7
@aslakhellesoy aslakhellesoy Words 74deeb8
@aslakhellesoy aslakhellesoy Release 2.2.9 18a094a
@aslakhellesoy aslakhellesoy Move Jansi code out to a class that we load by reflection so that we …
…don't get class not found errors on .NET/IKVM
a93bcb3
@aslakhellesoy aslakhellesoy Fix compile errors dbdf6d4
@aslakhellesoy aslakhellesoy Fix compile errors 5b5e4cb
@aslakhellesoy aslakhellesoy We cn get a java.lang.NoClassDefFoundError - catch anything. 04aa1d2
Commits on Oct 24, 2010
@aslakhellesoy aslakhellesoy Build on new computer. 44ee5ae
Commits on Nov 03, 2010
@peterk peterk Changed swedish translation for scenario outline to 'Scenariomall' to…
… improve understanding
cbbb13b
@peterk peterk Added swedish translation for scenario outline: 'Scenariomall' to imp…
…rove understanding
2bf28dc
@aslakhellesoy aslakhellesoy Merge remote branch 'remotes/peterk/master' 8e18c88
@aslakhellesoy aslakhellesoy New aliases for Scenario Outline in Swedish, Norwegian and English. a734c28
Commits on Nov 07, 2010
@aslakhellesoy aslakhellesoy Merge remote branch 'remotes/origin/javascript' into javascript 867ba6e
@aslakhellesoy aslakhellesoy Somethimes it's good to get a clean machine. Hopefully this makes it …
…easier for people to build gherkin on various platforms.
417693d
@aslakhellesoy aslakhellesoy Somethimes it's good to get a clean machine. Hopefully this makes it …
…easier for people to build gherkin on various platforms.
8c2adac
@aslakhellesoy aslakhellesoy Merge branch 'master' of github.com:aslakhellesoy/gherkin 3d673ae
Commits on Nov 09, 2010
@aslakhellesoy aslakhellesoy Extract Hashable to separate file 941ce17
@aslakhellesoy aslakhellesoy Results in JSON a35aadb
Commits on Nov 10, 2010
@aslakhellesoy aslakhellesoy Split up Result in Match and Result class. Adjust JSON schema acoordi…
…ngly.
d3fdd94
Commits on Nov 11, 2010
@aslakhellesoy aslakhellesoy Added support for Base64 encoded embeddings in JSON representation. b64e486
@aslakhellesoy aslakhellesoy Release 2.3.0 075212a
Commits on Nov 12, 2010
@aslakhellesoy aslakhellesoy Release 2.3.0 d3d3bfa
@aslakhellesoy aslakhellesoy Work around XPath bug on 1.8.6 cf7e533
@aslakhellesoy aslakhellesoy Rename stupid arg name 5bb1848
Commits on Nov 13, 2010
@aslakhellesoy aslakhellesoy Do a cursor up in color mode to print match before result. 9a10897
@aslakhellesoy aslakhellesoy Consistent naming. Use arg, not param. 430798a
@aslakhellesoy aslakhellesoy A step can now provide an array of arguments for <foo> tokens in outl…
…ine steps. This is handy for highlighting tokens in the formatters.
232d91f
@aslakhellesoy aslakhellesoy Add steps method (part of API) and rename the private one. 1115cd6
@aslakhellesoy aslakhellesoy Release 2.3.1 bfb2a2a
Commits on Nov 14, 2010
@aslakhellesoy aslakhellesoy Make PrettyFormatter more aware of the environment it is running in (…
…whether we can expect results or not)
509dd5c
Commits on Nov 18, 2010
@msassak msassak Fix Base64 warnings 092c786
Commits on Nov 24, 2010
@aslakhellesoy aslakhellesoy Update mockito dee26f4
@aslakhellesoy aslakhellesoy Bugfix: Can't define new line characters in Example Table Cell's Cont…
…ent. Closes #85.
f959c96
@aslakhellesoy aslakhellesoy Merge branch 'master' of git://github.com/msassak/gherkin cc0cec4
Commits on Dec 01, 2010
@aslakhellesoy aslakhellesoy [TODO: port PrettyFormatter.java changes to ruby] Introduced a new Re…
…porter API for results. Formatter is now for parsing only.
6dc5bef
Commits on Dec 02, 2010
@aslakhellesoy aslakhellesoy [TODO: port changes to ruby when we port cucumber.java to ruby] 026efe8
Commits on Dec 04, 2010
@mattwynne mattwynne Add a failing scenario for respecting whitespace in descriptions 77f813b
@mattwynne mattwynne Change the Ruby lexer slightly to respect whitespace in descriptions dcb1324
@mattwynne mattwynne Finish off whitespace respect for all other relevant keywords 853ec29
@aslakhellesoy aslakhellesoy More Java code for Cucumber.java d1386ea
@aslakhellesoy aslakhellesoy Merge remote branch 'mattwynne/respect-for-whitespace-in-descriptions…
…' into mattwynne-respect-for-whitespace-in-descriptions
2328737
@aslakhellesoy aslakhellesoy Oops - accident 5889ff8
@aslakhellesoy aslakhellesoy Merge branch 'master' into mattwynne-respect-for-whitespace-in-descri…
…ptions
82d6aea
@mattwynne mattwynne Use rstrip for the end of descriptions ab53547
Commits on Dec 05, 2010
@mattwynne mattwynne Changed shared example group to reflect new requirements for respecti…
…ng whitespace in descriptions
6a16ec5
@aslakhellesoy aslakhellesoy Merge remote branch 'mattwynne/respect-for-whitespace-in-descriptions…
…' into mattwynne-respect-for-whitespace-in-descriptions
078ed2c
@ghnatiuk ghnatiuk C lexer unindenting instead of multiline_stripping 5ed6664
@ghnatiuk ghnatiuk cleaner 7255365
@ghnatiuk ghnatiuk 1.9 is stricter 5120539
@aslakhellesoy aslakhellesoy Respect whitespace in descriptions for Java 415cfba
@aslakhellesoy aslakhellesoy Merge remote branch 'ghnatiuk/respect-for-whitespace-in-descriptions'…
… into respect-for-whitespace-in-descriptions-java
da50e80
@aslakhellesoy aslakhellesoy Fix multiline indentation and printing in Java. Also fix some off col…
…ours.
f89bb8b
@aslakhellesoy aslakhellesoy Attributions. Closes #87 6502ce6
@aslakhellesoy aslakhellesoy Release 2.3.2 3b0e6ca
@aslakhellesoy aslakhellesoy Some more XML crutches for Maven3 so we can push the jar. Jeeeeez. Re…
…lease 2.3.2 again.
0c73b72
@aslakhellesoy aslakhellesoy Remove dead code and do a small performance improvement. 92df8d5
@aslakhellesoy aslakhellesoy Merge branch 'master' into javascript 3687de9
Commits on Dec 14, 2010
@aslakhellesoy aslakhellesoy No more dependencies on external ANSI escape libraries (Ruby:term-ans…
…icolor, Java:Jansi)
46cc2b1
@aslakhellesoy aslakhellesoy No more dependencies on external ANSI escape libraries (Ruby:term-ans…
…icolor, Java:Jansi)
202a7fb
@aslakhellesoy aslakhellesoy Merge branch 'master' into javascript 9e867c9
Commits on Dec 17, 2010
@Holek Holek additional Polish aliases d3b04b2
@aslakhellesoy aslakhellesoy Better ANSI output for pretty formatter eeb1a63
Commits on Dec 19, 2010
@aslakhellesoy aslakhellesoy Add color for undefined args 274e466
Commits on Dec 26, 2010
@aslakhellesoy aslakhellesoy Added duration (in millseconds) to Result. Made code keywords method …
…public in java.
8f2e3b1
@aslakhellesoy aslakhellesoy Merge branch 'master' of git://github.com/Holek/gherkin e73060a
@aslakhellesoy aslakhellesoy Attribution 5376015
@aslakhellesoy aslakhellesoy Release 2.3.3 0f2ae33
@aslakhellesoy aslakhellesoy Always create gemset 35309f6
@aslakhellesoy aslakhellesoy Upgrade rake compiler 59a54e9
@aslakhellesoy aslakhellesoy Need more dev deps af8db07
@aslakhellesoy aslakhellesoy Hacks for RVM/Bundler/Rake-Compiler 2d32d25
@aslakhellesoy aslakhellesoy Aaaargh 046c814
@aslakhellesoy aslakhellesoy RVM is not my friend today 13fc624
Commits on Dec 27, 2010
@iulianu iulianu Romanian (ro) language update, extracted from a real-world project.
* Better translation.
* Tolerance for special letters (diacriticals) within the
same language, including both the comma-below and cedilla versions.
See http://en.wikipedia.org/wiki/Romanian_alphabet
* Removed the unnecessary (and inaptly named) ro-RO language.
76f9e4f
Commits on Jan 02, 2011
@aslakhellesoy aslakhellesoy Simplified formatter/reporter API by removing the steps() method. 3a673de
@aslakhellesoy aslakhellesoy Merge branch 'master' of https://github.com/iulianu/gherkin 7fe0b78
@aslakhellesoy aslakhellesoy Attribution 5f023b0
Commits on Feb 01, 2011
@colindean colindean fixed C90 errors encountered on Ubunt Natty
error: ISO C90 forbids mixed declarations and code
2a11583
Commits on Mar 09, 2011
@aslakhellesoy aslakhellesoy Attribution 1d4d533
Commits on Mar 10, 2011
@aslakhellesoy aslakhellesoy Upgraded gem deps 4c8d154
@aslakhellesoy aslakhellesoy Release 2.3.10 4e3b79a
Commits on Mar 13, 2011
@aslakhellesoy aslakhellesoy Merge branch 'master' into javascript ed3fca6
@aslakhellesoy aslakhellesoy Developer help 6917eaf
Commits on Mar 14, 2011
@aslakhellesoy aslakhellesoy Remove duplication f22469c
@aslakhellesoy aslakhellesoy Merge branch 'master' into javascript 89b2b59
@aslakhellesoy aslakhellesoy Grabbing feature keyword and name. 942a1bf
@aslakhellesoy aslakhellesoy More of the lexer is implemented a8b33bb
@aslakhellesoy aslakhellesoy Move the main method to a new file 13fd394
@aslakhellesoy aslakhellesoy Nicer interface 7893d24
@aslakhellesoy aslakhellesoy Move js lexers 93b9e5b
Commits on Mar 18, 2011
@aslakhellesoy aslakhellesoy Added a package.json 58bf708
Commits on Mar 19, 2011
@aslakhellesoy aslakhellesoy Mucking around with therubyracer - seeing if we can shoehorn in our s…
…pecs and cukes in the javascript implementation....
3a9999e
@aslakhellesoy aslakhellesoy Wrap the js lexer in a ruby class. -But why is nothing lexing?? f63e03c
@aslakhellesoy aslakhellesoy Updated instructions for JS and how to use therubyracer bb2d240
@aslakhellesoy aslakhellesoy Added TODO 57b5480
@rslifka rslifka Relaxed JSON gem requirement to ~> 1.4. 82f6559
@aslakhellesoy aslakhellesoy Code is working on therubyracer 8bb791e
Commits on Mar 20, 2011
@aslakhellesoy aslakhellesoy Moved Gherkin::JsLexer into spec folder so we can start running specs…
… against the js lexer
7ade912
@aslakhellesoy aslakhellesoy Rename to make it more clear what we're doing here. 516bf9e
@aslakhellesoy aslakhellesoy Gherkin is running in the browser. Piece of cake. 8784b25
@aslakhellesoy aslakhellesoy Added ace editor in the html - just for fun. 6c16e2f
@aslakhellesoy aslakhellesoy Updated gemspecs to use >= which is more relaxed. Our dependent gems …
…seem to have stabilized.
1285c32
@aslakhellesoy aslakhellesoy Merge b613409
@aslakhellesoy aslakhellesoy Release 2.3.5 7e8424a
@aslakhellesoy aslakhellesoy Minor tweak for JRuby 1.6.0 f4b937d
Commits on Mar 21, 2011
@aslakhellesoy aslakhellesoy Small tweak to work around new ISO-8859-1 file in cucumber 60b263b
@aslakhellesoy aslakhellesoy Merge with master bdea2fa
Commits on Mar 22, 2011
@aslakhellesoy aslakhellesoy No need to use EventEmitter. Remove accidentally added js lexers. f3c13c6
@aslakhellesoy aslakhellesoy Add tag and comment 7f90a4c
@aslakhellesoy aslakhellesoy A little closer to making specs pass b1275dd
@aslakhellesoy aslakhellesoy Add a note about ending the feature d8c7382
@aslakhellesoy aslakhellesoy Got a bunch more specs working for js lexer 445cdad
@aslakhellesoy aslakhellesoy Down to 28 spec failures. 1fd620c
@aslakhellesoy aslakhellesoy Down to 22 failures c943c10
@aslakhellesoy aslakhellesoy append ending for node.js f3e36f9
@aslakhellesoy aslakhellesoy ZOMFG down from 22 to 6 specs failing for Javascript lexer 994bcaa
Commits on Mar 24, 2011
@aslakhellesoy aslakhellesoy Down from 6 to 5 failing specs 59b2bc2
@aslakhellesoy aslakhellesoy Improve example 7b37006
@aslakhellesoy aslakhellesoy We have a bare bones editor working 9ab3e25
@aslakhellesoy aslakhellesoy Indent b417d4a
@aslakhellesoy aslakhellesoy remove ace submodule fb6858a
Commits on Mar 27, 2011
@aslakhellesoy aslakhellesoy Remove ace cebfef1
@aslakhellesoy aslakhellesoy Some serious syntax highlighting going on. be24d86
@aslakhellesoy aslakhellesoy A few more instructions about how to get the lexer running in a browser. b1d9b9d
Commits on Apr 03, 2011
@object object Corrected Russian translations d96aa71
Commits on Apr 11, 2011
@benhamill benhamill Remove un-needed if statement. 0706c17
Commits on Apr 19, 2011
@aslakhellesoy aslakhellesoy All Javascript specs passing except one - the one with BOM. And a pro…
…per npm packaging.
964bd99
@aslakhellesoy aslakhellesoy Cleaning up 6260ff2
@aslakhellesoy aslakhellesoy Merge branch 'javascript' of github.com:aslakhellesoy/gherkin into ja…
…vascript
02b3b50
@aslakhellesoy aslakhellesoy Update release process to include npm package e015eeb
@aslakhellesoy aslakhellesoy Merge branch 'avoid_not_null_warning' of https://github.com/benhamill…
…/gherkin into benhamill-avoid_not_null_warning
9574af8
@aslakhellesoy aslakhellesoy Attribution ec682f4
@aslakhellesoy aslakhellesoy Merge branch 'master' of https://github.com/object/gherkin 2e94cfc
@aslakhellesoy aslakhellesoy Attribution 749c7ef
@aslakhellesoy aslakhellesoy Release 2.3.6 156a784
@aslakhellesoy aslakhellesoy Fix build problem 8daf87b
@aslakhellesoy aslakhellesoy Another small build fix - on JRuby (pure Java) we can't use the [] op…
…erator, since the class behind is a Java class.
93a9529