gherkin 2.3.7 → 2.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (50) hide show
  1. data/.gitignore +3 -0
  2. data/.yardopts +5 -0
  3. data/{History.txt → History.md} +153 -127
  4. data/{README.rdoc → README.md} +66 -64
  5. data/Rakefile +9 -2
  6. data/features/json_formatter.feature +1 -1
  7. data/features/json_parser.feature +1 -1
  8. data/gherkin.gemspec +16 -14
  9. data/js/lib/gherkin/lexer/.npmignore +0 -0
  10. data/lib/gherkin/formatter/ansi_escapes.rb +1 -1
  11. data/lib/gherkin/formatter/model.rb +4 -4
  12. data/lib/gherkin/formatter/pretty_formatter.rb +4 -4
  13. data/lib/gherkin/json_parser.rb +1 -1
  14. data/lib/gherkin/listener/formatter_listener.rb +7 -7
  15. data/lib/gherkin/parser/meta.txt +1 -1
  16. data/lib/gherkin/parser/root.txt +1 -1
  17. data/lib/gherkin/parser/steps.txt +1 -1
  18. data/lib/gherkin/rubify.rb +2 -2
  19. data/ragel/lexer.c.rl.erb +2 -2
  20. data/ragel/lexer.java.rl.erb +2 -2
  21. data/ragel/lexer.js.rl.erb +8 -6
  22. data/ragel/lexer.rb.rl.erb +2 -2
  23. data/ragel/lexer_common.rl.erb +4 -4
  24. data/spec/gherkin/c_lexer_spec.rb +1 -1
  25. data/spec/gherkin/fixtures/complex.json +1 -1
  26. data/spec/gherkin/java_lexer_spec.rb +1 -1
  27. data/spec/gherkin/js_lexer_spec.rb +2 -2
  28. data/spec/gherkin/rb_lexer_spec.rb +1 -1
  29. data/spec/gherkin/sexp_recorder.rb +2 -2
  30. data/spec/gherkin/shared/{py_string_group.rb → doc_string_group.rb} +28 -28
  31. data/spec/gherkin/shared/lexer_group.rb +4 -4
  32. data/spec/spec_helper.rb +1 -1
  33. data/tasks/compile.rake +3 -2
  34. data/tasks/cucumber.rake +1 -1
  35. data/tasks/gems.rake +2 -2
  36. data/tasks/ikvm.rake +4 -4
  37. data/tasks/ragel_task.rb +7 -0
  38. data/tasks/release.rake +10 -9
  39. data/tasks/yard.rake +7 -0
  40. data/tasks/yard/default/layout/html/bubble_32x32.png +0 -0
  41. data/tasks/yard/default/layout/html/bubble_48x48.png +0 -0
  42. data/tasks/yard/default/layout/html/footer.erb +5 -0
  43. data/tasks/yard/default/layout/html/index.erb +1 -0
  44. data/tasks/yard/default/layout/html/layout.erb +25 -0
  45. data/tasks/yard/default/layout/html/logo.erb +1 -0
  46. data/tasks/yard/default/layout/html/setup.rb +4 -0
  47. metadata +53 -26
  48. data/VERSION +0 -1
  49. data/lib/gherkin/version.rb +0 -3
  50. data/tasks/rdoc.rake +0 -9
@@ -2,6 +2,13 @@ require 'yaml'
2
2
  require 'erb'
3
3
 
4
4
  class RagelTask
5
+ begin
6
+ # Support Rake >= 0.9.0
7
+ require 'rake/dsl_definition'
8
+ include Rake::DSL
9
+ rescue LoadError
10
+ end
11
+
5
12
  RL_OUTPUT_DIR = File.dirname(__FILE__) + "/../ragel/i18n"
6
13
 
7
14
  def initialize(lang, i18n)
@@ -1,6 +1,6 @@
1
1
  namespace :release do
2
2
  desc 'Upload all packages and tag git'
3
- task :ALL => ['gems:sanity', :push_dll, :push_jar, :push_native_gems, :push_npm_package, :release]
3
+ task :ALL => ['gems:sanity', :ikvm, :push_jar, :push_native_gems, :push_npm_package, :release, :push_yard, :post_release]
4
4
 
5
5
  desc 'Push all gems to rubygems.org (gemcutter)'
6
6
  task :push_native_gems do
@@ -11,14 +11,8 @@ namespace :release do
11
11
  end
12
12
  end
13
13
 
14
- desc 'Push dll to Github'
15
- task :push_dll => :ikvm do
16
- Dir.chdir('release') do
17
- # No known way to do scripted uploads. github/upload or aslakhellesoy's fork of github-gem no longer work
18
- puts "Manually upload gherkin-#{Gherkin::VERSION}.dll to http://github.com/aslakhellesoy/gherkin/downloads"
19
- puts "Then press enter"
20
- STDIN.gets
21
- end
14
+ task :post_release => :ikvm do
15
+ puts "\n\n****** Manually upload gherkin-#{GHERKIN_VERSION}.dll to http://github.com/cucumber/gherkin/downloads ******\n\n"
22
16
  end
23
17
 
24
18
  desc 'Push jar to cukes.info Maven repo'
@@ -34,4 +28,11 @@ namespace :release do
34
28
  sh("npm publish")
35
29
  end
36
30
  end
31
+
32
+ desc 'Push yardoc to http://cukes.info/gherkin/api/#{GHERKIN_VERSION}'
33
+ task :push_yard => :yard do
34
+ sh("tar czf release/api-#{GHERKIN_VERSION}.tgz -C doc .")
35
+ sh("scp release/api-#{GHERKIN_VERSION}.tgz cukes.info:/var/www/gherkin/api/ruby")
36
+ sh("ssh cukes.info 'cd /var/www/gherkin/api/ruby && mkdir #{GHERKIN_VERSION} && tar xzf api-#{GHERKIN_VERSION}.tgz -C #{GHERKIN_VERSION} && rm -f latest && ln -s #{GHERKIN_VERSION} latest'")
37
+ end
37
38
  end
@@ -0,0 +1,7 @@
1
+ unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
2
+ require 'yard'
3
+ require 'yard/rake/yardoc_task'
4
+
5
+ YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
6
+ YARD::Rake::YardocTask.new(:yard)
7
+ end
@@ -0,0 +1,5 @@
1
+ <div id="footer">
2
+ Generated on <%= Time.now.strftime("%c") %> by
3
+ <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
4
+ <%= YARD::VERSION %> (ruby-<%= RUBY_VERSION %>).
5
+ </div>
@@ -0,0 +1 @@
1
+ <%= yieldall %>
@@ -0,0 +1,25 @@
1
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
+ <head>
5
+ <%= erb(:headers) %>
6
+ </head>
7
+ <body>
8
+ <script type="text/javascript" charset="utf-8">
9
+ if (window.top.frames.main) document.body.className = 'frames';
10
+ </script>
11
+
12
+ <div id="header">
13
+ <%= erb(:logo) %>
14
+ <%= erb(:breadcrumb) %>
15
+ <%= erb(:search) %>
16
+ <div class="clear"></div>
17
+ </div>
18
+
19
+ <iframe id="search_frame"></iframe>
20
+
21
+ <div id="content"><%= yieldall %></div>
22
+
23
+ <%= erb(:footer) %>
24
+ </body>
25
+ </html>
@@ -0,0 +1 @@
1
+ <h3><img src="<%= url_for('images/bubble_32x32.png') %>"></img> Gherkin <%= GHERKIN_VERSION %></h3>
@@ -0,0 +1,4 @@
1
+ def init
2
+ super
3
+ options[:serializer].serialize('/images/bubble_32x32.png', IO.read(File.dirname(__FILE__) + '/bubble_32x32.png'))
4
+ end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: gherkin
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.3.7
5
+ version: 2.4.0
6
6
  platform: ruby
7
7
  authors:
8
8
  - Mike Sassak
@@ -12,7 +12,7 @@ autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
14
 
15
- date: 2011-05-02 00:00:00 +01:00
15
+ date: 2011-06-05 00:00:00 +01:00
16
16
  default_executable: gherkin
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
@@ -45,7 +45,7 @@ dependencies:
45
45
  requirements:
46
46
  - - ">="
47
47
  - !ruby/object:Gem::Version
48
- version: 0.10.0
48
+ version: 0.10.3
49
49
  type: :development
50
50
  version_requirements: *id003
51
51
  - !ruby/object:Gem::Dependency
@@ -54,7 +54,7 @@ dependencies:
54
54
  requirement: &id004 !ruby/object:Gem::Requirement
55
55
  none: false
56
56
  requirements:
57
- - - ">="
57
+ - - "="
58
58
  - !ruby/object:Gem::Version
59
59
  version: 0.8.7
60
60
  type: :development
@@ -67,7 +67,7 @@ dependencies:
67
67
  requirements:
68
68
  - - ">="
69
69
  - !ruby/object:Gem::Version
70
- version: 1.0.10
70
+ version: 1.0.14
71
71
  type: :development
72
72
  version_requirements: *id005
73
73
  - !ruby/object:Gem::Dependency
@@ -78,7 +78,7 @@ dependencies:
78
78
  requirements:
79
79
  - - ">="
80
80
  - !ruby/object:Gem::Version
81
- version: 2.5.0
81
+ version: 2.6.0
82
82
  type: :development
83
83
  version_requirements: *id006
84
84
  - !ruby/object:Gem::Dependency
@@ -89,7 +89,7 @@ dependencies:
89
89
  requirements:
90
90
  - - ">="
91
91
  - !ruby/object:Gem::Version
92
- version: "0.3"
92
+ version: 0.4.0
93
93
  type: :development
94
94
  version_requirements: *id007
95
95
  - !ruby/object:Gem::Dependency
@@ -100,31 +100,53 @@ dependencies:
100
100
  requirements:
101
101
  - - ">="
102
102
  - !ruby/object:Gem::Version
103
- version: 0.8.2.pre2
103
+ version: 0.9.0.beta7
104
104
  type: :development
105
105
  version_requirements: *id008
106
106
  - !ruby/object:Gem::Dependency
107
- name: term-ansicolor
107
+ name: yard
108
108
  prerelease: false
109
109
  requirement: &id009 !ruby/object:Gem::Requirement
110
+ none: false
111
+ requirements:
112
+ - - "="
113
+ - !ruby/object:Gem::Version
114
+ version: 0.7.1
115
+ type: :development
116
+ version_requirements: *id009
117
+ - !ruby/object:Gem::Dependency
118
+ name: rdiscount
119
+ prerelease: false
120
+ requirement: &id010 !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - "="
124
+ - !ruby/object:Gem::Version
125
+ version: 1.6.8
126
+ type: :development
127
+ version_requirements: *id010
128
+ - !ruby/object:Gem::Dependency
129
+ name: term-ansicolor
130
+ prerelease: false
131
+ requirement: &id011 !ruby/object:Gem::Requirement
110
132
  none: false
111
133
  requirements:
112
134
  - - ">="
113
135
  - !ruby/object:Gem::Version
114
136
  version: 1.0.5
115
137
  type: :development
116
- version_requirements: *id009
138
+ version_requirements: *id011
117
139
  - !ruby/object:Gem::Dependency
118
140
  name: builder
119
141
  prerelease: false
120
- requirement: &id010 !ruby/object:Gem::Requirement
142
+ requirement: &id012 !ruby/object:Gem::Requirement
121
143
  none: false
122
144
  requirements:
123
145
  - - ">="
124
146
  - !ruby/object:Gem::Version
125
- version: 3.0.0
147
+ version: 2.1.2
126
148
  type: :development
127
- version_requirements: *id010
149
+ version_requirements: *id012
128
150
  description: A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler.
129
151
  email: cukes@googlegroups.com
130
152
  executables: []
@@ -174,10 +196,8 @@ extensions:
174
196
  - ext/gherkin_lexer_vi/extconf.rb
175
197
  - ext/gherkin_lexer_zh_cn/extconf.rb
176
198
  - ext/gherkin_lexer_zh_tw/extconf.rb
177
- extra_rdoc_files:
178
- - LICENSE
179
- - README.rdoc
180
- - History.txt
199
+ extra_rdoc_files: []
200
+
181
201
  files:
182
202
  - .gitattributes
183
203
  - .gitignore
@@ -185,12 +205,12 @@ files:
185
205
  - .mailmap
186
206
  - .rspec
187
207
  - .rvmrc
208
+ - .yardopts
188
209
  - Gemfile
189
- - History.txt
210
+ - History.md
190
211
  - LICENSE
191
- - README.rdoc
212
+ - README.md
192
213
  - Rakefile
193
- - VERSION
194
214
  - build_native_gems.sh
195
215
  - cucumber.yml
196
216
  - features/escaped_pipes.feature
@@ -215,6 +235,7 @@ files:
215
235
  - js/.gitignore
216
236
  - js/.npmignore
217
237
  - js/lib/gherkin/lexer/.gitignore
238
+ - js/lib/gherkin/lexer/.npmignore
218
239
  - lib/.gitignore
219
240
  - lib/gherkin.rb
220
241
  - lib/gherkin/c_lexer.rb
@@ -251,7 +272,6 @@ files:
251
272
  - lib/gherkin/rb_lexer/README.rdoc
252
273
  - lib/gherkin/rubify.rb
253
274
  - lib/gherkin/tag_expression.rb
254
- - lib/gherkin/version.rb
255
275
  - ragel/i18n/.gitignore
256
276
  - ragel/lexer.c.rl.erb
257
277
  - ragel/lexer.java.rl.erb
@@ -294,8 +314,8 @@ files:
294
314
  - spec/gherkin/rb_lexer_spec.rb
295
315
  - spec/gherkin/sexp_recorder.rb
296
316
  - spec/gherkin/shared/bom_group.rb
317
+ - spec/gherkin/shared/doc_string_group.rb
297
318
  - spec/gherkin/shared/lexer_group.rb
298
- - spec/gherkin/shared/py_string_group.rb
299
319
  - spec/gherkin/shared/row_group.rb
300
320
  - spec/gherkin/shared/tags_group.rb
301
321
  - spec/gherkin/tag_expression_spec.rb
@@ -309,9 +329,16 @@ files:
309
329
  - tasks/gems.rake
310
330
  - tasks/ikvm.rake
311
331
  - tasks/ragel_task.rb
312
- - tasks/rdoc.rake
313
332
  - tasks/release.rake
314
333
  - tasks/rspec.rake
334
+ - tasks/yard.rake
335
+ - tasks/yard/default/layout/html/bubble_32x32.png
336
+ - tasks/yard/default/layout/html/bubble_48x48.png
337
+ - tasks/yard/default/layout/html/footer.erb
338
+ - tasks/yard/default/layout/html/index.erb
339
+ - tasks/yard/default/layout/html/layout.erb
340
+ - tasks/yard/default/layout/html/logo.erb
341
+ - tasks/yard/default/layout/html/setup.rb
315
342
  - lib/gherkin/rb_lexer/ar.rb
316
343
  - lib/gherkin/rb_lexer/bg.rb
317
344
  - lib/gherkin/rb_lexer/ca.rb
@@ -445,7 +472,7 @@ files:
445
472
  - ext/gherkin_lexer_zh_cn/extconf.rb
446
473
  - ext/gherkin_lexer_zh_tw/extconf.rb
447
474
  has_rdoc: true
448
- homepage: http://github.com/aslakhellesoy/gherkin
475
+ homepage: http://github.com/cucumber/gherkin
449
476
  licenses: []
450
477
 
451
478
  post_install_message:
@@ -471,7 +498,7 @@ rubyforge_project:
471
498
  rubygems_version: 1.6.2
472
499
  signing_key:
473
500
  specification_version: 3
474
- summary: gherkin-2.3.7
501
+ summary: gherkin-2.4.0
475
502
  test_files:
476
503
  - features/escaped_pipes.feature
477
504
  - features/feature_parser.feature
@@ -523,8 +550,8 @@ test_files:
523
550
  - spec/gherkin/rb_lexer_spec.rb
524
551
  - spec/gherkin/sexp_recorder.rb
525
552
  - spec/gherkin/shared/bom_group.rb
553
+ - spec/gherkin/shared/doc_string_group.rb
526
554
  - spec/gherkin/shared/lexer_group.rb
527
- - spec/gherkin/shared/py_string_group.rb
528
555
  - spec/gherkin/shared/row_group.rb
529
556
  - spec/gherkin/shared/tags_group.rb
530
557
  - spec/gherkin/tag_expression_spec.rb
data/VERSION DELETED
@@ -1 +0,0 @@
1
- 2.3.7
@@ -1,3 +0,0 @@
1
- module Gherkin
2
- VERSION = IO.read(File.dirname(__FILE__) + '/../../VERSION').strip
3
- end
@@ -1,9 +0,0 @@
1
- require 'rake/rdoctask'
2
-
3
- Rake::RDocTask.new do |rdoc|
4
- rdoc.rdoc_dir = 'rdoc'
5
- rdoc.title = "Gherkin #{Gherkin::VERSION}"
6
- rdoc.rdoc_files.include('README.rdoc')
7
- rdoc.rdoc_files.include('lib/**/*.rb')
8
- rdoc.rdoc_files.exclude('lib/gherkin/lexer')
9
- end