cucumber 1.0.6 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/Gemfile.lock +6 -6
  2. data/History.md +5 -0
  3. data/cucumber.gemspec +1 -1
  4. data/features/json_formatter.feature +4 -5
  5. data/lib/cucumber/parser/gherkin_builder.rb +1 -1
  6. data/lib/cucumber/platform.rb +1 -1
  7. data/lib/cucumber/py_support/py_language.rb +3 -3
  8. data/lib/cucumber/runtime/support_code.rb +1 -1
  9. metadata +49 -50
  10. data/cucumber-1.0.3.gem +0 -0
data/Gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cucumber (1.0.6)
4
+ cucumber (1.1.0)
5
5
  builder (>= 2.1.2)
6
6
  diff-lcs (>= 1.1.2)
7
- gherkin (~> 2.4.18)
7
+ gherkin (~> 2.5.0)
8
8
  json (>= 1.4.6)
9
9
  term-ansicolor (>= 1.0.6)
10
10
 
@@ -31,12 +31,12 @@ GEM
31
31
  ffi (~> 1.0.6)
32
32
  diff-lcs (1.1.3)
33
33
  ffi (1.0.9)
34
- gherkin (2.4.18)
34
+ gherkin (2.5.0)
35
35
  json (>= 1.4.6)
36
36
  innate (2011.04)
37
37
  rack (>= 1.1.0)
38
- json (1.6.0)
39
- json_pure (1.6.0)
38
+ json (1.6.1)
39
+ json_pure (1.6.1)
40
40
  mime-types (1.16)
41
41
  multi_json (1.0.3)
42
42
  nokogiri (1.5.0)
@@ -47,7 +47,7 @@ GEM
47
47
  prawn-core (0.8.4)
48
48
  prawn-layout (0.8.4)
49
49
  prawn-security (0.8.4)
50
- rack (1.3.2)
50
+ rack (1.3.3)
51
51
  rack-test (0.6.1)
52
52
  rack (>= 1.0)
53
53
  rake (0.9.2)
data/History.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## [v1.1.0](https://github.com/cucumber/cucumber/compare/v1.0.6...v1.1.0)
2
+
3
+ ### Changed features
4
+ * The JSON formatter output has changed. See [Gherkin 2.5.0 History](https://github.com/cucumber/gherkin/blob/master/History.md) (Aslak Hellesøy)
5
+
1
6
  ## [v1.0.6](https://github.com/cucumber/cucumber/compare/v1.0.5...v1.0.6)
2
7
 
3
8
  ### Bugfixes
data/cucumber.gemspec CHANGED
@@ -23,7 +23,7 @@ for important information about this release. Happy cuking!
23
23
 
24
24
  }
25
25
 
26
- s.add_dependency 'gherkin', '~> 2.4.18'
26
+ s.add_dependency 'gherkin', '~> 2.5.0'
27
27
  s.add_dependency 'term-ansicolor', '>= 1.0.6'
28
28
  s.add_dependency 'builder', '>= 2.1.2'
29
29
  s.add_dependency 'diff-lcs', '>= 1.1.2'
data/features/json_formatter.feature CHANGED
@@ -181,11 +181,10 @@ Feature: JSON output formatter
181
181
  "keyword": "Then ",
182
182
  "name": "I should fail with",
183
183
  "line": 4,
184
- "multiline_arg": {
185
- "content_type": "",
186
- "value": "a string",
187
- "line": 5,
188
- "type": "doc_string"
184
+ "doc_string": {
185
+ "content_type": "",
186
+ "value": "a string",
187
+ "line": 5
189
188
  },
190
189
  "match": {
191
190
  "location": "features/step_definitions/doc_string_steps.rb:1"
data/lib/cucumber/parser/gherkin_builder.rb CHANGED
@@ -98,7 +98,7 @@ module Cucumber
98
98
  gherkin_step.line,
99
99
  gherkin_step.keyword,
100
100
  gherkin_step.name,
101
- Ast::MultilineArgument.from(gherkin_step.multiline_arg)
101
+ Ast::MultilineArgument.from(gherkin_step.doc_string || gherkin_step.rows)
102
102
  )
103
103
  step.gherkin_statement(gherkin_step)
104
104
  @step_container.add_step(step)
data/lib/cucumber/platform.rb CHANGED
@@ -4,7 +4,7 @@ require 'rbconfig'
4
4
 
5
5
  module Cucumber
6
6
  unless defined?(Cucumber::VERSION)
7
- VERSION = '1.0.6'
7
+ VERSION = '1.1.0'
8
8
  BINARY = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
9
9
  LIBDIR = File.expand_path(File.dirname(__FILE__) + '/../../lib')
10
10
  JRUBY = defined?(JRUBY_VERSION)
data/lib/cucumber/py_support/py_language.rb CHANGED
@@ -35,12 +35,12 @@ module Cucumber
35
35
  def begin_scenario(scenario)
36
36
  @python_path = []
37
37
  add_to_python_path(File.dirname(__FILE__))
38
- @step_def_files.each{|f| add_to_python_path(File.dirname(f))}
38
+ @step_def_files.each { |f| add_to_python_path(File.dirname(f)) }
39
39
 
40
40
  RubyPython.start
41
41
 
42
42
  @delegate = import(File.dirname(__FILE__) + '/py_language.py')
43
- @step_def_files.each{|f| import(f)}
43
+ @step_def_files.each { |f| import(f) }
44
44
  end
45
45
 
46
46
  def end_scenario
@@ -56,7 +56,7 @@ module Cucumber
56
56
  modname = File.basename(path)[0...-File.extname(path).length]
57
57
  begin
58
58
  mod = RubyPython.import(modname)
59
- rescue PythonError => e
59
+ rescue RubyPython::PythonError => e
60
60
  # e.message << "Couldn't load #{path}\nConsider adding #{File.expand_path(File.dirname(path))} to your PYTHONPATH"
61
61
  raise e
62
62
  end
data/lib/cucumber/runtime/support_code.rb CHANGED
@@ -20,7 +20,7 @@ module Cucumber
20
20
  end
21
21
 
22
22
  def step(step)
23
- @support_code.invoke(step.name, Ast::MultilineArgument.from(step.multiline_arg))
23
+ @support_code.invoke(step.name, Ast::MultilineArgument.from(step.doc_string || step.rows))
24
24
  end
25
25
 
26
26
  def eof
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cucumber
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,22 +9,22 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-09-13 00:00:00.000000000Z
12
+ date: 2011-09-22 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: gherkin
16
- requirement: &2160718600 !ruby/object:Gem::Requirement
16
+ requirement: &2164526960 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 2.4.18
21
+ version: 2.5.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2160718600
24
+ version_requirements: *2164526960
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: term-ansicolor
27
- requirement: &2160717900 !ruby/object:Gem::Requirement
27
+ requirement: &2164525920 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.6
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2160717900
35
+ version_requirements: *2164525920
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: builder
38
- requirement: &2160717380 !ruby/object:Gem::Requirement
38
+ requirement: &2164524740 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.1.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2160717380
46
+ version_requirements: *2164524740
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: diff-lcs
49
- requirement: &2160716880 !ruby/object:Gem::Requirement
49
+ requirement: &2164523960 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.2
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2160716880
57
+ version_requirements: *2164523960
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: json
60
- requirement: &2160716320 !ruby/object:Gem::Requirement
60
+ requirement: &2164506740 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.4.6
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *2160716320
68
+ version_requirements: *2164506740
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: aruba
71
- requirement: &2160715820 !ruby/object:Gem::Requirement
71
+ requirement: &2164506260 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 0.4.6
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2160715820
79
+ version_requirements: *2164506260
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rake
82
- requirement: &2160715320 !ruby/object:Gem::Requirement
82
+ requirement: &2164505540 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.9.2
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2160715320
90
+ version_requirements: *2164505540
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rspec
93
- requirement: &2160714840 !ruby/object:Gem::Requirement
93
+ requirement: &2164504860 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 2.6.0
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2160714840
101
+ version_requirements: *2164504860
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: nokogiri
104
- requirement: &2160714280 !ruby/object:Gem::Requirement
104
+ requirement: &2164503800 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 1.5.0
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2160714280
112
+ version_requirements: *2164503800
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: prawn
115
- requirement: &2160713640 !ruby/object:Gem::Requirement
115
+ requirement: &2164503320 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.8.4
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2160713640
123
+ version_requirements: *2164503320
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: prawn-layout
126
- requirement: &2160712800 !ruby/object:Gem::Requirement
126
+ requirement: &2164502820 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.8.4
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *2160712800
134
+ version_requirements: *2164502820
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: syntax
137
- requirement: &2160711800 !ruby/object:Gem::Requirement
137
+ requirement: &2164502040 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 1.0.0
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *2160711800
145
+ version_requirements: *2164502040
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: spork
148
- requirement: &2160710920 !ruby/object:Gem::Requirement
148
+ requirement: &2164501260 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 0.9.0.rc9
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *2160710920
156
+ version_requirements: *2164501260
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: simplecov
159
- requirement: &2160709160 !ruby/object:Gem::Requirement
159
+ requirement: &2164500440 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 0.4.2
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *2160709160
167
+ version_requirements: *2164500440
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: yard
170
- requirement: &2160708180 !ruby/object:Gem::Requirement
170
+ requirement: &2164498820 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ~>
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 0.7.2
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *2160708180
178
+ version_requirements: *2164498820
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: rdiscount
181
- requirement: &2160707400 !ruby/object:Gem::Requirement
181
+ requirement: &2164418240 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 1.6.8
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *2160707400
189
+ version_requirements: *2164418240
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: bcat
192
- requirement: &2160706220 !ruby/object:Gem::Requirement
192
+ requirement: &2164417040 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 0.6.1
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *2160706220
200
+ version_requirements: *2164417040
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: ramaze
203
- requirement: &2160694760 !ruby/object:Gem::Requirement
203
+ requirement: &2164416160 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: '0'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *2160694760
211
+ version_requirements: *2164416160
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: rack-test
214
- requirement: &2160693720 !ruby/object:Gem::Requirement
214
+ requirement: &2164414940 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: 0.5.7
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *2160693720
222
+ version_requirements: *2164414940
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: webrat
225
- requirement: &2160692660 !ruby/object:Gem::Requirement
225
+ requirement: &2164413860 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: 0.7.3
231
231
  type: :development
232
232
  prerelease: false
233
- version_requirements: *2160692660
233
+ version_requirements: *2164413860
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: sinatra
236
- requirement: &2160691920 !ruby/object:Gem::Requirement
236
+ requirement: &2164409080 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: 1.2.6
242
242
  type: :development
243
243
  prerelease: false
244
- version_requirements: *2160691920
244
+ version_requirements: *2164409080
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: capybara
247
- requirement: &2160691200 !ruby/object:Gem::Requirement
247
+ requirement: &2164403160 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ! '>='
@@ -252,7 +252,7 @@ dependencies:
252
252
  version: 1.1.0
253
253
  type: :development
254
254
  prerelease: false
255
- version_requirements: *2160691200
255
+ version_requirements: *2164403160
256
256
  description: Behaviour Driven Development with elegance and joy
257
257
  email: cukes@googlegroups.com
258
258
  executables:
@@ -273,7 +273,6 @@ files:
273
273
  - README.md
274
274
  - Rakefile
275
275
  - bin/cucumber
276
- - cucumber-1.0.3.gem
277
276
  - cucumber.gemspec
278
277
  - cucumber.yml
279
278
  - examples/i18n/README.textile
@@ -835,7 +834,7 @@ post_install_message: ! '
835
834
  (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
836
835
 
837
836
 
838
- Thank you for installing cucumber-1.0.6.
837
+ Thank you for installing cucumber-1.1.0.
839
838
 
840
839
  Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading
841
840
 
@@ -867,7 +866,7 @@ rubyforge_project:
867
866
  rubygems_version: 1.8.10
868
867
  signing_key:
869
868
  specification_version: 3
870
- summary: cucumber-1.0.6
869
+ summary: cucumber-1.1.0
871
870
  test_files:
872
871
  - features/background.feature
873
872
  - features/bootstrap.feature
data/cucumber-1.0.3.gem DELETED
Binary file