cucumber-rails 0.3.1 → 0.3.2

data/HACKING.rdoc

@@ -12,7 +12,7 @@ The feature branch should contain a ticket number (if appliccable) and a descrip
 Before you change anything, you should make sure you can run all the Cucumber features for Cucumber-Rails. You need rvm.
 
   sudo gem install rvm
-  rvm install 1.8.7 1.9.1
+  rvm install ruby-1.8.7-p249 ruby-1.9.1-p378
 
 == Running all features
 

data/History.txt

@@ -1,4 +1,11 @@
-== 0.3.1
+== 0.3.2 2010-06-06
+
+== Changed features
+* web_steps.rb uses "([^"]*)" instead of "([^\"]*)" (Aslak Hellesøy)
+* Renamed cucumber:skeleton to cucumber:install (Rails 3 generator). (Aslak Hellesøy)
+* Upgraded to be compatible with rspec 2.0.0.beta.10 (#35 Gabor Ratky, Pete Yandell)
+
+== 0.3.1 2010-05-03
 
 This release has a lot of bugfixes! The test suite (based on Aruba) verifies that Cucumber-Rails
 now works with various combinations of: 
@@ -28,7 +35,7 @@ separate rerun profile, so all rerun.txt related issues should now be gone.
 * "Rspec is not missing constant Matchers!" error. (#27 David Chelimsky, Aslak Hellesøy)
 * @culerity tag breaks Rails 3 RESTful helpers (#17 Aslak Hellesøy)
 
-== 0.3.0
+== 0.3.0 2010-02-25
 
 This is a major release since we're now supporting both Rails 3 and RSpec 2. Older versions
 (Rails 2 and RSpec 1) are still supported.

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2008,2009,2010 Aslak Hellesøy and the Cucumber Team.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -26,11 +26,11 @@ Then install the gems by running:
 
 Learn about the various options:
 
-  ruby script/rails generate cucumber:skeleton --help
+  ruby script/rails generate cucumber:install --help
 
 Finally, bootstrap your Rails app, for example:
 
-  ruby script/rails generate cucumber:skeleton --rspec --capybara
+  ruby script/rails generate cucumber:install --rspec --capybara
 
 === Rails 2.x:
 

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gemspec.authors = ["Dennis Blöte", "Aslak Hellesøy", "Rob Holland"]
     gemspec.homepage = "http://github.com/aslakhellesoy/cucumber-rails"
 
-    gemspec.add_dependency 'cucumber', '>= 0.7.2'
+    gemspec.add_dependency 'cucumber', '>= 0.8.0'
     gemspec.add_development_dependency 'aruba', '>= 0.1.9'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/cucumber-rails.gemspec

@@ -5,20 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-rails}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dennis Bl\303\266te", "Aslak Helles\303\270y", "Rob Holland"]
-  s.date = %q{2010-05-04}
+  s.date = %q{2010-06-06}
   s.description = %q{Cucumber Generators and Runtime for Rails}
   s.email = %q{cukes@googlegroups.com}
   s.extra_rdoc_files = [
-    "README.rdoc"
+    "LICENSE",
+     "README.rdoc"
   ]
   s.files = [
     ".gitignore",
      "HACKING.rdoc",
      "History.txt",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -47,47 +49,46 @@ Gem::Specification.new do |s|
      "lib/generators/cucumber/feature/feature_base.rb",
      "lib/generators/cucumber/feature/feature_generator.rb",
      "lib/generators/cucumber/feature/named_arg.rb",
-     "lib/generators/cucumber/skeleton/USAGE",
-     "lib/generators/cucumber/skeleton/skeleton_base.rb",
-     "lib/generators/cucumber/skeleton/skeleton_generator.rb",
-     "rvm.yml",
+     "lib/generators/cucumber/install/USAGE",
+     "lib/generators/cucumber/install/install_base.rb",
+     "lib/generators/cucumber/install/install_generator.rb",
      "spec/cucumber/web/tableish_spec.rb",
-     "spec/generators/cucumber/skeleton/skeleton_base_spec.rb",
+     "spec/generators/cucumber/install/install_base_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "templates/feature/feature.erb",
      "templates/feature/steps.erb",
-     "templates/skeleton/config/cucumber.yml.erb",
-     "templates/skeleton/environments/cucumber.rb.erb",
-     "templates/skeleton/script/cucumber",
-     "templates/skeleton/step_definitions/capybara_steps.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_cs.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_da.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_de.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_es.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_ja.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_ko.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_no.rb.erb",
-     "templates/skeleton/step_definitions/web_steps_pt-BR.rb.erb",
-     "templates/skeleton/step_definitions/webrat_steps.rb.erb",
-     "templates/skeleton/support/_rails_each_run.rb.erb",
-     "templates/skeleton/support/_rails_prefork.rb.erb",
-     "templates/skeleton/support/capybara.rb",
-     "templates/skeleton/support/edit_warning.txt",
-     "templates/skeleton/support/paths.rb",
-     "templates/skeleton/support/rails.rb.erb",
-     "templates/skeleton/support/rails_spork.rb.erb",
-     "templates/skeleton/support/webrat.rb",
-     "templates/skeleton/tasks/cucumber.rake.erb"
+     "templates/install/config/cucumber.yml.erb",
+     "templates/install/environments/cucumber.rb.erb",
+     "templates/install/script/cucumber",
+     "templates/install/step_definitions/capybara_steps.rb.erb",
+     "templates/install/step_definitions/web_steps_cs.rb.erb",
+     "templates/install/step_definitions/web_steps_da.rb.erb",
+     "templates/install/step_definitions/web_steps_de.rb.erb",
+     "templates/install/step_definitions/web_steps_es.rb.erb",
+     "templates/install/step_definitions/web_steps_ja.rb.erb",
+     "templates/install/step_definitions/web_steps_ko.rb.erb",
+     "templates/install/step_definitions/web_steps_no.rb.erb",
+     "templates/install/step_definitions/web_steps_pt-BR.rb.erb",
+     "templates/install/step_definitions/webrat_steps.rb.erb",
+     "templates/install/support/_rails_each_run.rb.erb",
+     "templates/install/support/_rails_prefork.rb.erb",
+     "templates/install/support/capybara.rb",
+     "templates/install/support/edit_warning.txt",
+     "templates/install/support/paths.rb",
+     "templates/install/support/rails.rb.erb",
+     "templates/install/support/rails_spork.rb.erb",
+     "templates/install/support/webrat.rb",
+     "templates/install/tasks/cucumber.rake.erb"
   ]
   s.homepage = %q{http://github.com/aslakhellesoy/cucumber-rails}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Cucumber Generators and Runtime for Rails}
   s.test_files = [
     "spec/cucumber/web/tableish_spec.rb",
-     "spec/generators/cucumber/skeleton/skeleton_base_spec.rb",
+     "spec/generators/cucumber/install/install_base_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -95,15 +96,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cucumber>, [">= 0.7.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.8.0"])
       s.add_development_dependency(%q<aruba>, [">= 0.1.9"])
     else
-      s.add_dependency(%q<cucumber>, [">= 0.7.2"])
+      s.add_dependency(%q<cucumber>, [">= 0.8.0"])
       s.add_dependency(%q<aruba>, [">= 0.1.9"])
     end
   else
-    s.add_dependency(%q<cucumber>, [">= 0.7.2"])
+    s.add_dependency(%q<cucumber>, [">= 0.8.0"])
     s.add_dependency(%q<aruba>, [">= 0.1.9"])
   end
 end

data/features/rails2.feature

@@ -3,97 +3,62 @@ Feature: Rails 2
   Cucumber-Rails should work on major versions
   of Rails2 and Ruby, with Capybara, Webrat, Spork and DatabaseCleaner
 
-  Scenario Outline: Install Cucumber-Rails
-    Given I am using rvm "1.8.7"
-    And I am using rvm gemset "cucumber-rails-2.3.5" with Gemfile:
+  @announce @puts
+  Scenario Outline: Run Cucumber
+    Given I am using rvm "<ruby_version>"
+    And I am using rvm gemset "cucumber-rails-<rails_version>" with Gemfile:
       """
-      gem 'rails', '2.3.5'
+      source :gemcutter
+      gem 'rails', '<rails_version>'
       gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.7'
-      gem 'webrat', '0.7.0'
+      gem 'capybara', '0.3.8'
+      gem 'webrat', '0.7.1'
       gem 'rspec-rails', '1.3.2'
-      gem 'cucumber', '0.7.2'
+      #gem 'cucumber', '0.8.0'
+      gem 'cucumber', :path => '../../../cucumber'
+      gem 'database_cleaner', '0.5.2'
+      gem 'culerity', '0.2.10'
+      gem 'celerity', '0.7.9'
       """
-    When I successfully run "rails rails-2-app"
+    And I successfully run "rails rails-2-app"
+    And I cd to "rails-2-app"
+    And I symlink "../../../../cucumber" to "vendor/plugins/cucumber"
+    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
+    And I successfully run "ruby script/generate cucumber --capybara"
+    And I successfully run "ruby script/generate feature post title:string body:text published:boolean <feature_args>"
+    And I successfully run "ruby script/generate scaffold post title:string body:text published:boolean"
+    And I successfully run "ruby script/generate scaffold cukes name:string"
+    And I write to "app/controllers/cukes_controller.rb" with:
+      """
+      class CukesController < ApplicationController
+        def index
+          redirect_to cuke_path(10, :params => {:name => 'cucumber', :what => 'vegetable'})
+        end
+
+        def show
+          render :text => "Cuke #{params[:id]}"
+        end
+      end
+      """
+    And I write to "features/tests.feature" with:
+      """
+      Feature: Tests
+        Scenario: Tests
+          When I go to the cukes page
+          Then I should have the following query string: 
+            |name|cucumber|
+            |what|vegetable|
+          And I should see "Cuke 10"
+      """
+    And I successfully run "rake db:migrate"
+    When I successfully run "rake cucumber"
     Then it should pass with:
       """
-      create  README
+      3 scenarios (3 passed)
+      14 steps (14 passed)
       """
-    And I cd to "rails-2-app"
-    And I symlink this repo to "vendor/plugins/cucumber-rails"
-    When I successfully run "ruby script/generate cucumber <args>"
-    Then the following files should exist:
-      | config/cucumber.yml                    |
-      | config/environments/cucumber.rb        |
-      | script/cucumber                        |
-      | features/step_definitions/web_steps.rb |
-      | features/support/env.rb                |
-      | features/support/paths.rb              |
-      | lib/tasks/cucumber.rake                |
-    And the file "features/support/env.rb" should contain "<env_rb_1>"
-    And the file "features/support/env.rb" should contain "<env_rb_2>"
-    And the file "config/environments/cucumber.rb" should contain "<cucumber_rb_1>"
-    And the file "config/environments/cucumber.rb" should contain "<cucumber_rb_2>"
-    And the file "config/database.yml" should contain "cucumber:"
 
     Examples:
-      | args                  | env_rb_1                       | env_rb_2                 | cucumber_rb_1         | cucumber_rb_2                 |
-      | --webrat --rspec      | require 'cucumber/rails/rspec' | require 'webrat'         | config.gem 'webrat'   | config.gem 'rspec-rails'      |
-      | --capybara --testunit | require 'cucumber/rails/world' | require 'capybara/rails' | config.gem 'capybara' | config.gem 'database_cleaner' |
-
-    @announce-cmd
-    Scenario Outline: Run Cucumber
-      Given I am using rvm "<ruby_version>"
-      And I am using rvm gemset "cucumber-rails-2.3.5" with Gemfile:
-        """
-        gem 'rails', '2.3.5'
-        gem 'sqlite3-ruby', '1.2.5'
-        gem 'capybara', '0.3.7'
-        gem 'webrat', '0.7.0'
-        gem 'rspec-rails', '1.3.2'
-        gem 'cucumber', '0.7.2'
-        gem 'database_cleaner', '0.5.2'
-        gem 'culerity', '0.2.10'
-        gem 'celerity', '0.7.9'
-        """
-      And I successfully run "rails rails-2-app"
-      And I cd to "rails-2-app"
-      And I symlink this repo to "vendor/plugins/cucumber-rails"
-      And I successfully run "ruby script/generate cucumber --capybara"
-      And I successfully run "ruby script/generate feature post title:string body:text published:boolean <feature_args>"
-      And I successfully run "ruby script/generate scaffold post title:string body:text published:boolean"
-      And I successfully run "ruby script/generate scaffold cukes name:string"
-      And I write to "app/controllers/cukes_controller.rb" with:
-        """
-        class CukesController < ApplicationController
-          def index
-            redirect_to cuke_path(10, :params => {:name => 'cucumber', :what => 'vegetable'})
-          end
-
-          def show
-            render :text => "Cuke #{params[:id]}"
-          end
-        end
-        """
-      And I write to "features/tests.feature" with:
-        """
-        Feature: Tests
-          Scenario: Tests
-            When I go to the cukes page
-            Then I should have the following query string: 
-              |name|cucumber|
-              |what|vegetable|
-            And I should see "Cuke 10"
-        """
-      And I successfully run "rake db:migrate"
-      When I successfully run "rake cucumber"
-      Then it should pass with:
-        """
-        3 scenarios (3 passed)
-        14 steps (14 passed)
-        """
-
-      Examples:
-        | generator_args      | feature_args        | ruby_version |
-        | --webrat --testunit |                     | 1.8.6        |
-        | --capybara --rspec  | --capybara culerity | 1.8.7        |
+      | generator_args      | feature_args        | ruby_version | rails_version |
+      | --webrat --testunit |                     | 1.8.6        | 2.3.5         |
+      | --capybara --rspec  | --capybara culerity | 1.8.7        | 2.3.8         |

data/features/rails3.feature

@@ -1,16 +1,18 @@
 @announce-cmd
+@announce @puts
 Feature: Rails 3
   In order to take over the world
   Cucumber-Rails should work on major versions
   of Rails2 and Ruby, with Capybara, Spork and DatabaseCleaner
 
   Scenario: Install Cucumber-Rails
-    Given I am using rvm "1.8.7"
+    Given I am using rvm "ruby-1.8.7-p249"
     And I am using rvm gemset "cucumber-rails-3.0.0.beta" with Gemfile:
       """
+      source :gemcutter
       gem 'rails', '3.0.0.beta'
       gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.7'
+      gem 'capybara', '0.3.8'
       """
     When I successfully run "rails rails-3-app"
     Then it should pass with:
@@ -18,8 +20,8 @@ Feature: Rails 3
       README
       """
     And I cd to "rails-3-app"
-    And I symlink this repo to "vendor/plugins/cucumber-rails"
-    When I successfully run "rails generate cucumber:skeleton --capybara"
+    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
+    When I successfully run "rails generate cucumber:install --capybara"
     Then the following files should exist:
       | config/cucumber.yml                    |
       | script/cucumber                        |
@@ -32,28 +34,30 @@ Feature: Rails 3
 
   Scenario Outline: Run Cucumber
     Given I am using rvm "<ruby_version>"
-    And I am using rvm gemset "cucumber-rails-3.0.0.beta" with Gemfile:
+    And I am using rvm gemset "cucumber-rails-3.0.0.beta-gemset-<gemset>" with Gemfile:
       """
       source :gemcutter
-
       gem 'rails', '3.0.0.beta'
       gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.7'
+      gem 'capybara', '0.3.8'
+      gem 'gherkin', '1.0.30'
+      gem 'term-ansicolor', '1.0.4'
+      gem 'diff-lcs', '1.1.2'
       gem 'rspec-rails', '<rspec_version>'
       """
     And I successfully run "rails rails-3-app"
     And I cd to "rails-3-app"
-    And I symlink this repo to "vendor/plugins/cucumber-rails"
-    And I successfully run "rails generate cucumber:skeleton --capybara"
-    And I successfully run "rails generate cucumber:feature post title:string body:text published:boolean"
-    And I successfully run "rails generate scaffold post title:string body:text published:boolean"
-    And I successfully run "rails generate scaffold cukes name:string"
+    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
     And I append to "Gemfile" with:
       """
-      gem 'capybara', '0.3.7'
-      gem 'cucumber', '0.7.2'
+      gem 'capybara', '0.3.8'
+      gem 'cucumber', :path => '../../../../cucumber'
 
       """
+    And I successfully run "rails generate cucumber:install --capybara"
+    And I successfully run "rails generate cucumber:feature post title:string body:text published:boolean"
+    And I successfully run "rails generate scaffold post title:string body:text published:boolean"
+    And I successfully run "rails generate scaffold cukes name:string"
     And I write to "app/controllers/cukes_controller.rb" with:
       """
       class CukesController < ApplicationController
@@ -78,7 +82,7 @@ Feature: Rails 3
             |action|index|
           And I should see "Cuke 10"
       """
-    And I successfully run "bundle install"
+    And I successfully run "bundle lock"
     And I successfully run "rake db:migrate"
     And I successfully run "rake cucumber"
     Then it should pass with:
@@ -88,6 +92,6 @@ Feature: Rails 3
        """
     
     Examples:
-      | ruby_version | rspec_version |
-      | 1.8.7        | 1.3.2         |
-      | 1.9.1        | 2.0.0.beta.8  |
+      | ruby_version    | rspec_version | gemset |
+      | ruby-1.8.7-p249 | 1.3.2         | 1      |
+      | ruby-1.9.1-p378 | 2.0.0.beta.10 | 2      |

data/features/rerun_profile.feature

@@ -1,10 +1,11 @@
+@announce
 Feature: Rerun profile
   In order to concentrate on failing features
   As a Rails developer working with Cucumber
   I want to rerun only failing features
 
   Scenario: Rerun
-    Given I have created a new Rails 2 app "rails-2-app" with cucumber-rails support
+    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
     And a file named "rerun.txt" with:
       """
       features/rerun_test.feature:2
@@ -28,7 +29,7 @@ Feature: Rerun profile
         puts "I've always been passing"
       end
       """
-    When I successfully run "rake cucumber:rerun"
+    When I successfully run "ruby script/cucumber -p rerun"
     Then it should pass with:
       """
       1 scenario (1 passed)

data/features/step_definitions/cucumber_rails_steps.rb

@@ -1,30 +1,35 @@
-Given /^I symlink this repo to "([^\"]*)"$/ do |target|
-  source = File.expand_path('../../..', __FILE__)
+Given /^I symlink "([^"]*)" to "([^"]*)"$/ do |source, target|
+  source = File.expand_path(source, __FILE__)
   in_current_dir do
     target = File.expand_path(target)
     FileUtils.ln_s(source, target)
   end
 end
 
-Given /^I have created a new Rails 2 app "([^\"]*)" with cucumber\-rails support$/ do |app_name|
+Given /^I have created a new Rails 3 app "([^"]*)" with cucumber\-rails support$/ do |app_name|
   steps %Q{
-    Given I am using rvm "1.8.7"
-    And I am using rvm gemset "cucumber-rails-2.3.5" with Gemfile:
+    Given I am using rvm "ruby-1.8.7-p249"
+    And I am using rvm gemset "cucumber-rails-3.0.0.beta-gemset-1" with Gemfile:
       """
-      gem 'rails', '2.3.5'
+      gem 'rails', '3.0.0.beta'
       gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.6'
-      gem 'webrat'
-      gem 'rspec-rails'
-      gem 'cucumber'
-      gem 'database_cleaner'
-      gem 'culerity'
-      gem 'celerity'
+      gem 'capybara', '0.3.8'
+      """
+    When I successfully run "rails rails-3-app"
+    Then it should pass with:
+      """
+      README
       """
-    And I successfully run "rails #{app_name}"
     And I cd to "#{app_name}"
-    And I symlink this repo to "vendor/plugins/cucumber-rails"
-    And I successfully run "ruby script/generate cucumber --capybara"
+    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
+    And I append to "Gemfile" with:
+      """
+      gem 'capybara', '0.3.8'
+      gem 'cucumber', :path => '../../../../cucumber'
+
+      """
+    And I successfully run "rails generate cucumber:install --capybara"
+    And I successfully run "bundle lock"
     And I successfully run "rake db:migrate"
   }
 end

data/features/support/env.rb

@@ -1,4 +1,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'rubygems'
-require 'spec'
+require 'rspec/expectations'
 require 'aruba'

data/features/support/matchers/files.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define :have_files do |expected_files|
+RSpec::Matchers.define :have_files do |expected_files|
   match do |rails_app|
     actual_files = rails_app.files
     @missing_files = expected_files - actual_files
@@ -10,7 +10,7 @@ Spec::Matchers.define :have_files do |expected_files|
   end
 end
 
-Spec::Matchers.define :have_contents do |contents|
+RSpec::Matchers.define :have_contents do |contents|
   match do |file|
     file.read.include?(contents)
   end

data/generators/cucumber/USAGE

@@ -4,8 +4,7 @@ Description:
     
     This also generates the necessary files in the features directory.
     
-    Also see the feature generator, which you can use to generate skeletons
-    for new features.
+    Also see the feature generator
     
 Examples:
     `./script/generate cucumber`

data/generators/cucumber/cucumber_generator.rb

@@ -1,11 +1,10 @@
 require 'rbconfig'
-require 'cucumber/platform'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../lib/generators/cucumber/skeleton/skeleton_base'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../lib/generators/cucumber/install/install_base'))
 
 # This generator bootstraps a Rails project for use with Cucumber
 class CucumberGenerator < Rails::Generator::Base
 
-  include Cucumber::Generators::SkeletonBase
+  include Cucumber::Generators::InstallBase
 
   attr_accessor :driver
   attr_accessor :framework
@@ -45,7 +44,7 @@ class CucumberGenerator < Rails::Generator::Base
   end
 
   def self.source_root
-    File.join(gem_root, 'templates', 'skeleton')
+    File.join(gem_root, 'templates', 'install')
   end
 
   def source_root

data/lib/cucumber/rails/rspec.rb

@@ -1,3 +1,4 @@
+# TODO: Not even sure is this is necessary anymore, since we're doing this in Cucumber's rb_world.rb...
 require 'cucumber/rails/world'
 
 begin
@@ -5,7 +6,7 @@ begin
 
   [Cucumber::Rails::World, ActionController::Integration::Session].each do |klass|
     klass.class_eval do
-      include Rspec::Matchers
+      include RSpec::Matchers
     end
   end
 rescue LoadError => try_rspec_1

data/lib/generators/cucumber/install/USAGE

@@ -0,0 +1,15 @@
+Description:
+    Sets up Cucumber in your Rails project. After running this generator you will
+    get a new rake task called features.
+    
+    This also generates the necessary files in the features directory.
+    
+    Also see the cucumber:feature generator.
+    
+Examples:
+    `script/rails generate cucumber:install`
+
+    `script/rails generate cucumber:install --help`
+
+    You can also provide a language argument for localized webrat_steps:
+    `script/rails generate cucumber:install de`

data/lib/generators/cucumber/{skeleton/skeleton_base.rb → install/install_base.rb}

@@ -1,6 +1,6 @@
 module Cucumber
   module Generators
-    module SkeletonBase
+    module InstallBase
 
       DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
 

data/lib/generators/cucumber/{skeleton/skeleton_generator.rb → install/install_generator.rb}

@@ -1,9 +1,9 @@
-require File.join(File.dirname(__FILE__), 'skeleton_base')
+require File.join(File.dirname(__FILE__), 'install_base')
 
 module Cucumber
-  class SkeletonGenerator < Rails::Generators::Base
+  class InstallGenerator < Rails::Generators::Base
 
-    include Cucumber::Generators::SkeletonBase
+    include Cucumber::Generators::InstallBase
 
     DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
 
@@ -39,7 +39,7 @@ module Cucumber
     end
   
     def self.source_root
-      File.join(gem_root, 'templates/skeleton')
+      File.join(gem_root, 'templates/install')
     end
 
     def cucumber_rails_env