kumade 0.2.2 → 0.3.0

data/lib/kumade/runner.rb

@@ -6,21 +6,23 @@ module Kumade
       attr_reader :environment
     end
 
-    def self.run(args=ARGV, out=$stdout)
+    def self.run(args=ARGV, out=StringIO.new)
       @out         = out
       @options     = parse_arguments!(args)
       @environment = args.shift || 'staging'
 
-      deploy
+      swapping_stdout_for(@out) do
+        deploy
+      end
     end
 
     def self.deploy
       if pretending?
-        @out.puts "==> In Pretend Mode"
+        puts "==> In Pretend Mode"
       end
-      @out.puts "==> Deploying to: #{environment}"
-      Deployer.new(environment, pretending?, @options[:cedar]).deploy
-      @out.puts "==> Deployed to: #{environment}"
+      puts "==> Deploying to: #{environment}"
+      Deployer.new(environment, pretending?).deploy
+      puts "==> Deployed to: #{environment}"
     end
 
     def self.parse_arguments!(args)
@@ -32,17 +34,13 @@ module Kumade
           options[:pretend] = p
         end
 
-        opts.on("-c", "--cedar", "Use this if your app is on cedar") do |cedar|
-          options[:cedar] = cedar
-        end
-
         opts.on_tail('-v', '--version', 'Show version') do
-          @out.puts "kumade #{Kumade::VERSION}"
+          puts "kumade #{Kumade::VERSION}"
           exit
         end
 
         opts.on_tail('-h', '--help', 'Show this message') do
-          @out.puts opts
+          puts opts
           exit
         end
       end.parse!(args)
@@ -50,6 +48,21 @@ module Kumade
       options
     end
 
+    def self.swapping_stdout_for(io)
+      begin
+        $real_stdout = $stdout
+        $stdout = io unless pretending?
+        yield
+      rescue Kumade::DeploymentError
+        unless pretending?
+          io.rewind
+          $real_stdout.print(io.read)
+        end
+      ensure
+        $stdout = $real_stdout
+      end
+    end
+
     def self.pretending?
       @options[:pretend]
     end

data/lib/kumade/version.rb

@@ -1,3 +1,3 @@
 module Kumade
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/tasks/deploy.rake

@@ -1,5 +1,5 @@
 namespace :deploy do
-  Kumade.environments.each do |environment|
+  Kumade::Git.environments.each do |environment|
     desc "Deploy to #{environment} environment"
     task environment do
       Kumade::Runner.run([environment])

data/spec/kumade/base_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Kumade::Base, "#success" do
+  it "exists" do
+    subject.should respond_to(:success)
+  end
+end
+
+describe Kumade::Base, "#error" do
+  it "exists" do
+    subject.should respond_to(:error)
+  end
+
+  it "prints its message and raises its message" do
+    subject.should_receive(:say).with("==> ! I'm an error!", :red)
+    lambda{ subject.error("I'm an error!") }.should raise_error(Kumade::DeploymentError)
+  end
+end

data/spec/kumade/deployer_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+include Rake::DSL if defined?(Rake::DSL)
+
 describe Kumade::Deployer, "#pre_deploy" do
   before { subject.stub(:say) }
 
@@ -29,12 +31,11 @@ describe Kumade::Deployer, "#pre_deploy" do
 end
 
 describe Kumade::Deployer, "#deploy" do
-  let(:remote_name){ 'staging' }
-  let(:app_name){ 'kumade-staging' }
+  let(:remote_name) { 'staging' }
 
   before do
     subject.stub(:say)
-    force_add_heroku_remote(remote_name, app_name)
+    force_add_heroku_remote(remote_name)
   end
 
   it "calls the correct methods in order" do
@@ -61,121 +62,39 @@ describe Kumade::Deployer, "#deploy" do
 end
 
 describe Kumade::Deployer, "#sync_github" do
-  before { subject.stub(:say) }
-
-  it "calls `git push`" do
-    subject.should_receive(:run).
-      with("git push origin master").
-      and_return(true)
-    subject.sync_github
-  end
-
-  context "when `git push` fails" do
-    before { subject.stub(:run => false) }
-
-    it "prints an error message" do
-      subject.should_receive(:error).with("Failed to push master -> origin")
-
-      subject.sync_github
-    end
-  end
+  let(:git_mock) { mock() }
 
-  context "when syncing github succeeds" do
-    before { subject.stub(:run => true) }
+  before { subject.stub(:git => git_mock) }
 
-    it "does not raise an error" do
-      subject.should_not_receive(:error)
-      subject.sync_github
-    end
-
-    it "prints a success message" do
-      subject.should_receive(:success).with("Pushed master -> origin")
-
-      subject.sync_github
-    end
+  it "calls git.push" do
+    git_mock.should_receive(:push).with("master")
+    subject.sync_github
   end
 end
 
 describe Kumade::Deployer, "#sync_heroku" do
   let(:environment) { 'my-env' }
-  subject { Kumade::Deployer.new(environment) }
-  before { subject.stub(:say) }
-  
-  context "when deploy branch exists" do
-    it "should calls `git push -f`" do
-      subject.stub(:branch_exist?).with("deploy").and_return(true)
-      subject.should_receive(:run).
-        with("git push -f #{environment} deploy:master").
-        and_return(true)
-      subject.sync_heroku
-    end
-  end
-
-  context "when deploy branch doesn't exists" do
-    it "should calls `git branch deploy` and `git push -f`" do
-      subject.stub(:branch_exist?).with("deploy").and_return(false)
-      subject.should_receive(:run).
-        with("git branch deploy").
-        and_return(true)
-      subject.should_receive(:run).
-        with("git push -f #{environment} deploy:master").
-        and_return(true)
-      subject.sync_heroku
-    end
-  end
+  let(:git_mock)    { mock() }
 
-  context "when syncing to heroku fails" do
-    before do
-      subject.stub(:run => false)
-    end
-
-    it "prints an error" do
-      subject.should_receive(:error).twice
-      subject.sync_heroku
-    end
-  end
-
-  context "when syncing to heroku succeeds" do
-    before do
-      subject.stub(:run => true)
-      subject.stub(:say)
-    end
-
-    it "does not raise an error" do
-      subject.should_not_receive(:error)
-      subject.sync_heroku
-    end
+  subject { Kumade::Deployer.new(environment) }
 
-    it "prints a success message" do
-      subject.should_receive(:success).
-        with("Force pushed master -> #{environment}")
+  before { subject.stub(:git => git_mock) }
 
-      subject.sync_heroku
-    end
+  it "calls git.create and git.push" do
+    git_mock.should_receive(:create).with("deploy")
+    git_mock.should_receive(:push).with("deploy:master", environment, true)
+    subject.sync_heroku
   end
 end
 
 describe Kumade::Deployer, "#ensure_clean_git" do
-  before { subject.stub(:say) }
+  let(:git_mock) { mock() }
 
-  context "when git is dirty" do
-    before { subject.stub(:git_dirty? => true) }
+  before { subject.stub(:git => git_mock) }
 
-    it "prints an error" do
-      subject.should_receive(:error).with("Cannot deploy: repo is not clean.")
-      subject.ensure_clean_git
-    end
-  end
-
-  context "when git is clean" do
-    before { subject.stub(:git_dirty? => false) }
-
-    it "prints a success message" do
-      subject.should_not_receive(:error)
-      subject.should_receive(:success).with("Git repo is clean")
-
-      subject.ensure_clean_git
-    end
+  it "calls git.ensure_clean_git" do
+    git_mock.should_receive(:ensure_clean_git)
+    subject.ensure_clean_git
   end
 end
 
@@ -261,7 +180,7 @@ describe Kumade::Deployer, "#package_with_jammit" do
   end
 
   context "with updated assets" do
-    before { subject.stub(:git_dirty? => true) }
+    before { subject.stub(:git => mock(:dirty? => true)) }
 
     it "prints the correct message" do
       subject.should_receive(:success).with("Packaged assets with Jammit")
@@ -290,12 +209,13 @@ describe Kumade::Deployer, "#package_with_jammit" do
 end
 
 describe Kumade::Deployer, "#invoke_custom_task" do
+  let(:task) { stub('task', :invoke => nil) }
+
   before do
+    subject.stub(:say)
     Rake::Task.stub(:[] => task)
   end
 
-  let(:task) { stub('task', :invoke => nil) }
-
   it "calls deploy task" do
     Rake::Task.should_receive(:[]).with("kumade:before_asset_compilation")
     task.should_receive(:invoke)
@@ -318,14 +238,14 @@ describe Kumade::Deployer, "#package_with_more" do
   context "with changed assets" do
     it "prints a success message" do
       subject.stub(:run).with("bundle exec rake more:generate")
-      subject.stub(:git_dirty? => true)
+      subject.stub(:git => mock(:dirty? => true))
       subject.should_receive(:success).with("Packaged assets with More")
 
       subject.package_with_more
     end
 
     it "calls git_add_and_commit_all_assets_in if assets were added" do
-      subject.stub(:git_dirty?       => true,
+      subject.stub(:git => mock(:dirty? => true),
                    :more_assets_path => 'blerg')
       subject.stub(:run).with("bundle exec rake more:generate")
       subject.should_receive(:git_add_and_commit_all_assets_in).
@@ -339,7 +259,7 @@ describe Kumade::Deployer, "#package_with_more" do
   context "with no changed assets" do
     it "prints no message" do
       subject.stub(:run).with("bundle exec rake more:generate")
-      subject.stub(:git_dirty? => false)
+      subject.stub(:git => mock(:dirty? => false))
       subject.should_not_receive(:say)
 
       subject.package_with_more
@@ -347,7 +267,7 @@ describe Kumade::Deployer, "#package_with_more" do
 
     it "does not call git_add_and_commit_all_more_assets" do
       subject.stub(:run).with("bundle exec rake more:generate")
-      subject.stub(:git_dirty? => false)
+      subject.stub(:git => mock(:dirty? => false))
       subject.should_not_receive(:git_add_and_commit_all_assets_in)
 
       subject.package_with_more
@@ -368,29 +288,13 @@ describe Kumade::Deployer, "#package_with_more" do
 end
 
 describe Kumade::Deployer, "#git_add_and_commit_all_assets_in" do
-  before do
-    subject.stub(:run => true)
-    subject.stub(:say)
-  end
-
-  it "prints a success message" do
-    subject.should_receive(:success).with("Added and committed all assets")
-
-    subject.git_add_and_commit_all_assets_in('blerg')
-  end
-
-  it "runs the correct commands" do
-    subject.should_receive(:run).
-      with("git checkout -b deploy && git add -f blerg && git commit -m 'Compiled assets'")
-
-    subject.git_add_and_commit_all_assets_in('blerg')
-  end
+  let(:git_mock) { mock() }
 
-  it "prints an error if it could not add and commit assets" do
-    subject.stub(:run => false)
-    subject.should_receive(:error).with("Cannot deploy: couldn't commit assets")
+  before { subject.stub(:git => git_mock) }
 
-    subject.git_add_and_commit_all_assets_in('blerg')
+  it "calls git.add_and_commit_all_in" do
+    git_mock.should_receive(:add_and_commit_all_in).with("dir", 'deploy', 'Compiled assets', "Added and committed all assets", "couldn't commit assets")
+    subject.git_add_and_commit_all_assets_in("dir")
   end
 end
 
@@ -465,32 +369,30 @@ describe Kumade::Deployer, "#custom_task?" do
 end
 
 describe Kumade::Deployer, "#heroku_migrate" do
-  let(:environment){ 'staging' }
-  let(:app_name){ 'sushi' }
+  let(:environment) { 'staging' }
 
   before do
     subject.stub(:say)
-    force_add_heroku_remote(environment, app_name)
+    force_add_heroku_remote(environment)
   end
 
   it "runs db:migrate with the correct app" do
     subject.stub(:run => true)
     subject.should_receive(:heroku).
-      with("rake db:migrate", app_name)
-    subject.should_receive(:success).with("Migrated #{app_name}")
+      with("rake db:migrate")
+    subject.should_receive(:success).with("Migrated staging")
 
     subject.heroku_migrate
   end
 end
 
 describe Kumade::Deployer, "#ensure_heroku_remote_exists" do
-  let(:environment){ 'staging' }
-  let(:bad_environment){ 'bad' }
-  let(:staging_app_name) { 'staging-sushi' }
+  let(:environment)     { 'staging' }
+  let(:bad_environment) { 'bad' }
 
   before do
     subject.stub(:say)
-    force_add_heroku_remote(environment, staging_app_name)
+    force_add_heroku_remote(environment)
     `git remote add #{bad_environment} blerg@example.com`
   end
 
@@ -533,61 +435,52 @@ describe Kumade::Deployer, "#ensure_heroku_remote_exists" do
   end
 end
 
-describe Kumade::Deployer, "#remote_exists?" do
-  let(:remote_name){ 'staging' }
-
-  before { force_add_heroku_remote(remote_name, 'i-am-a-heroku-app') }
-
-  it "returns true if the remote exists" do
-    subject.remote_exists?(remote_name).should be_true
+describe Kumade::Deployer, "#cedar?" do
+  context "when on Cedar" do
+    subject { Kumade::Deployer.new('staging', false) }
+    before  { subject.stub(:heroku).and_return("  bamboo\n* cedar\n") }
+    its(:cedar?) { should be_true }
   end
 
-  it "returns false if the remote does not exist" do
-    remove_remote(remote_name)
-
-    subject.remote_exists?(remote_name).should be_false
+  context "when not on Cedar" do
+    subject { Kumade::Deployer.new('staging', false) }
+    before  { subject.stub(:heroku).and_return("* bamboo\n  cedar\n") }
+    its(:cedar?) { should be_false }
   end
 end
 
 describe Kumade::Deployer, "#heroku" do
-  let(:app_name){ 'sushi' }
-
   context "when on Cedar" do
-    subject { Kumade::Deployer.new('staging', false, cedar = true) }
-
+    subject { Kumade::Deployer.new('staging', false) }
+    before  { subject.stub(:cedar?).and_return(true) }
     it "runs commands with `run`" do
-      subject.should_receive(:run_or_error).with("bundle exec heroku run rake --app #{app_name}", //)
-      subject.heroku("rake", app_name)
+      subject.should_receive(:run_or_error).with("bundle exec heroku run rake --remote staging", //)
+      subject.heroku("rake")
     end
   end
 
   context "when not on Cedar" do
-    subject { Kumade::Deployer.new('staging', false, cedar = false) }
-
+    subject { Kumade::Deployer.new('staging', false) }
+    before  { subject.stub(:cedar?).and_return(false) }
     it "runs commands without `run`" do
-      subject.should_receive(:run_or_error).with("bundle exec heroku rake --app #{app_name}", //)
-      subject.heroku("rake", app_name)
+      subject.should_receive(:run_or_error).with("bundle exec heroku rake --remote staging", //)
+      subject.heroku("rake")
     end
   end
 end
 
-describe Kumade::Deployer, "#success" do
-  it "exists" do
-    subject.should respond_to(:success)
-  end
-end
-
-describe Kumade::Deployer, "#error" do
-  it "exists" do
-    subject.should respond_to(:error)
-  end
-end
-
 describe Kumade::Deployer, "#post_deploy" do
-  before { subject.stub(:run => true, :say => true) }
+  let(:git_mock) { mock() }
+
+  before { subject.stub(:git => git_mock) }
 
-  it "cleans up the deploy branch" do
-    subject.should_receive(:run).with('git checkout master && git branch -D deploy')
+  it "calls git.delete" do
+    git_mock.should_receive(:delete).with('deploy', 'master')
     subject.post_deploy
   end
+
+  it "prints its message and raises its message" do
+    subject.should_receive(:say).with("==> ! I'm an error!", :red)
+    lambda { subject.error("I'm an error!") }.should raise_error(Kumade::DeploymentError)
+  end
 end