kumade 0.8.1 → 0.8.2

data/Changelog.md

@@ -1,3 +1,8 @@
+## 0.8.2 (2011-11-09)
+* Add kumade:pre\_deploy Rake task hook
+
+* Git#push when remote does not exist returns silently
+
 ## 0.8.1 (2011-11-08)
 * Correctly restart apps
 

data/features/rake_task_pre_deploy.feature

@@ -0,0 +1,21 @@
+@slow
+Feature: Rake task that always runs during pre deploy
+  As a user
+  I want a Rake task that runs before deployment
+  So that I can hook into the deployment process
+
+  Scenario: Pre-deploy task runs during deployment
+    Given a new Rails application with Kumade and Jammit
+    When I create a Heroku remote named "pretend-staging"
+    And I add a pre-deploy rake task that prints "Hi!"
+    And I run kumade with "pretend-staging"
+    Then the output should contain "kumade:pre_deploy"
+    And the output should contain "Hi!"
+
+  Scenario: Pre-deploy task does not run when pretending
+    Given a new Rails application with Kumade and Jammit
+    When I create a Heroku remote named "pretend-staging"
+    And I add a pre-deploy rake task that prints "Hi!"
+    And I run kumade with "pretend-staging -p"
+    Then the output should contain "kumade:pre_deploy"
+    But the output should not contain "Hi!"

data/features/step_definitions/rake_steps.rb

@@ -36,3 +36,15 @@ When /^I add a pre-compilation rake task that prints "Hi!"$/ do
 
   commit_everything_in_repo
 end
+
+When /^I add a pre-deploy rake task that prints "Hi!"$/ do
+  append_to_file("Rakefile", <<-CUSTOM_TASK)
+      namespace :kumade do
+        task :pre_deploy do
+          puts 'Hi!'
+        end
+      end
+  CUSTOM_TASK
+
+  commit_everything_in_repo
+end

data/lib/kumade/deployer.rb

@@ -28,6 +28,7 @@ module Kumade
 
     def pre_deploy
       ensure_clean_git
+      run_predeploy_task
       package_assets
       sync_origin
     end
@@ -59,5 +60,11 @@ module Kumade
         Kumade.configuration.outputter.error(%{Cannot deploy: "#{Kumade.configuration.environment}" remote does not exist})
       end
     end
+
+    private
+
+    def run_predeploy_task
+      RakeTaskRunner.new("kumade:pre_deploy").invoke
+    end
   end
 end

data/lib/kumade/git.rb

@@ -11,6 +11,7 @@ module Kumade
     end
 
     def push(branch, remote = 'origin', force = false)
+      return unless remote_exists?(remote)
       command = ["git push"]
       command << "-f" if force
       command << remote

data/lib/kumade/version.rb

@@ -1,3 +1,3 @@
 module Kumade
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/kumade/deployer_spec.rb

@@ -1,7 +1,14 @@
 require 'spec_helper'
 
 describe Kumade::Deployer, "#pre_deploy", :with_mock_outputter do
-  let(:git) { subject.git }
+  let(:git)              { subject.git }
+  let(:rake_task_runner) { stub("RakeTaskRunner", :invoke => true) }
+  let(:packager)         { stub("packager", :run => true) }
+
+  before do
+    Kumade::Packager.stubs(:new => packager)
+    Kumade::RakeTaskRunner.stubs(:new).with("kumade:pre_deploy").returns(rake_task_runner)
+  end
 
   it "calls the correct methods" do
     git.expects(:ensure_clean_git)
@@ -10,6 +17,13 @@ describe Kumade::Deployer, "#pre_deploy", :with_mock_outputter do
 
     subject.pre_deploy
   end
+
+  it "invokes the kumade:pre_deploy task" do
+    subject.pre_deploy
+
+    Kumade::RakeTaskRunner.should have_received(:new).with("kumade:pre_deploy")
+    rake_task_runner.should have_received(:invoke)
+  end
 end
 
 describe Kumade::Deployer, "#deploy", :with_mock_outputter do

data/spec/kumade/git_spec.rb

@@ -43,27 +43,42 @@ end
 describe Kumade::Git, "#push", :with_mock_outputter do
   let(:branch)       { 'branch' }
   let(:remote)       { 'my-remote' }
-  let(:command_line) { stub("Kumade::CommandLine instance", :run_or_error => true) }
 
-  before do
-    Kumade::CommandLine.stubs(:new => command_line)
-  end
+  context "when the remote exists" do
+    let(:command_line) { stub("Kumade::CommandLine instance", :run_or_error => true) }
 
-  it "pushes to the correct remote" do
-    subject.push(branch, remote)
-    Kumade::CommandLine.should have_received(:new).with("git push #{remote} #{branch}")
-    command_line.should have_received(:run_or_error).once
-  end
+    before do
+      Kumade::CommandLine.stubs(:new => command_line)
+      subject.stubs(:remote_exists? => true)
+    end
+
+    it "pushes to the correct remote" do
+      subject.push(branch, remote)
+      Kumade::CommandLine.should have_received(:new).with("git push #{remote} #{branch}")
+      command_line.should have_received(:run_or_error).once
+    end
 
-  it "can force push" do
-    subject.push(branch, remote, true)
-    Kumade::CommandLine.should have_received(:new).with("git push -f #{remote} #{branch}")
-    command_line.should have_received(:run_or_error).once
+    it "can force push" do
+      subject.push(branch, remote, true)
+      Kumade::CommandLine.should have_received(:new).with("git push -f #{remote} #{branch}")
+      command_line.should have_received(:run_or_error).once
+    end
+
+    it "prints a success message" do
+      subject.push(branch, remote)
+      Kumade.configuration.outputter.should have_received(:success).with("Pushed #{branch} -> #{remote}")
+    end
   end
 
-  it "prints a success message" do
-    subject.push(branch, remote)
-    Kumade.configuration.outputter.should have_received(:success).with("Pushed #{branch} -> #{remote}")
+  context "when the remote does not exist" do
+    before do
+      subject.stubs(:remote_exists? => false)
+    end
+    
+    it "returns silently" do
+      subject.push(branch)
+      Kumade::CommandLine.should have_received(:new).never
+    end
   end
 end
 

metadata

@@ -1,136 +1,140 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kumade
-version: !ruby/object:Gem::Version
-  version: 0.8.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.8.2
 platform: ruby
-authors:
+authors: 
 - Gabe Berke-Williams
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-09 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: heroku
-  requirement: &70189854580280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        version: "2.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70189854580280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70189854579780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70189854579780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cocaine
-  requirement: &70189854587160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70189854587160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70189854586660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2"
   type: :runtime
-  prerelease: false
-  version_requirements: *70189854586660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70189854585900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *70189854585900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &70189854585180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.0.2
   type: :development
-  prerelease: false
-  version_requirements: *70189854585180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: aruba
-  requirement: &70189854584680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.3
   type: :development
-  prerelease: false
-  version_requirements: *70189854584680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: jammit
-  requirement: &70189854584080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.6.3
   type: :development
-  prerelease: false
-  version_requirements: *70189854584080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: bourne
-  requirement: &70189854583560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70189854583560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &70189854580720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70189854580720
+  version_requirements: *id010
 description: A well-tested script for easy deploying to Heroku
-email:
+email: 
 - gabe@thoughtbot.com
 - support@thoughtbot.com
-executables:
+executables: 
 - kumade
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .simplecov
 - .travis.yml
@@ -147,6 +151,7 @@ files:
 - features/no_op_packager.feature
 - features/railtie.feature
 - features/rake_task_before_asset_compilation.feature
+- features/rake_task_pre_deploy.feature
 - features/step_definitions/bundler_steps.rb
 - features/step_definitions/git_steps.rb
 - features/step_definitions/jammit_steps.rb
@@ -198,31 +203,35 @@ files:
 - spec/support/git.rb
 - spec/support/heroku.rb
 - spec/support/shared_examples/packager.rb
+has_rdoc: true
 homepage: http://thoughtbot.com/community/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A well-tested script for easy deploying to Heroku
-test_files:
+test_files: 
 - features/git.feature
 - features/jammit.feature
 - features/kumade_executable.feature
@@ -230,6 +239,7 @@ test_files:
 - features/no_op_packager.feature
 - features/railtie.feature
 - features/rake_task_before_asset_compilation.feature
+- features/rake_task_pre_deploy.feature
 - features/step_definitions/bundler_steps.rb
 - features/step_definitions/git_steps.rb
 - features/step_definitions/jammit_steps.rb