Use deployer's deploy_to methods and remove unused cucumber code

features/deploying.feature

@@ -5,58 +5,19 @@ Feature: Deploying to Heroku
 
   Background:
     Given a directory named "deployer"
-    When I cd to "deployer"
-    And I write to "Gemfile" with:
-    """
-    source "http://rubygems.org"
-    gem "rake", "0.8.7"
-    """
-    And I add "kumade" from this project as a dependency
-    And I stub out git push
-    And I stub out git force push
+    And I cd to "deployer"
+    And I stub out the "staging" deploy method
+    And I stub out the "production" deploy method
     And I load the tasks
-    And I initialize a git repo
-    And I commit everything in the current directory to git
 
   Scenario: deploy task is an alias for deploy:staging
     When I successfully run the rake task "deploy"
     Then the output should contain "Force pushed master -> staging"
 
-  Scenario: Deploying to staging calls pre_deploy task
-    Given I stub out the "deploy:pre_deploy" task
-    And I successfully run the rake task "deploy:staging"
-    Then the output should contain "[stub] Ran deploy:pre_deploy"
-
-  Scenario: Deploying to production calls pre_deploy task
-    Given I stub out the "deploy:pre_deploy" task
-    When I successfully run the rake task "deploy:production"
-    Then the output should contain "[stub] Ran deploy:pre_deploy"
-
   Scenario: Deploying to staging
     When I successfully run the rake task "deploy:staging"
     Then the output should contain "Force pushed master -> staging"
-    And the output should contain "Pushed master -> origin"
 
   Scenario: Deploying to production
     When I successfully run the rake task "deploy:production"
     Then the output should contain "Force pushed master -> production"
-    And the output should contain "Pushed master -> origin"
-
-  Scenario: Pushing to origin fails
-    Given that pushing to origin fails
-    When I run the rake task "deploy:pre_deploy"
-    Then the output should contain "Failed to push master -> origin"
-
-  Scenario: Pre-deploy hook checks for clean git repo
-    When I append to "Rakefile" with:
-    """
-    # Dirtying up your git repo
-    """
-    And I run the rake task "deploy:pre_deploy"
-    Then the output should contain "Cannot deploy: repo is not clean"
-
-  Scenario: Pre-deploy hook checks that rake passes
-    When I add a failing default task
-    And I commit everything in the current directory to git
-    And I run the rake task "deploy:pre_deploy"
-    Then the output should contain "Cannot deploy: tests did not pass"

features/loading_tasks.feature

@@ -12,7 +12,6 @@ Feature: Loading tasks
     gem "rake", "0.8.7"
     gem "kumade"
     """
-    And I add "kumade" from this project as a dependency
     And I write to "Rakefile" with:
     """
     require 'kumade'

features/step_definitions/stub_steps.rb

@@ -0,0 +1,10 @@
+Given /^I stub out the "([^"]+)" deploy method$/ do |environment|
+  append_to_file("Rakefile", <<-RAKE)
+
+  class Kumade::Deployer
+    def deploy_to_#{environment}
+      puts "Force pushed master -> #{environment}"
+    end
+  end
+  RAKE
+end

features/step_definitions/task_steps.rb

@@ -10,38 +10,6 @@
   }
 end
 
-When /^I add a failing default task$/ do
-  steps %{
-    When I append to "Rakefile" with:
-    """
-
-    task :failing_task do
-      raise "I am the failboat!"
-    end
-    task :default => :failing_task
-    """
-  }
-end
-
 When /^I successfully run the rake task "([^"]*)"$/ do |task_name|
   When %{I successfully run `bundle exec rake #{task_name}`}
 end
-
-When /^I run the rake task "([^"]*)"$/ do |task_name|
-  When %{I run `bundle exec rake #{task_name}`}
-end
-
-Given /^I stub out the "([^"]+)" task$/ do |task_name|
-  insert_after_tasks_are_loaded(<<-CONTENT)
-    class Rake::Task
-      def overwrite(&block)
-        @actions.clear
-        enhance(&block)
-      end
-    end
-
-    Rake::Task['#{task_name}'].overwrite do
-      puts "[stub] Ran #{task_name}"
-    end
-  CONTENT
-end

lib/kumade/tasks/deploy.rake

@@ -4,25 +4,13 @@ class Kumade
 
   namespace :deploy do
     desc "Deploy to Heroku staging"
-    task :staging => :pre_deploy do
-      deployer.git_force_push('staging')
+    task :staging do
+      deployer.deploy_to_staging
     end
 
     desc "Deploy to Heroku production"
-    task :production => :pre_deploy do
-      deployer.git_force_push('production')
-    end
-
-    task :pre_deploy => [:clean_git, :rake_passes, :package_assets] do
-      deployer.git_push('origin')
-    end
-
-    task :clean_git do
-      deployer.ensure_clean_git
-    end
-
-    task :rake_passes do
-      deployer.ensure_rake_passes
+    task :production do
+      deployer.deploy_to_production
     end
   end
 end