kumade 0.0.9 → 0.1.0

data/features/kumade_executable.feature

@@ -7,8 +7,13 @@ Feature: Kumade executable
   Background:
     Given a directory named "executable"
     And I cd to "executable"
-    When I create a Heroku remote for "pretend-staging-app" named "pretend-staging"
+    When I successfully run `git init`
+    And I successfully run `touch .gitkeep`
+    And I successfully run `git add .`
+    And I successfully run `git commit -am First`
+    And I create a Heroku remote for "pretend-staging-app" named "pretend-staging"
     And I create a Heroku remote for "app-two" named "staging"
+    And I create a non-Heroku remote named "bad-remote"
 
   Scenario: Pretend mode with a Heroku remote
     When I run `kumade deploy pretend-staging -p`
@@ -21,7 +26,6 @@ Feature: Kumade executable
       ==> Pushed master -> origin
                run  git push -f pretend-staging deploy:master
       ==> Force pushed master -> pretend-staging
-               run  bundle exec heroku rake db:migrate --app pretend-staging-app
       ==> Migrated pretend-staging-app
                run  git checkout master && git branch -D deploy
       ==> Deployed to: pretend-staging
@@ -38,5 +42,5 @@ Feature: Kumade executable
     Then the output should match /Cannot deploy: /
 
   Scenario: Deploying to a non-Heroku remote fails
-    When I run `kumade deploy origin`
-    Then the output should match /==> ! Cannot deploy: "origin" remote does not point to Heroku/
+    When I run `kumade deploy bad-remote`
+    Then the output should match /==> ! Cannot deploy: "bad-remote" remote does not point to Heroku/

data/features/step_definitions/git_steps.rb

@@ -1,6 +1,9 @@
 When /^I create a Heroku remote for "([^"]*)" named "([^"]*)"$/ do |app_name, remote_name|
-  `git remote add #{remote_name} git@heroku.com:#{app_name}.git`
+  When %{I run `git remote add #{remote_name} git@heroku.com:#{app_name}.git`}
+end
 
+When /^I create a non-Heroku remote named "([^"]*)"$/ do |remote_name|
+  When %{I run `git remote add #{remote_name} git@github.com:gabebw/kumade.git`}
 end
 
 After("@creates-remote") do

data/features/support/env.rb

@@ -2,5 +2,5 @@ require 'aruba/cucumber'
 require 'kumade'
 
 Before('@extra-timeout') do
-  @aruba_timeout_seconds = 60
+  @aruba_timeout_seconds = 10
 end

data/lib/kumade/deployer.rb

@@ -1,19 +1,19 @@
 module Kumade
   class Deployer < Thor::Shell::Color
     DEPLOY_BRANCH = "deploy"
-    attr_reader :pretending
+    attr_reader :environment, :pretending
 
-    def initialize(pretending = false)
+    def initialize(environment = 'staging', pretending = false)
       super()
-      @pretending = pretending
+      @environment = environment
+      @pretending  = pretending
     end
 
-    def deploy_to(environment)
-      string_environment = environment.to_s
-      ensure_heroku_remote_exists_for(string_environment)
+    def deploy
+      ensure_heroku_remote_exists
       pre_deploy
-      sync_heroku(string_environment)
-      heroku_migrate(string_environment)
+      sync_heroku
+      heroku_migrate
       post_deploy
     end
 
@@ -29,21 +29,21 @@ module Kumade
       success("Pushed master -> origin")
     end
 
-    def sync_heroku(environment)
+    def sync_heroku
       run_or_error("git push -f #{environment} #{DEPLOY_BRANCH}:master",
                    "Failed to force push #{DEPLOY_BRANCH} -> #{environment}/master")
       success("Force pushed master -> #{environment}")
     end
 
-    def heroku_migrate(environment)
+    def heroku_migrate
       app = Kumade.app_for(environment)
 
-      heroku("rake db:migrate", app)
+      heroku("rake db:migrate", app) unless pretending
       success("Migrated #{app}")
     end
 
     def post_deploy
-      run_or_error("git checkout master", "git branch -D #{DEPLOY_BRANCH}",
+      run_or_error(["git checkout master", "git branch -D #{DEPLOY_BRANCH}"],
                    "Failed to clean up #{DEPLOY_BRANCH} branch")
     end
 
@@ -58,7 +58,7 @@ module Kumade
     end
 
     def on_cedar?(app)
-      selected_stack = `heroku stack --app '#{app}'`.split("\n").grep(/^\*/).first
+      selected_stack = run("heroku stack --app '#{app}'", :capture => true).split("\n").grep(/^\*/).first
       selected_stack && selected_stack.include?('cedar')
     end
 
@@ -110,7 +110,7 @@ module Kumade
     end
 
     def git_add_and_commit_all_assets_in(dir)
-      run_or_error "git checkout -b #{DEPLOY_BRANCH}", "git add -f #{dir}", "git commit -m 'Compiled assets'",
+      run_or_error ["git checkout -b #{DEPLOY_BRANCH}", "git add -f #{dir}", "git commit -m 'Compiled assets'"],
                    "Cannot deploy: couldn't commit assets"
 
       success "Added and committed all assets"
@@ -165,8 +165,8 @@ module Kumade
       !$?.success?
     end
 
-    def run_or_error(*commands, error_message)
-      all_commands = commands.join(' && ')
+    def run_or_error(commands, error_message)
+      all_commands = [commands].flatten.join(' && ')
       if pretending
         say_status(:run, all_commands)
       else
@@ -174,9 +174,9 @@ module Kumade
       end
     end
 
-    def run(command)
+    def run(command, config = {})
       say_status :run, command
-      system command
+      config[:capture] ? `#{command}` : system("#{command}")
     end
 
     def announce(message)
@@ -192,7 +192,7 @@ module Kumade
       say("==> #{message}", :green)
     end
 
-    def ensure_heroku_remote_exists_for(environment)
+    def ensure_heroku_remote_exists
       if remote_exists?(environment)
         if app_name = Kumade.app_for(environment)
           success("#{environment} is a Heroku remote")

data/lib/kumade/thor_task.rb

@@ -10,7 +10,7 @@ module Kumade
       say("==> In Pretend Mode", :red) if options[:pretend]
       say "==> Deploying to: #{environment}"
 
-      Deployer.new(options[:pretend]).deploy_to(environment)
+      Deployer.new(environment, options[:pretend]).deploy
 
       say "==> Deployed to: #{environment}", :green
     end

data/lib/kumade/version.rb

@@ -1,3 +1,3 @@
 module Kumade
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/kumade/deployer_spec.rb

@@ -28,10 +28,11 @@ describe Kumade::Deployer, "#pre_deploy" do
   end
 end
 
-describe Kumade::Deployer, "#deploy_to" do
+describe Kumade::Deployer, "#deploy" do
   let(:remote_name){ 'staging' }
   let(:app_name){ 'kumade-staging' }
 
+
   before do
     subject.stub(:say)
     force_add_heroku_remote(remote_name, app_name)
@@ -42,9 +43,8 @@ describe Kumade::Deployer, "#deploy_to" do
   it "calls the correct methods in order" do
     subject.stub(:run => true)
 
-    subject.should_receive(:ensure_heroku_remote_exists_for).
-      ordered.
-      with(remote_name)
+    subject.should_receive(:ensure_heroku_remote_exists).
+      ordered
 
     subject.should_receive(:pre_deploy).
       ordered.
@@ -55,34 +55,20 @@ describe Kumade::Deployer, "#deploy_to" do
       and_return(true)
 
     subject.should_receive(:heroku_migrate).
-      ordered.
-      with(remote_name)
+      ordered
 
     subject.should_receive(:post_deploy)
 
-    subject.deploy_to(remote_name)
-  end
-
-  it "deploys to the correct remote" do
-    subject.stub(:ensure_heroku_remote_exists_for => true,
-                 :pre_deploy                      => true,
-                 :on_cedar?                       => false,
-                 :run                             => true)
-
-    subject.should_receive(:sync_heroku).with(remote_name)
-
-    subject.deploy_to(remote_name)
+    subject.deploy
   end
 end
 
 describe Kumade::Deployer, "#sync_github" do
-  let(:remote){ 'origin' }
-
   before { subject.stub(:say) }
 
   it "calls `git push`" do
     subject.should_receive(:run).
-      with("git push #{remote} master").
+      with("git push origin master").
       and_return(true)
     subject.sync_github
   end
@@ -91,7 +77,7 @@ describe Kumade::Deployer, "#sync_github" do
     before { subject.stub(:run => false) }
 
     it "prints an error message" do
-      subject.should_receive(:error).with("Failed to push master -> #{remote}")
+      subject.should_receive(:error).with("Failed to push master -> origin")
 
       subject.sync_github
     end
@@ -106,7 +92,7 @@ describe Kumade::Deployer, "#sync_github" do
     end
 
     it "prints a success message" do
-      subject.should_receive(:success).with("Pushed master -> #{remote}")
+      subject.should_receive(:success).with("Pushed master -> origin")
 
       subject.sync_github
     end
@@ -114,14 +100,15 @@ describe Kumade::Deployer, "#sync_github" do
 end
 
 describe Kumade::Deployer, "#sync_heroku" do
-  let(:environment) { 'staging' }
+  let(:environment) { 'my-env' }
+  subject { Kumade::Deployer.new(environment) }
   before { subject.stub(:say) }
 
   it "calls `git push -f`" do
     subject.should_receive(:run).
       with("git push -f #{environment} deploy:master").
       and_return(true)
-    subject.sync_heroku(environment)
+    subject.sync_heroku
   end
 
   context "when syncing to heroku fails" do
@@ -131,7 +118,7 @@ describe Kumade::Deployer, "#sync_heroku" do
 
     it "prints an error" do
       subject.should_receive(:error)
-      subject.sync_heroku(environment)
+      subject.sync_heroku
     end
   end
 
@@ -143,14 +130,14 @@ describe Kumade::Deployer, "#sync_heroku" do
 
     it "does not raise an error" do
       subject.should_not_receive(:error)
-      subject.sync_heroku(environment)
+      subject.sync_heroku
     end
 
     it "prints a success message" do
       subject.should_receive(:success).
         with("Force pushed master -> #{environment}")
 
-      subject.sync_heroku(environment)
+      subject.sync_heroku
     end
   end
 end
@@ -439,11 +426,11 @@ describe Kumade::Deployer, "#heroku_migrate" do
       with("rake db:migrate", app_name)
     subject.should_receive(:success).with("Migrated #{app_name}")
 
-    subject.heroku_migrate(environment)
+    subject.heroku_migrate
   end
 end
 
-describe Kumade::Deployer, "#ensure_heroku_remote_exists_for" do
+describe Kumade::Deployer, "#ensure_heroku_remote_exists" do
   let(:environment){ 'staging' }
   let(:bad_environment){ 'bad' }
   let(:staging_app_name) { 'staging-sushi' }
@@ -460,35 +447,40 @@ describe Kumade::Deployer, "#ensure_heroku_remote_exists_for" do
   end
 
   context "when the remote points to Heroku" do
+    subject { Kumade::Deployer.new(environment) }
+
     it "does not print an error" do
       subject.should_not_receive(:error)
 
-      subject.ensure_heroku_remote_exists_for(environment)
+      subject.ensure_heroku_remote_exists
     end
 
     it "prints a success message" do
       subject.should_receive(:success).with("#{environment} is a Heroku remote")
 
-      subject.ensure_heroku_remote_exists_for(environment)
+      subject.ensure_heroku_remote_exists
     end
   end
 
 
   context "when the remote does not exist" do
+    subject { Kumade::Deployer.new(environment) }
     before { remove_remote(environment) }
 
     it "prints an error" do
       subject.should_receive(:error).with(%{Cannot deploy: "#{environment}" remote does not exist})
 
-      subject.ensure_heroku_remote_exists_for(environment)
+      subject.ensure_heroku_remote_exists
     end
   end
 
   context "when the remote does not point to Heroku" do
+    subject { Kumade::Deployer.new(bad_environment) }
+
     it "prints an error" do
       subject.should_receive(:error).with(%{Cannot deploy: "#{bad_environment}" remote does not point to Heroku})
 
-      subject.ensure_heroku_remote_exists_for(bad_environment)
+      subject.ensure_heroku_remote_exists
     end
   end
 end

data/spec/kumade/thor_task_spec.rb

@@ -6,8 +6,8 @@ module Kumade
 
     let(:environment){ 'bamboo' }
 
-    it "calls the deploy method with the correct environment" do
-      Deployer.any_instance.should_receive(:deploy_to).with(environment)
+    it "calls the deploy method" do
+      Deployer.any_instance.should_receive(:deploy)
       subject.deploy(environment)
     end
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kumade
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
-  version: 0.0.9
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Gabe Berke-Williams
@@ -11,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2011-08-05 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: heroku
@@ -21,6 +27,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 14
         version: "0.14"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :development
   version_requirements: *id003
@@ -54,6 +72,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id004
@@ -65,6 +88,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
   type: :development
   version_requirements: *id005
@@ -76,6 +104,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 4
+        - 3
         version: 0.4.3
   type: :development
   version_requirements: *id006
@@ -87,6 +120,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 6
+        - 3
         version: 0.6.3
   type: :development
   version_requirements: *id007
@@ -121,6 +159,7 @@ files:
 - spec/kumade/thor_task_spec.rb
 - spec/kumade_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -134,17 +173,23 @@ 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.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple rake tasks for deploying to Heroku