ZOMG closer to passing cuke suite

Author: aslakhellesoy

Gemfile

@@ -1,6 +1,2 @@
-source "http://rubygems.org"
+source :rubygems
 gemspec
-
-gem 'cucumber', :path => '../cucumber' if File.directory?(File.dirname(__FILE__) + '/../cucumber')
-gem 'gherkin',  :path => '../gherkin'  if File.directory?(File.dirname(__FILE__) + '/../gherkin')
-gem 'aruba',    :path => '../aruba'    if File.directory?(File.dirname(__FILE__) + '/../aruba')

Rakefile

@@ -1,25 +1,6 @@
 # encoding: utf-8
 require 'rubygems'
-require 'bundler'
-Bundler.setup
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "cucumber-rails"
-    gemspec.summary = "Cucumber Generators and Runtime for Rails"
-    gemspec.description = "Cucumber Generators and Runtime for Rails"
-    gemspec.email = "[email protected]"
-    gemspec.homepage = "http://cukes.info"
-    gemspec.authors = ["Dennis Blöte", "Aslak Hellesøy", "Rob Holland"]
-    gemspec.homepage = "http://github.com/aslakhellesoy/cucumber-rails"
-
-    gemspec.add_bundler_dependencies
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler/setup'
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 Dir["#{File.dirname(__FILE__)}/dev_tasks/*.rake"].sort.each { |ext| load ext }

cucumber-rails.gemspec

@@ -1,20 +1,23 @@
 # -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'cucumber/rails/version'
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '0.3.3'
+  s.version     = Cucumber::Rails::VERSION
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
   s.description = "Cucumber Generators and Runtime for Rails"
   s.summary     = "cucumber-rails-#{s.version}"
   s.email       = '[email protected]'
   s.homepage    = "http://cukes.info"
 
-  s.platform    = Gem::Platform::RUBY
-
-  s.add_dependency('cucumber', '~> 0.9.0') unless File.directory?(File.expand_path(File.dirname(__FILE__) + '/../cucumber'))
-  s.add_dependency 'aruba', '~> 0.2.2' unless File.directory?(File.expand_path(File.dirname(__FILE__) + '/../aruba'))
-  s.add_development_dependency('rspec-rails', "~> 2.0.0.beta.22")
+  s.add_dependency('cucumber', '~> 0.9.4')
+  s.add_development_dependency('aruba', '~> 0.2.7')
+  s.add_development_dependency('rails', '~> 3.0.3')
+  s.add_development_dependency('sqlite3-ruby', '~> 1.3.2')
+  s.add_development_dependency('rspec-rails', Cucumber::Rails::DEPS['rspec-rails'])
+  s.add_development_dependency('capybara', Cucumber::Rails::DEPS['capybara'])
+  s.add_development_dependency('webrat', Cucumber::Rails::DEPS['webrat'])
 
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

features/rails3.feature

@@ -5,9 +5,7 @@ Feature: Rails 3
   of Rails 3 and Ruby, with Capybara, Spork and DatabaseCleaner
 
   Scenario: Install Cucumber-Rails
-    Given I'm using a clean gemset "cucumber-rails-3.0.0"
-    Given a Rails "3.0.0" project named "rails-3-app" with Cucumber-Rails generated with "--capybara --rspec"
-
+    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
     Then the following files should exist:
       | config/cucumber.yml                    |
       | script/cucumber                        |
@@ -19,14 +17,8 @@ Feature: Rails 3
     And the file "features/support/env.rb" should contain "require 'capybara/rails'"
 
   Scenario: Run Cucumber
-    Given a Rails "3.0.0" project named "rails-3-app" with Cucumber-Rails generated with "--capybara --rspec"
-    And I append to "Gemfile" with:
-      """
-      gem "cucumber", :path => '../../../../cucumber', :group => :test 
-      gem "gherkin", :path => '../../../../gherkin', :group => :test 
-
-      """
-    And I successfully run "bundle install"
+    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    When I successfully run "bundle install"
     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"
 

features/step_definitions/cucumber_rails_steps.rb

@@ -1,37 +1,13 @@
-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 3 app "([^"]*)" with cucumber\-rails support$/ do |app_name|
   steps %Q{
-    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:
-      """
-      source :gemcutter
-      gem 'rails', '3.0.0.rc'
-      gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.9'
-      """
     When I successfully run "rails new rails-3-app"
     Then it should pass with:
       """
       README
       """
     And I cd to "#{app_name}"
-    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
-    And I append to "Gemfile" with:
-      """
-      gem 'capybara', '0.3.9'
-      gem 'cucumber', :path => '../../../../cucumber'
-
-      """
-    And I successfully run "rails generate cucumber:install --capybara"
+    And I successfully run "rails generate cucumber:install"
     And I successfully run "bundle install"
-    And I successfully run "bundle lock"
     And I successfully run "rake db:migrate"
   }
 end

features/support/env.rb

@@ -1,8 +1,5 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'rubygems'
-require 'bundler'
-Bundler.setup
+require 'bundler/setup'
 require 'rspec/expectations'
-require 'aruba'
-require 'aruba/rails3'
-require 'aruba/rails2'
+require 'aruba/cucumber'

lib/cucumber/rails/version.rb

@@ -0,0 +1,14 @@
+module Cucumber
+  module Rails
+    VERSION = '0.4.0'
+    DEPS = {
+      'cucumber'     => '~> 0.9.4',
+      'rails'        => '~> 3.0.3',
+      'capybara'     => '~> 0.4.0',
+      'webrat'       => '~> 0.7.2',
+      'rspec-rails'  => '~> 2.2.0',
+      'sqlite3-ruby' => '~> 1.3.2',
+      'aruba'        => '~> 0.2.7'
+    }
+  end
+end

lib/generators/cucumber/feature/feature_generator.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'feature_base')
 
 module Cucumber
-  class FeatureGenerator < Rails::Generators::NamedBase
+  class FeatureGenerator < ::Rails::Generators::NamedBase
 
     include Cucumber::Generators::FeatureBase
 

lib/generators/cucumber/install/install_base.rb

@@ -1,15 +1,10 @@
 require 'rbconfig'
+#require 'cucumber/rails/version'
 
 module Cucumber
   module Generators
     module InstallBase
-
       DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
-      GEMS = {
-        'capybara' => '0.3.9',
-        'webrat' => '0.7.1',
-        'rspec-rails' => '2.0.0.beta.22'
-      }
 
       def install_cucumber_rails(m)
         check_upgrade_limitations
@@ -19,8 +14,12 @@ def install_cucumber_rails(m)
         create_feature_support(m)
         create_tasks(m)
         create_database(m) unless options[:skip_database]
-        add_gem(driver_from_options.to_s, GEMS[driver_from_options], :group => :test)
-        add_gem(framework_from_options.to_s, GEMS[framework_from_options], :group => :test)
+        
+        cucumber_rails_options = {:group => :test}
+        cucumber_rails_options[:path] = '../../..'
+        add_gem('cucumber-rails', Cucumber::Rails::VERSION, cucumber_rails_options)
+        add_gem(driver_from_options.to_s, Cucumber::Rails::DEPS[driver_from_options.to_s], :group => :test)
+        add_gem(framework_from_options.to_s, Cucumber::Rails::DEPS[framework_from_options.to_s], :group => :test)
       end
 
       # Checks and prints the limitations

lib/generators/cucumber/install/install_generator.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'install_base')
 
 module Cucumber
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < ::Rails::Generators::Base
     include Cucumber::Generators::InstallBase
 
     argument     :language,      :type => :string,  :banner => "LANG", :optional => true
@@ -43,13 +43,13 @@ def cucumber_rails_env
     def framework_from_options
       return 'rspec-rails' if options[:rspec]
       return 'testunit' if options[:testunit]
-      return nil
+      return 'rspec-rails'
     end
 
     def driver_from_options
       return 'webrat' if options[:webrat]
       return 'capybara' if options[:capybara]
-      return nil
+      return 'capybara'
     end
 
   end