kumade 0.0.8 → 0.0.9

data/features/kumade_executable.feature

@@ -19,7 +19,7 @@ Feature: Kumade executable
       ==> Packaged assets with Jammit
                run  git push origin master
       ==> Pushed master -> origin
-               run  git push -f pretend-staging master
+               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

data/lib/kumade/deployer.rb

@@ -12,7 +12,7 @@ module Kumade
       string_environment = environment.to_s
       ensure_heroku_remote_exists_for(string_environment)
       pre_deploy
-      git_force_push(string_environment)
+      sync_heroku(string_environment)
       heroku_migrate(string_environment)
       post_deploy
     end
@@ -20,19 +20,19 @@ module Kumade
     def pre_deploy
       ensure_clean_git
       package_assets
-      git_push('origin')
+      sync_github
     end
 
-    def git_push(remote)
-      run_or_error("git push #{remote} master",
-                   "Failed to push master -> #{remote}")
-      success("Pushed master -> #{remote}")
+    def sync_github
+      run_or_error("git push origin master",
+                   "Failed to push master -> origin")
+      success("Pushed master -> origin")
     end
 
-    def git_force_push(remote)
-      run_or_error("git push -f #{remote} master",
-                   "Failed to force push master -> #{remote}")
-      success("Force pushed master -> #{remote}")
+    def sync_heroku(environment)
+      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)

data/lib/kumade/version.rb

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

data/spec/kumade/deployer_spec.rb

@@ -7,7 +7,7 @@ describe Kumade::Deployer, "#pre_deploy" do
     %w(
       ensure_clean_git
       package_assets
-      git_push
+      sync_github
       ).each do |task|
       subject.should_receive(task).ordered.and_return(true)
     end
@@ -23,7 +23,7 @@ describe Kumade::Deployer, "#pre_deploy" do
       subject.stub(task)
     end
 
-    subject.should_receive(:git_push).with('origin')
+    subject.should_receive(:sync_github)
     subject.pre_deploy
   end
 end
@@ -50,7 +50,7 @@ describe Kumade::Deployer, "#deploy_to" do
       ordered.
       and_return(true)
 
-    subject.should_receive(:git_force_push).
+    subject.should_receive(:sync_heroku).
       ordered.
       and_return(true)
 
@@ -69,13 +69,13 @@ describe Kumade::Deployer, "#deploy_to" do
                  :on_cedar?                       => false,
                  :run                             => true)
 
-    subject.should_receive(:git_force_push).with(remote_name)
+    subject.should_receive(:sync_heroku).with(remote_name)
 
     subject.deploy_to(remote_name)
   end
 end
 
-describe Kumade::Deployer, "#git_push" do
+describe Kumade::Deployer, "#sync_github" do
   let(:remote){ 'origin' }
 
   before { subject.stub(:say) }
@@ -84,7 +84,7 @@ describe Kumade::Deployer, "#git_push" do
     subject.should_receive(:run).
       with("git push #{remote} master").
       and_return(true)
-    subject.git_push(remote)
+    subject.sync_github
   end
 
   context "when `git push` fails" do
@@ -93,49 +93,49 @@ describe Kumade::Deployer, "#git_push" do
     it "prints an error message" do
       subject.should_receive(:error).with("Failed to push master -> #{remote}")
 
-      subject.git_push(remote)
+      subject.sync_github
     end
   end
 
-  context "when `git push` succeeds" do
+  context "when syncing github succeeds" do
     before { subject.stub(:run => true) }
 
     it "does not raise an error" do
       subject.should_not_receive(:error)
-      subject.git_push(remote)
+      subject.sync_github
     end
 
     it "prints a success message" do
       subject.should_receive(:success).with("Pushed master -> #{remote}")
 
-      subject.git_push(remote)
+      subject.sync_github
     end
   end
 end
 
-describe Kumade::Deployer, "#git_force_push" do
-  let(:remote){ 'origin' }
+describe Kumade::Deployer, "#sync_heroku" do
+  let(:environment) { 'staging' }
   before { subject.stub(:say) }
 
   it "calls `git push -f`" do
     subject.should_receive(:run).
-      with("git push -f #{remote} master").
+      with("git push -f #{environment} deploy:master").
       and_return(true)
-    subject.git_force_push(remote)
+    subject.sync_heroku(environment)
   end
 
-  context "when `git push -f` fails" do
+  context "when syncing to heroku fails" do
     before do
       subject.stub(:run => false)
     end
 
     it "prints an error" do
-      subject.should_receive(:error).with("Failed to force push master -> #{remote}")
-      subject.git_force_push(remote)
+      subject.should_receive(:error)
+      subject.sync_heroku(environment)
     end
   end
 
-  context "when `git push -f` succeeds" do
+  context "when syncing to heroku succeeds" do
     before do
       subject.stub(:run => true)
       subject.stub(:say)
@@ -143,14 +143,14 @@ describe Kumade::Deployer, "#git_force_push" do
 
     it "does not raise an error" do
       subject.should_not_receive(:error)
-      subject.git_force_push(remote)
+      subject.sync_heroku(environment)
     end
 
     it "prints a success message" do
       subject.should_receive(:success).
-        with("Force pushed master -> #{remote}")
+        with("Force pushed master -> #{environment}")
 
-      subject.git_force_push(remote)
+      subject.sync_heroku(environment)
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: kumade
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Gabe Berke-Williams