Skip to content
This repository
Browse code

Merge with master

  • Loading branch information...
commit 9e4abf5e4dfda12be99edb67158f99d3052f5d02 2 parents 00fee0f + 06aa77f
Aslak Hellesøy aslakhellesoy authored
1  .gitignore
... ... @@ -1,3 +1,4 @@
  1 +.bundle
1 2 nbproject
2 3 coverage
3 4 pkg
18 Gemfile
... ... @@ -0,0 +1,18 @@
  1 +source "http://rubygems.org"
  2 +
  3 +gem 'gherkin', '~> 2.2.0'
  4 +gem 'term-ansicolor', '~> 1.0.5'
  5 +gem 'builder', '~> 2.1.2'
  6 +gem 'diff-lcs', '~> 1.1.2'
  7 +gem 'json_pure', '~> 1.4.3'
  8 +
  9 +group :development do
  10 + gem 'rake', '~> 0.8.7'
  11 + gem 'jeweler', '~> 1.4.0'
  12 + gem 'nokogiri', '~> 1.4.2'
  13 + gem 'prawn', '= 0.8.4'
  14 + gem 'prawn-layout', '= 0.8.4'
  15 + gem 'rspec', '~> 2.0.0.beta.19'
  16 + gem 'syntax', '~> 1.0.0'
  17 + gem 'spork', '~> 0.8.4'
  18 +end
56 Gemfile.lock
... ... @@ -0,0 +1,56 @@
  1 +GEM
  2 + remote: http://rubygems.org/
  3 + specs:
  4 + builder (2.1.2)
  5 + diff-lcs (1.1.2)
  6 + gemcutter (0.5.0)
  7 + json_pure
  8 + gherkin (2.2.0)
  9 + trollop (~> 1.16.2)
  10 + git (1.2.5)
  11 + jeweler (1.4.0)
  12 + gemcutter (>= 0.1.0)
  13 + git (>= 1.2.5)
  14 + rubyforge (>= 2.0.0)
  15 + json_pure (1.4.4)
  16 + nokogiri (1.4.3.1)
  17 + prawn (0.8.4)
  18 + prawn-core (>= 0.8.4, < 0.9)
  19 + prawn-layout (>= 0.8.4, < 0.9)
  20 + prawn-security (>= 0.8.4, < 0.9)
  21 + prawn-core (0.8.4)
  22 + prawn-layout (0.8.4)
  23 + prawn-security (0.8.4)
  24 + rake (0.8.7)
  25 + rspec (2.0.0.beta.19)
  26 + rspec-core (= 2.0.0.beta.19)
  27 + rspec-expectations (= 2.0.0.beta.19)
  28 + rspec-mocks (= 2.0.0.beta.19)
  29 + rspec-core (2.0.0.beta.19)
  30 + rspec-expectations (2.0.0.beta.19)
  31 + diff-lcs (>= 1.1.2)
  32 + rspec-mocks (2.0.0.beta.19)
  33 + rubyforge (2.0.4)
  34 + json_pure (>= 1.1.7)
  35 + spork (0.8.4)
  36 + syntax (1.0.0)
  37 + term-ansicolor (1.0.5)
  38 + trollop (1.16.2)
  39 +
  40 +PLATFORMS
  41 + ruby
  42 +
  43 +DEPENDENCIES
  44 + builder (~> 2.1.2)
  45 + diff-lcs (~> 1.1.2)
  46 + gherkin (~> 2.2.0)
  47 + jeweler (~> 1.4.0)
  48 + json_pure (~> 1.4.3)
  49 + nokogiri (~> 1.4.2)
  50 + prawn (= 0.8.4)
  51 + prawn-layout (= 0.8.4)
  52 + rake (~> 0.8.7)
  53 + rspec (~> 2.0.0.beta.19)
  54 + spork (~> 0.8.4)
  55 + syntax (~> 1.0.0)
  56 + term-ansicolor (~> 1.0.5)
4 History.txt
@@ -15,8 +15,12 @@
15 15 * AfterConfiguration hook is no longer required. Use the Cucumber.configure instead.
16 16
17 17 === Bugfixes
  18 +* Compatibility with rspec-2.0.0.beta.19 mocks (Aslak Hellesøy)
18 19 * JUnit formatter now puts output in CDATA sections. (Dmitry Amelchenko)
19 20
  21 +=== New features
  22 +* Use Bundler for dependency management. (Aslak Hellesøy, Rob Hunter)
  23 +
20 24 == 0.8.5 (2010-07-14)
21 25
22 26 === Bugfixes
18 Rakefile
... ... @@ -1,5 +1,8 @@
1 1 # encoding: utf-8
2 2 require 'rubygems'
  3 +require 'bundler'
  4 +Bundler.setup
  5 +
3 6 require 'term/ansicolor'
4 7 require 'rake'
5 8 $:.unshift(File.dirname(__FILE__) + '/lib')
@@ -16,19 +19,8 @@ begin
16 19 gem.homepage = "http://cukes.info"
17 20 gem.authors = ["Aslak Hellesøy"]
18 21
19   - gem.add_dependency 'gherkin', '~> 2.2.0'
20   - gem.add_dependency 'term-ansicolor', '~> 1.0.4'
21   - gem.add_dependency 'builder', '~> 2.1.2'
22   - gem.add_dependency 'diff-lcs', '~> 1.1.2'
23   - gem.add_dependency 'json_pure', '~> 1.4.3'
24   -
25   - gem.add_development_dependency 'nokogiri', '~> 1.4.2'
26   - gem.add_development_dependency 'prawn', '= 0.8.4'
27   - gem.add_development_dependency 'prawn-layout', '= 0.8.4'
28   - gem.add_development_dependency 'rspec', '~> 2.0.0.beta.15'
29   - gem.add_development_dependency 'syntax', '~> 1.0.0'
30   - gem.add_development_dependency 'spork', '~> 0.8.4' unless Cucumber::JRUBY || Cucumber::WINDOWS
31   -
  22 + gem.add_bundler_dependencies
  23 +
32 24 extend Cucumber::Formatter::ANSIColor
33 25 gem.post_install_message = <<-POST_INSTALL_MESSAGE
34 26
22 cucumber.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
9 9
10 10 s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11 11 s.authors = ["Aslak Helles\303\270y"]
12   - s.date = %q{2010-08-03}
  12 + s.date = %q{2010-08-07}
13 13 s.default_executable = %q{cucumber}
14 14 s.description = %q{Behaviour Driven Development with elegance and joy}
15 15 s.email = %q{cukes@googlegroups.com}
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
24 24 ".gitignore",
25 25 ".rspec",
26 26 "Caliper.yml",
  27 + "Gemfile",
  28 + "Gemfile.lock",
27 29 "History.txt",
28 30 "LICENSE",
29 31 "README.rdoc",
@@ -718,39 +720,45 @@ for important information about this release. Happy cuking!
718 720
719 721 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
720 722 s.add_runtime_dependency(%q<gherkin>, ["~> 2.2.0"])
721   - s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0.4"])
  723 + s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0.5"])
722 724 s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
723 725 s.add_runtime_dependency(%q<diff-lcs>, ["~> 1.1.2"])
724 726 s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.3"])
  727 + s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
  728 + s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
725 729 s.add_development_dependency(%q<nokogiri>, ["~> 1.4.2"])
726 730 s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
727 731 s.add_development_dependency(%q<prawn-layout>, ["= 0.8.4"])
728   - s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.15"])
  732 + s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.19"])
729 733 s.add_development_dependency(%q<syntax>, ["~> 1.0.0"])
730 734 s.add_development_dependency(%q<spork>, ["~> 0.8.4"])
731 735 else
732 736 s.add_dependency(%q<gherkin>, ["~> 2.2.0"])
733   - s.add_dependency(%q<term-ansicolor>, ["~> 1.0.4"])
  737 + s.add_dependency(%q<term-ansicolor>, ["~> 1.0.5"])
734 738 s.add_dependency(%q<builder>, ["~> 2.1.2"])
735 739 s.add_dependency(%q<diff-lcs>, ["~> 1.1.2"])
736 740 s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
  741 + s.add_dependency(%q<rake>, ["~> 0.8.7"])
  742 + s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
737 743 s.add_dependency(%q<nokogiri>, ["~> 1.4.2"])
738 744 s.add_dependency(%q<prawn>, ["= 0.8.4"])
739 745 s.add_dependency(%q<prawn-layout>, ["= 0.8.4"])
740   - s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.15"])
  746 + s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.19"])
741 747 s.add_dependency(%q<syntax>, ["~> 1.0.0"])
742 748 s.add_dependency(%q<spork>, ["~> 0.8.4"])
743 749 end
744 750 else
745 751 s.add_dependency(%q<gherkin>, ["~> 2.2.0"])
746   - s.add_dependency(%q<term-ansicolor>, ["~> 1.0.4"])
  752 + s.add_dependency(%q<term-ansicolor>, ["~> 1.0.5"])
747 753 s.add_dependency(%q<builder>, ["~> 2.1.2"])
748 754 s.add_dependency(%q<diff-lcs>, ["~> 1.1.2"])
749 755 s.add_dependency(%q<json_pure>, ["~> 1.4.3"])
  756 + s.add_dependency(%q<rake>, ["~> 0.8.7"])
  757 + s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
750 758 s.add_dependency(%q<nokogiri>, ["~> 1.4.2"])
751 759 s.add_dependency(%q<prawn>, ["= 0.8.4"])
752 760 s.add_dependency(%q<prawn-layout>, ["= 0.8.4"])
753   - s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.15"])
  761 + s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.19"])
754 762 s.add_dependency(%q<syntax>, ["~> 1.0.0"])
755 763 s.add_dependency(%q<spork>, ["~> 0.8.4"])
756 764 end
9 features/support/env.rb
... ... @@ -1,10 +1,9 @@
1 1 require 'rubygems'
  2 +require 'bundler'
  3 +Bundler.setup
  4 +
2 5 require 'tempfile'
3   -begin
4   - require 'rspec/expectations'
5   -rescue LoadError
6   - require 'spec/expectations'
7   -end
  6 +require 'rspec/expectations'
8 7 require 'fileutils'
9 8 require 'forwardable'
10 9 require 'cucumber/formatter/unicode'
2  lib/cucumber/feature_file.rb
@@ -8,7 +8,7 @@ class FeatureFile
8 8 FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/ #:nodoc:
9 9 LANGUAGE_PATTERN = /language:\s*(.*)/ #:nodoc:
10 10
11   - # The +uri+ argument is the location of the source. It can ba a path
  11 + # The +uri+ argument is the location of the source. It can be a path
12 12 # or a path:line1:line2 etc. If +source+ is passed, +uri+ is ignored.
13 13 def initialize(uri, source=nil)
14 14 @source = source
4 lib/cucumber/language_support.rb
... ... @@ -1,5 +1,5 @@
1 1 module Cucumber
2   - # This module defines the API for programming panguage support in Cucumber.
  2 + # This module defines the API for programming language support in Cucumber.
3 3 # While Cucumber itself is written in Ruby, any programming language can
4 4 # be supported by implementing this API.
5 5 #
@@ -27,4 +27,4 @@ module Cucumber
27 27 #
28 28 module LanguageSupport
29 29 end
30   -end
  30 +end
6 lib/cucumber/rspec/doubles.rb
@@ -4,13 +4,13 @@
4 4 World(RSpec::Core::MockFrameworkAdapter)
5 5
6 6 Before do
7   - _setup_mocks
  7 + RSpec::Mocks::setup(self)
8 8 end
9 9
10 10 After do
11 11 begin
12   - _verify_mocks
  12 + RSpec::Mocks::verify
13 13 ensure
14   - _teardown_mocks
  14 + RSpec::Mocks::teardown
15 15 end
16 16 end
2  spec/spec_helper.rb
@@ -4,6 +4,8 @@
4 4 $:.unshift(File.dirname(__FILE__))
5 5
6 6 require 'rubygems'
  7 +require 'bundler'
  8 +Bundler.setup
7 9
8 10 begin
9 11 require 'rspec'

0 comments on commit 9e4abf5

Please sign in to comment.
Something went wrong with that request. Please try again.