Many fewer nested Cucumber steps.

features/step_definitions/bundler_steps.rb

@@ -3,31 +3,18 @@
 end
 
 When /^I rebundle$/ do
-  steps %{
-    When I bundle
-    And I commit everything in the current repo
-  }
+  run_bundler
+  commit_everything_in_repo
 end
 
 Given /^an empty Gemfile$/ do
-  When %{I write to "Gemfile" with:}, ""
+  write_file('Gemfile', '')
 end
 
 When /^I set up the Gemfile with kumade$/ do
-  steps %{
-    When I write to "Gemfile" with:
-      """
-      gem 'kumade', :path => '../../..'
-      """
-  }
+  add_kumade_to_gemfile
 end
 
-When /^I add "([^"]+)" to the Gemfile$/ do |gem|
-  steps %{
-    When I append to "Gemfile" with:
-      """
-
-      gem '#{gem}'
-      """
-  }
+When /^I add "jammit" to the Gemfile$/ do
+  add_jammit_to_gemfile
 end

features/step_definitions/git_steps.rb

@@ -11,28 +11,19 @@
 end
 
 When /^I set up a git repo$/ do
-  ["git init", "touch .gitkeep", "git add .", "git commit -am First"].each do |git_command|
-    run_simple(git_command)
-  end
+  set_up_git_repo
 end
 
 When /^I commit everything in the current repo$/ do
-  ['git add .', 'git commit -am MY_MESSAGE'].each do |git_command|
-    run_simple(git_command)
-  end
+  commit_everything_in_repo
 end
 
 When /^I create an untracked file$/ do
   write_file("untracked-file", "anything")
 end
 
 When /^I modify a tracked file$/ do
-  steps %{
-    Given I write to "new-file" with:
-      """
-      clean
-      """
-    And I commit everything in the current repo
-    When I append to "new-file" with "dirty it up"
-  }
+  write_file('tracked-file', 'clean')
+  commit_everything_in_repo
+  append_to_file('tracked-file', 'dirty it up')
 end

features/step_definitions/rails_steps.rb

@@ -1,6 +1,14 @@
 Given /^a new Rails application with Kumade$/ do
-  run_simple("rails new rake-tasks")
+  run_simple("rails new rake-tasks -T")
   cd('rake-tasks')
   append_to_file('Gemfile', "gem 'kumade', :path => '#{PROJECT_PATH}'")
   run_bundler
+  set_up_git_repo
+end
+
+Given /^a new Rails application with Kumade and Jammit$/ do
+  Given "a new Rails application with Kumade"
+  add_jammit_to_gemfile
+  run_bundler
+  set_up_git_repo
 end

features/step_definitions/rake_steps.rb

@@ -24,3 +24,15 @@
     Then the output from "bundle exec rake -T" should not contain "#{task_name}"
   }
 end
+
+When /^I add a pre-compilation rake task that prints "Hi!"$/ do
+  append_to_file("Rakefile", <<-CUSTOM_TASK)
+      namespace :kumade do
+        task :before_asset_compilation do
+          puts 'Hi!'
+        end
+      end
+  CUSTOM_TASK
+
+  When "I commit everything in the current repo"
+end

features/support/bundler.rb

@@ -2,6 +2,14 @@ module BundlerHelpers
   def run_bundler
     run_simple('bundle --gemfile=./Gemfile --local || bundle --gemfile=./Gemfile')
   end
+
+  def add_jammit_to_gemfile
+    append_to_file('Gemfile', "\ngem 'jammit'")
+  end
+
+  def add_kumade_to_gemfile
+    append_to_file('Gemfile', "\ngem 'kumade', :path => '../../..'")
+  end
 end
 
 World(BundlerHelpers)

features/support/git.rb

@@ -0,0 +1,15 @@
+module GitHelpers
+  def set_up_git_repo
+    ["git init", "touch .gitkeep", "git add .", "git commit -am First"].each do |git_command|
+      run_simple(git_command)
+    end
+  end
+
+  def commit_everything_in_repo
+    ['git add .', 'git commit -am MY_MESSAGE'].each do |git_command|
+      run_simple(git_command)
+    end
+  end
+end
+
+World(GitHelpers)