diesel 0.1.4 → 0.1.5

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "3.0.9" do
+  gem "rails", "3.0.9"
+end
+
+appraise "3.1.0.rc4" do
+  gem "rails", "3.1.0.rc4"
+  gem 'sass'
+  gem 'coffee-script'
+  gem 'uglifier'
+  gem 'jquery-rails'
+end

data/Gemfile

@@ -1,9 +1,4 @@
 source "http://rubygems.org"
-gem "cucumber"
-gem "aruba"
-gem "rake"
-gem "rspec-rails", :require => false
-gem "rails", ">= 3.0.3", :require => false
-gem "thin"
-gem "sqlite3-ruby", :require => false
-
+gemspec
+gem "rails", "3.0.9"
+gem "database_cleaner", :require => false

data/Gemfile.lock

@@ -1,113 +1,153 @@
+PATH
+  remote: .
+  specs:
+    diesel (0.1.4)
+      railties
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    aruba (0.2.7)
-      background_process
-      cucumber (~> 0.10.0)
-    background_process (1.2)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    appraisal (0.3.5)
+      aruba (~> 0.3.6)
+      bundler
+      rake
+    arel (2.0.10)
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
     builder (2.1.2)
-    cucumber (0.10.0)
+    capybara (1.0.0.rc1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (0.10.6)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    daemons (1.1.0)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (0.5.2)
+      capybara (>= 1.0.0.rc1)
+      cucumber (>= 0.10.5)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
+    daemons (1.1.3)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
-    gherkin (2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+    ffi (1.0.9)
+    gherkin (2.4.0)
+      json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.4.6)
-    mail (2.2.12)
+    json (1.5.1)
+    json_pure (1.5.1)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rake (0.9.2)
+    rdoc (3.7)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
-    sqlite3-ruby (1.3.2)
+      rspec (~> 2.6.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.2.1)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.5)
-    thin (1.2.7)
+    thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.29)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cucumber
-  rails (>= 3.0.3)
-  rake
-  rspec-rails
+  appraisal
+  cucumber-rails (~> 0.5.1)
+  database_cleaner
+  diesel!
+  rails (= 3.0.9)
+  rspec-rails (~> 2.6.1)
   sqlite3-ruby
   thin

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2011 thoughtbot, inc.
+
+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.md

@@ -0,0 +1,47 @@
+Diesel
+======
+
+Diesel gives your Rails engines power.
+
+It makes it easier to have your Engine provide generators like:
+
+* An "install" generator like "rails g clearance:install"
+* A "features" generator like "rails g clearance:features"
+* A "views" generator like "rails g clearance:views"
+
+It makes it easier to test your Engine with Cucumber stories like:
+
+    Scenario: generate a Rails app, run the generates, and run the tests
+      When I successfully run `bundle exec rails new testapp`
+      And I cd to "testapp"
+      And I add the "cucumber-rails" gem
+      And I add the "capybara" gem
+      And I add the "rspec-rails" gem
+      And I add the "database_cleaner" gem
+      And I add the "diesel" gem
+      And I add the "myengine" gem from this project
+      And I reset the Bundler environment variable
+      And I run `bundle install --local`
+      And I successfully run `bundle exec rails generate cucumber:install`
+      And I successfully run `bundle exec rails generate myengine:install`
+      And I successfully run `bundle exec rails generate myengine:features`
+      And I successfully run `bundle exec rake db:migrate --trace`
+      And I successfully run `bundle exec rake --trace`
+      Then the output should contain "1 scenario (1 passed)"
+      And the output should not contain "Could not find generator"
+
+Credits
+-------
+
+![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+
+Diesel is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+
+Thank you to all [the contributors](https://github.com/thoughtbot/diesel/contributors)!
+
+The names and logos for thoughtbot are trademarks of thoughtbot, inc.
+
+License
+-------
+
+Diesel is Copyright © 2011 thoughtbot. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/Rakefile

@@ -3,9 +3,15 @@ require 'bundler/setup'
 require 'rake'
 require 'rake/gempackagetask'
 require 'cucumber/rake/task'
+require 'appraisal'
 
-desc 'Default: run all tests'
-task :default => [:cucumber]
+desc 'Default: run cucumber features'
+task :default => [:all]
+
+desc 'Test the plugin under all supported Rails versions.'
+task :all => ["appraisal:cleanup", "appraisal:install"] do |t|
+  exec('rake appraisal cucumber')
+end
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true

data/features/application_bootstrap.feature

@@ -1,4 +1,3 @@
-@disable-bundler
 Feature: test a diesel engine using the bootstrapped application
 
   Background:
@@ -6,8 +5,8 @@ Feature: test a diesel engine using the bootstrapped application
     When I cd to "testengine"
     And I write to "Gemfile" with:
     """
-    gem "rspec-rails", "~> 2.3.0"
-    gem "rails", "~> 3.0.3"
+    gem "rspec-rails", "~> 2.6.0"
+    gem "rails"
     gem "sqlite3-ruby"
     """
     When I add this library as a dependency
@@ -23,6 +22,8 @@ Feature: test a diesel engine using the bootstrapped application
       match "/hello", :to => 'example#hello'
     end
     """
+    When I reset Bundler environment variable
+    And I run `bundle install --local`
 
   Scenario: use root_url
     When I write to "spec/controllers/example_controller_spec.rb" with:
@@ -43,7 +44,7 @@ Feature: test a diesel engine using the bootstrapped application
       end
     end
     """
-    When I run "bundle exec rspec --format documentation spec"
+    When I run `bundle exec rspec --format documentation spec`
     Then it should pass with:
     """
     0 failures
@@ -69,7 +70,7 @@ Feature: test a diesel engine using the bootstrapped application
       end
     end
     """
-    When I run "bundle exec rspec --format documentation spec"
+    When I run `bundle exec rspec --format documentation spec`
     Then it should pass with:
     """
     0 failures
@@ -99,7 +100,7 @@ Feature: test a diesel engine using the bootstrapped application
     """
     hello
     """
-    When I run "bundle exec rspec --format documentation spec"
+    When I run `bundle exec rspec --format documentation spec`
     Then it should pass with:
     """
     0 failures

data/features/cucumber_testing.feature

@@ -1,26 +1,18 @@
-@disable-bundler
 Feature: test a diesel engine using cucumber
 
-  Scenario: create a disel engine and test using cucumber
+  Background:
     Given a directory named "testengine"
     When I cd to "testengine"
     And I write to "Gemfile" with:
     """
-    gem "cucumber-rails", "~> 0.3.2"
-    gem "capybara", "~> 0.4.0"
-    gem "rails", "~> 3.0.3"
-    gem "rspec", "~> 1.3.0"
+    gem "cucumber-rails"
+    gem "rails"
+    gem "rspec"
     gem "sqlite3-ruby"
+    gem "formtastic", "~> 1.2.3"
     """
     When I add this library as a dependency
-    When I write to "features/hello.feature" with:
-    """
-    Feature: say hello
-      Scenario: go to the hello page
-        When I go to /hello
-        Then I should see "hello!"
-    """
-    When I write to "features/step_definitions/hello_steps.rb" with:
+    And I write to "features/step_definitions/hello_steps.rb" with:
     """
     When /^I go to (\/.+)$/ do |path|
       visit path
@@ -38,6 +30,24 @@ Feature: test a diesel engine using cucumber
     require 'capybara/cucumber'
     require 'capybara/session'
     """
+    When I write to "config/routes.rb" with:
+    """
+    Rails.application.routes.draw do
+      match "/hello", :to => 'example#hello'
+    end
+    """
+    When I reset Bundler environment variable
+    And I run `bundle install --local`
+
+  @slow
+  Scenario: create a diesel engine and test using cucumber
+    When I write to "features/hello.feature" with:
+    """
+    Feature: say hello
+      Scenario: go to the hello page
+        When I go to /hello
+        Then I should see "hello!"
+    """
     When I write to "app/controllers/example_controller.rb" with:
     """
     class ExampleController < ActionController::Base
@@ -48,17 +58,33 @@ Feature: test a diesel engine using cucumber
     """
     When I write to "app/views/example/hello.html.erb" with:
     """
+    <%= semantic_form_for :nothing do |form| -%>
     hello!
+    <% end -%>
     """
-    When I write to "config/routes.rb" with:
+    When I run `bundle exec cucumber features/hello.feature`
+    Then it should pass with:
     """
-    Rails.application.routes.draw do
-      match "/hello", :to => 'example#hello'
+    1 scenario (1 passed)
+    """
+
+  Scenario: create a diesel engine that redirects to the root url
+    When I write to "features/hello.feature" with:
+    """
+    Feature: say hello
+      Scenario: redirect from the hello page
+        Then I go to /hello
+    """
+    When I write to "app/controllers/example_controller.rb" with:
+    """
+    class ExampleController < ActionController::Base
+      def hello
+        redirect_to root_url
+      end
     end
     """
-    When I run "bundle exec cucumber features/hello.feature"
+    When I run `bundle exec cucumber features/hello.feature`
     Then it should pass with:
     """
     1 scenario (1 passed)
     """
-

data/features/features_generator.feature

@@ -1,4 +1,3 @@
-@disable-bundler
 Feature: reusable features generator
 
   Background:
@@ -65,29 +64,31 @@ Feature: reusable features generator
     end
     """
     When I cd to ".."
-    And I successfully run "rails new testapp"
+    And I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I append to "Gemfile" with:
     """
-    gem "cucumber-rails", "~> 0.3.2"
-    gem "capybara", "~> 0.4.0"
-    gem "rspec", "~> 1.3.0"
+    gem "cucumber-rails", ">= 0.5.1"
+    gem "capybara", ">= 1.0.0.beta1"
+    gem "rspec"
+    gem "database_cleaner", :group => :test
 
     """
     When I add the "testengine" as a diesel engine
-    And I run "bundle install --local"
-    And I successfully run "rails generate cucumber:install --trace"
-    And I successfully run "rails generate testengine:features --trace"
+    And I reset Bundler environment variable
+    And I run `bundle install --local`
+    And I successfully run `bundle exec rails generate cucumber:install --trace`
+    And I successfully run `bundle exec rails generate testengine:features --trace`
 
   Scenario: copy features into an app from a diesel engine
-    When I run "bundle exec cucumber -r features features/testengine/examples.feature"
+    When I run `bundle exec cucumber -r features features/testengine/examples.feature`
     Then it should pass with:
     """
     1 scenario (1 passed)
     """
 
   Scenario: view generator descriptions from an app with a diesel engine
-    When I successfully run "rails generate testengine:features -h"
+    When I successfully run `bundle exec rails generate testengine:features -h`
     Then the output should contain:
     """
     Copy cucumber feature files for the engine into your application.

data/features/install_generator.feature

@@ -1,4 +1,4 @@
-@disable-bundler
+@slow
 Feature: reusable install generator
 
   Background:
@@ -74,20 +74,22 @@ Feature: reusable install generator
     <% end -%>
     """
     When I cd to ".."
-    And I successfully run "rails new testapp"
+    And I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I append to "Gemfile" with:
     """
-    gem "cucumber-rails", "~> 0.3.2"
-    gem "capybara", "~> 0.4.0"
-    gem "rspec", "~> 1.3.0"
+    gem "cucumber-rails"
+    gem "capybara"
+    gem "rspec"
+    gem "database_cleaner"
 
     """
     When I add the "testengine" as a diesel engine
-    And I run "bundle install --local"
-    And I successfully run "rails generate cucumber:install --trace"
-    And I successfully run "rails generate testengine:install --trace"
-    And I successfully run "rake db:migrate db:schema:dump db:test:prepare --trace"
+    And I reset Bundler environment variable
+    And I run `bundle install --local`
+    And I successfully run `bundle exec rails generate cucumber:install --trace`
+    And I successfully run `bundle exec rails generate testengine:install --trace`
+    And I successfully run `bundle exec rake db:migrate db:schema:dump db:test:prepare --trace`
 
   Scenario: test a generated app with a diesel engine
     When I write to "features/examples.feature" with:
@@ -97,16 +99,20 @@ Feature: reusable install generator
         When I go to the examples page
         Then I should see "Hello there"
     """
-    When I run "bundle exec cucumber features/examples.feature"
+    When I run `bundle exec cucumber features/examples.feature`
     Then it should pass with:
     """
     1 scenario (1 passed)
     """
 
   Scenario: view generator descriptions from an app with a diesel engine
-    When I successfully run "rails generate testengine:install -h"
+    When I successfully run `bundle exec rails generate testengine:install -h`
     Then the output should contain:
     """
     Generate configuration, migration, and other essential files.
     """
 
+  Scenario: run the install generator twice
+    When I successfully run `bundle exec rails generate testengine:install --trace`
+    Then the output should not contain "Another migration is already named"
+

data/features/integration_testing.feature

@@ -1,6 +1,5 @@
-@disable-bundler
 Feature: integration testing
-
+  @slow
   Scenario: test integration of a diesel engine with a generated application
     Given a directory named "testengine"
     When I cd to "testengine"
@@ -16,9 +15,10 @@ Feature: integration testing
     """
     When I write to "Gemfile" with:
     """
+    gem "rails"
     gem "cucumber"
     gem "aruba"
-    gem "rspec", "~> 1.3.0"
+    gem "rspec"
     """
     When I add this library as a dependency
     And I write to "db/migrate/create_examples.rb" with:
@@ -103,28 +103,33 @@ Feature: integration testing
     """
     When I write to "features/integration.feature" with:
     """
-    @disable-bundler @puts @announce
+    @puts @announce
     Feature: integrate with application
       Scenario: generate a Rails app, run the generates, and run the tests
-        When I successfully run "rails new testapp"
+        When I successfully run `bundle exec rails new testapp`
         And I cd to "testapp"
         And I add the "cucumber-rails" gem
         And I add the "capybara" gem
         And I add the "rspec-rails" gem
+        And I add the "database_cleaner" gem
         And I add the "testengine" gem from this project
         And I add the "diesel" gem from the diesel project
-        And I run "bundle install --local"
-        And I successfully run "rails generate cucumber:install"
-        And I successfully run "rails generate testengine:install"
-        And I successfully run "rails generate testengine:features"
-        And I successfully run "rake db:migrate --trace"
-        And I successfully run "rake --trace"
+        And I reset the Bundler environment variable
+        And I run `bundle install --local`
+        And I successfully run `bundle exec rails generate cucumber:install`
+        And I successfully run `bundle exec rails generate testengine:install`
+        And I successfully run `bundle exec rails generate testengine:features`
+        And I successfully run `bundle exec rake db:migrate --trace`
+        And I successfully run `bundle exec rake --trace`
         Then the output should contain "1 scenario (1 passed)"
         And the output should not contain "Could not find generator"
     """
     When I write to "features/support/env.rb" with:
     """
     require "diesel/testing/integration"
+    Before do
+      @aruba_timeout_seconds = 120
+    end
     """
     When I write to "features/step_definitions/dependency_steps.rb" with:
     """
@@ -132,9 +137,16 @@ Feature: integration testing
     When /^I add the "([^"]*)" gem from the diesel project$/ do |gem_name|
       append_to_file('Gemfile', %{\ngem "#{gem_name}", :path => "../../../../../.."\n})
     end
+
+    When /^I reset the Bundler environment variable$/ do
+      %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE).each do |key|
+        ENV[key] = nil
+      end
+    end
     """
-    When I run "bundle install --local"
-    And I run "bundle exec cucumber features/integration.feature"
+    When I reset Bundler environment variable
+    When I run `bundle install --local`
+    And I successfully run `bundle exec cucumber features/integration.feature`
     Then it should pass with:
     """
     1 scenario (1 passed)

data/features/rails_rake_tasks_and_generators.feature

@@ -1,7 +1,6 @@
-@disable-bundler
 Feature: use Rails rake tasks when developing a diesel application
 
-  Scenario: create a disel engine and use Rails rake tasks
+  Scenario: create a diesel engine and use Rails rake tasks
     Given a directory named "testengine"
     When I cd to "testengine"
     And I write to "Gemfile" with:
@@ -11,14 +10,14 @@ Feature: use Rails rake tasks when developing a diesel application
     gem "sqlite3-ruby"
     """
     When I add this library as a dependency
-    And I run "bundle install --local"
+    And I run `bundle install --local`
     And I write to "Rakefile" with:
     """
     require 'rubygems'
     require 'bundler/setup'
     require 'diesel/tasks'
     """
-    When I successfully run "bundle exec diesel generate model post title:string"
+    When I successfully run `bundle exec diesel generate model post title:string`
     And I write to "spec/models/post_spec.rb" with:
     """
     ENV["RAILS_ENV"] ||= 'test'
@@ -36,8 +35,8 @@ Feature: use Rails rake tasks when developing a diesel application
     class Post < ActiveRecord::Base
     end
     """
-    When I successfully run "rake db:create db:migrate db:schema:dump db:test:prepare"
-    And I run "bundle exec rspec --format documentation spec"
+    When I successfully run `bundle exec rake db:create db:migrate db:schema:dump db:test:prepare`
+    And I run `bundle exec rspec --format documentation spec`
     Then it should pass with:
     """
     0 failures

data/features/rspec_testing.feature

@@ -1,13 +1,12 @@
-@disable-bundler
 Feature: test a diesel engine using rspec
 
-  Scenario: create a disel engine and test using rspec
+  Scenario: create a diesel engine and test using rspec
     Given a directory named "testengine"
     When I cd to "testengine"
     And I write to "Gemfile" with:
     """
-    gem "rspec-rails", "~> 2.3.0"
-    gem "rails", "~> 3.0.3"
+    gem "rspec-rails"
+    gem "rails"
     gem "sqlite3-ruby"
     """
     When I add this library as a dependency
@@ -43,7 +42,7 @@ Feature: test a diesel engine using rspec
       match "/hello", :to => 'example#hello'
     end
     """
-    When I run "bundle exec rspec --format documentation spec"
+    When I run `bundle exec rspec --format documentation spec`
     Then it should pass with:
     """
     0 failures

data/features/support/appraisal.rb

@@ -0,0 +1,18 @@
+BUNDLE_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE)
+ORIGINAL_BUNDLE_VARS = Hash[ENV.select{ |key,value| BUNDLE_ENV_VARS.include?(key) }]
+
+Before do
+  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, ENV['BUNDLE_GEMFILE'])
+end
+
+After do
+  ORIGINAL_BUNDLE_VARS.each_pair do |key, value|
+    ENV[key] = value
+  end
+end
+
+When /^I reset Bundler environment variable$/ do
+  BUNDLE_ENV_VARS.each do |key|
+    ENV[key] = nil
+  end
+end

data/features/support/env.rb

@@ -1,3 +1,11 @@
 require 'aruba/cucumber'
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+
+Before do
+  @aruba_timeout_seconds = 20
+end
+
+Before('@slow') do
+  @aruba_timeout_seconds = 180
+end

data/features/views_generator.feature

@@ -1,4 +1,3 @@
-@disable-bundler
 Feature: reusable views generator
 
   Background:
@@ -38,17 +37,18 @@ Feature: reusable views generator
     end
     """
     When I cd to ".."
-    And I successfully run "rails new testapp"
+    And I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I add the "testengine" as a diesel engine
-    And I run "bundle install --local"
+    And I reset Bundler environment variable
+    And I run `bundle install --local`
 
   Scenario: copy views into an app from a diesel engine
-    When I successfully run "rails generate testengine:views --trace"
+    When I successfully run `bundle exec rails generate testengine:views --trace`
     Then the file "app/views/examples/index.html.erb" should contain "Hello there"
 
   Scenario: view generator descriptions from an app with a diesel engine
-    When I successfully run "rails generate testengine:views -h"
+    When I successfully run `bundle exec rails generate testengine:views -h`
     Then the output should contain:
     """
     Copy view files for the engine into your application.

data/lib/diesel/generators/install_base.rb

@@ -9,8 +9,11 @@ module Diesel
       extend ActiveRecord::Generators::Migration
 
       def generate_migrations
-        migrations.each do |migration|
-          migration_template migration, migration.sub(%r{(db/migrate/)(?:\d+_)?}, '\1')
+        migrations.each do |source_file|
+          name = migration_name(source_file)
+          unless migration_exists?(name)
+            migration_template source_file, "db/migrate/#{name}"
+          end
         end
       end
 
@@ -24,6 +27,20 @@ module Diesel
       def migrations
         files_within_root(".", "db/migrate/*.rb")
       end
+
+      def migration_exists?(name)
+        existing_migrations.include?(name)
+      end
+
+      def existing_migrations
+        @existing_migrations ||= Dir.glob("db/migrate/*.rb").map do |file|
+          migration_name(file)
+        end
+      end
+
+      def migration_name(file)
+        file.sub(%r{^.*(db/migrate/)(?:\d+_)?}, '')
+      end
     end
   end
 end

data/lib/diesel/testing.rb

@@ -1,4 +1,5 @@
 require 'diesel/testing/application'
 
+Bundler.require
 Diesel::Testing::Application.initialize!
 

data/lib/diesel/testing/app/controllers/application_controller.rb

@@ -1,3 +1,6 @@
 class ApplicationController < ActionController::Base
+  def show
+    render :text => "", :layout => 'application'
+  end
 end
 

data/lib/diesel/testing/application.rb

@@ -7,11 +7,19 @@ module Diesel
     class Application < Rails::Application
       config.encoding = "utf-8"
       config.action_mailer.default_url_options = { :host => 'localhost' }
-      config.paths.config.database = "#{APP_ROOT}/config/database.yml"
-      config.paths.config.routes << "#{APP_ROOT}/config/routes.rb"
-      config.paths.app.controllers << "#{APP_ROOT}/app/controllers"
-      config.paths.app.views << "#{APP_ROOT}/app/views"
-      config.paths.log = "tmp/log"
+      if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR >= 1
+        config.paths['config/database'] = "#{APP_ROOT}/config/database.yml"
+        config.paths['config/routes'] << "#{APP_ROOT}/config/routes.rb"
+        config.paths['app/controllers'] << "#{APP_ROOT}/app/controllers"
+        config.paths['app/views'] << "#{APP_ROOT}/app/views"
+        config.paths['log'] = "tmp/log/development.log"
+      else
+        config.paths.config.database = "#{APP_ROOT}/config/database.yml"
+        config.paths.config.routes << "#{APP_ROOT}/config/routes.rb"
+        config.paths.app.controllers << "#{APP_ROOT}/app/controllers"
+        config.paths.app.views << "#{APP_ROOT}/app/views"
+        config.paths.log = "tmp/log"
+      end
       config.cache_classes = true
       config.whiny_nils = true
       config.consider_all_requests_local = true
@@ -28,7 +36,7 @@ module Diesel
 
       def initialize!
         FileUtils.mkdir_p(Rails.root.join("db").to_s)
-        super
+        super unless @initialized
       end
     end
   end

data/lib/diesel/testing/integration.rb

@@ -8,3 +8,6 @@ When /^I add the "([^"]*)" gem from this project$/ do |gem_name|
   append_to_file('Gemfile', %{\ngem "#{gem_name}", :path => "../../.."\n})
 end
 
+When /^I add the "([^"]*)" gem from git "([^"]*)"(?: on branch "([^"]*)")?$/ do |gem_name, git, branch|
+  append_to_file('Gemfile', %{\ngem "#{gem_name}", :git => "#{git}"#{ %{, :branch => "#{branch}"} if branch}})
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: diesel
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -16,25 +11,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
-default_executable: diesel
+date: 2011-07-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: railties
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
   prerelease: false
-  name: railties
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  requirement: *id001
+        version: 0.5.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: appraisal
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.6.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: thin
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Develop your Rails engines like you develop your Rails applications.
 email: support@thoughtbot.com
 executables: 
@@ -44,9 +88,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Appraisals
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE
 - Rakefile
+- README.md
 - lib/diesel/commands.rb
 - lib/diesel/generators/base.rb
 - lib/diesel/generators/features_base.rb
@@ -68,10 +115,10 @@ files:
 - features/rails_rake_tasks_and_generators.feature
 - features/rspec_testing.feature
 - features/step_definitions/diesel_steps.rb
+- features/support/appraisal.rb
 - features/support/env.rb
 - features/views_generator.feature
 - bin/diesel
-has_rdoc: false
 homepage: http://github.com/thoughtbot/diesel
 licenses: []
 
@@ -85,23 +132,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Diesel makes your engine go.
@@ -114,5 +155,6 @@ test_files:
 - features/rails_rake_tasks_and_generators.feature
 - features/rspec_testing.feature
 - features/step_definitions/diesel_steps.rb
+- features/support/appraisal.rb
 - features/support/env.rb
 - features/views_generator.feature