kumade 0.6.0 → 0.7.0

data/.gitignore

@@ -6,3 +6,4 @@ tmp/
 .rake_tasks
 *.sw[op]
 .rvmrc
+coverage/

data/.simplecov

@@ -0,0 +1,7 @@
+# vim: syntax=ruby ft=ruby
+if ENV['COVERAGE']
+  SimpleCov.start do
+    add_filter "/spec/"
+    add_filter "/features/"
+  end
+end

data/Changelog.md

@@ -1,3 +1,6 @@
+## 0.7.0 (2011-10-15)
+* Kumade now has a working check for the Cedar stack.
+
 ## 0.6.0 (2011-10-15)
 * Remove thor dependency, since Thor is no longer in the gem.
 

data/README.md

@@ -13,8 +13,8 @@ Before deploying, Kumade ensures the git repo is clean.
 After that, it packages assets using
 [Jammit](http://documentcloud.github.com/jammit/) and/or
 [More](https://github.com/cloudhead/more), commits them, and pushes to origin.
-Then it force pushes to the correct Heroku remote and runs `rake db:migrate` on the
-Heroku app.
+Then it force pushes to the correct Heroku remote, runs `rake db:migrate` on the
+Heroku app, and then restarts the app.
 
 If any step fails, it immediately prints an error and stops the deploy
 process.
@@ -22,9 +22,7 @@ process.
 ## Install
 In your Gemfile:
 
-```ruby
-gem 'kumade'
-```
+    gem 'kumade'
 
 ## Usage
 
@@ -70,16 +68,19 @@ Tested against:
 
 Want to run a task before bundling your assets on deploy? In your Rails app's rake tasks, drop in:
 
-``` ruby
-namespace :kumade do
-  task :before_asset_compilation do
-    puts "This runs before assets are committed and pushed to the remote"
-  end
-end
-```
+    namespace :kumade do
+      task :before_asset_compilation do
+        puts "This runs before assets are committed and pushed to the remote"
+      end
+    end
 
 You can hook in any custom code you want to run there before deploying!
 
+## Development
+To generate coverage (only on 1.9.x), run rake with COVERAGE set:
+
+    COVERAGE=1 rake
+
 ## What's with the name?
 
 Kumade ([pronunciation here](http://translate.google.com/#ja|en|熊手)) means

data/features/kumade_executable.feature

@@ -28,6 +28,7 @@ Feature: Kumade executable
               git push -f pretend-staging deploy:master
       ==> Pushed deploy:master -> pretend-staging
       ==> Migrated pretend-staging
+      ==> Restarted pretend-staging
       ==> Deployed to: pretend-staging
       """
     But the output should not contain "==> Packaged with Kumade::MorePackager"
@@ -58,6 +59,7 @@ Feature: Kumade executable
               git push -f pretend-staging deploy:master
       ==> Pushed deploy:master -> pretend-staging
       ==> Migrated pretend-staging
+      ==> Restarted pretend-staging
       ==> Deployed to: pretend-staging
       """
 

data/features/support/env.rb

@@ -1,3 +1,8 @@
+begin
+  require 'simplecov'
+rescue LoadError
+  # Probably on 1.8.7, ignore.
+end
 require 'aruba/cucumber'
 require 'kumade'
 

data/kumade.gemspec

@@ -27,4 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jammit', '~> 0.6.3')
   s.add_development_dependency('less', '~> 2.0')
   s.add_development_dependency('bourne')
+  if RUBY_VERSION >= '1.9.0'
+    s.add_development_dependency('simplecov')
+  end
 end

data/lib/kumade/command_line.rb

@@ -18,7 +18,6 @@ module Kumade
     def run
       begin
         @command_line.run
-        true
       rescue Cocaine::ExitStatusError, Cocaine::CommandNotFoundError
         false
       end

data/lib/kumade/deployer.rb

@@ -18,6 +18,7 @@ module Kumade
         pre_deploy
         heroku.sync
         heroku.migrate_database
+        heroku.restart_app
       rescue => deploying_error
         Kumade.configuration.outputter.error("#{deploying_error.class}: #{deploying_error.message}")
       ensure

data/lib/kumade/heroku.rb

@@ -20,6 +20,11 @@ module Kumade
       Kumade.configuration.outputter.success("Migrated #{Kumade.configuration.environment}")
     end
 
+    def restart_app
+      heroku("restart") unless Kumade.configuration.pretending?
+      Kumade.configuration.outputter.success("Restarted #{Kumade.configuration.environment}")
+    end
+
     def delete_deploy_branch
       git.delete(DEPLOY_BRANCH, @branch)
     end

data/lib/kumade/outputter.rb

@@ -1,21 +1,21 @@
 module Kumade
   class Outputter
     def success(message)
-      puts "==> #{message}"
+      STDOUT.puts "==> #{message}"
     end
 
     def info(message)
-      puts "==> #{message}"
+      STDOUT.puts "==> #{message}"
     end
 
     def error(message)
-      puts "==> ! #{message}"
+      STDOUT.puts "==> ! #{message}"
       raise Kumade::DeploymentError, message
     end
 
     def say_command(command)
       prefix = " " * 8
-      puts "#{prefix}#{command}"
+      STDOUT.puts "#{prefix}#{command}"
     end
   end
 end

data/lib/kumade/version.rb

@@ -1,3 +1,3 @@
 module Kumade
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/kumade/cli_spec.rb

@@ -70,8 +70,8 @@ describe Kumade::CLI, ".deployer" do
 end
 
 describe Kumade::CLI, ".swapping_stdout_for" do
-  let(:stdout) { $stdout }
-  let(:output) { StringIO.new }
+  let!(:stdout) { $stdout }
+  let(:output)  { StringIO.new }
 
   before do
     stdout.stubs(:print => nil, :puts => nil)
@@ -83,6 +83,7 @@ describe Kumade::CLI, ".swapping_stdout_for" do
     end
 
     stdout.should have_received(:print).never
+    stdout.should have_received(:puts).never
 
     output.rewind
     output.read.should == "Hello, you can't see me.\n"
@@ -94,7 +95,7 @@ describe Kumade::CLI, ".swapping_stdout_for" do
       raise Kumade::DeploymentError.new("error")
     end
 
-    stdout.should have_received(:print)
+    stdout.should have_received(:print).with("Hello, you can see me!\n")
   end
 
   context "in print output mode" do
@@ -103,7 +104,7 @@ describe Kumade::CLI, ".swapping_stdout_for" do
         $stdout.puts "Hello, you can see me!"
       end
 
-      stdout.should have_received(:puts)
+      stdout.should have_received(:puts).with("Hello, you can see me!")
     end
   end
 end

data/spec/kumade/command_line_spec.rb

@@ -4,7 +4,7 @@ describe Kumade::CommandLine, "#run_or_error", :with_mock_outputter do
   subject { Kumade::CommandLine.new("echo") }
 
   context "when pretending" do
-    let(:command_line) { stub("Cocaine::CommandLine instance", :run => nil, :command => 'command') }
+    let(:command_line) { stub("Cocaine::CommandLine instance", :run => "does-not-matter", :command => 'command') }
 
     before do
       Cocaine::CommandLine.stubs(:new).returns(command_line)
@@ -24,12 +24,16 @@ describe Kumade::CommandLine, "#run_or_error", :with_mock_outputter do
   end
 
   context "when successful" do
+    let(:command_line)        { stub("Cocaine::CommandLine instance", :run => command_line_result, :command => 'command') }
+    let(:command_line_result) { "result" }
+
     before do
+      Cocaine::CommandLine.stubs(:new).returns(command_line)
       Kumade.configuration.pretending = false
     end
 
-    it "returns true" do
-      subject.run_or_error.should be_true
+    it "returns the result of running the command" do
+      subject.run_or_error.should == command_line_result
     end
   end
 
@@ -48,8 +52,9 @@ describe Kumade::CommandLine, "#run_or_error", :with_mock_outputter do
 end
 
 describe Kumade::CommandLine, "#run_with_status", :with_mock_outputter do
-  let(:command)      { "echo" }
-  let(:command_line) { stub("Cocaine::CommandLine instance", :run => nil, :command => command) }
+  let(:command)      { "echo blah" }
+  let(:command_line_result) { "blah\n" }
+  let(:command_line) { stub("Cocaine::CommandLine instance", :run => command_line_result, :command => command) }
   subject            { Kumade::CommandLine.new(command) }
 
   before do
@@ -72,7 +77,7 @@ describe Kumade::CommandLine, "#run_with_status", :with_mock_outputter do
     end
 
     it "returns true" do
-      subject.run_with_status.should be_true
+      subject.run_with_status.should == true
     end
   end
 
@@ -84,15 +89,19 @@ describe Kumade::CommandLine, "#run_with_status", :with_mock_outputter do
 
       command_line.should have_received(:run).once
     end
+
+    it "returns the result of running the command" do
+      subject.run_with_status.should == command_line_result
+    end
   end
 end
 
 describe Kumade::CommandLine, "#run", :with_mock_outputter do
   context "when successful" do
-    subject { Kumade::CommandLine.new("echo") }
+    subject { Kumade::CommandLine.new("echo -n blah") }
 
-    it "returns true" do
-      subject.run.should == true
+    it "returns the result of running the command" do
+      subject.run.should == "blah"
     end
   end
 

data/spec/kumade/deployer_spec.rb

@@ -23,6 +23,7 @@ describe Kumade::Deployer, "#deploy", :with_mock_outputter do
     subject.expects(:pre_deploy)
     subject.heroku.expects(:sync)
     subject.heroku.expects(:migrate_database)
+    subject.heroku.expects(:restart_app)
     subject.expects(:post_deploy)
 
     subject.deploy

data/spec/kumade/heroku_spec.rb

@@ -56,6 +56,39 @@ describe Kumade::Heroku, "#migrate_database", :with_mock_outputter do
   end
 end
 
+describe Kumade::Heroku, "#restart_app", :with_mock_outputter do
+  let(:environment) { 'staging' }
+
+  before do
+    subject.stubs(:heroku)
+    force_add_heroku_remote(environment)
+  end
+
+  it "runs the heroku restart command" do
+    subject.restart_app
+
+    subject.should have_received(:heroku).with("restart")
+  end
+
+  it "prints a message" do
+    subject.restart_app
+
+    Kumade.configuration.outputter.should have_received(:success).with(regexp_matches(/Restarted #{environment}/))
+  end
+
+  context "when pretending" do
+    before do
+      Kumade.configuration.pretending = true
+    end
+
+    it "does not run the command" do
+      subject.restart_app
+
+      subject.should have_received(:heroku).never
+    end
+  end
+end
+
 describe Kumade::Heroku, "#heroku", :with_mock_outputter do
   let(:command_instance) { stub("Kumade::CommandLine instance", :run_or_error => true) }
 

data/spec/kumade/packagers/noop_packager_spec.rb

@@ -1,9 +1,11 @@
 require "spec_helper"
 
-describe Kumade::NoopPackager, :with_mock_outputter do
+describe Kumade::NoopPackager do
   subject { Kumade::NoopPackager }
 
   it_should_behave_like "packager"
 
   its(:assets_path) { should == "" }
+
+  it { should_not be_installed }
 end

data/spec/spec_helper.rb

@@ -1,3 +1,9 @@
+begin
+  require 'simplecov'
+rescue LoadError
+  # Probably on 1.8.7, ignore.
+end
+
 require 'rspec'
 require 'aruba/api'
 require 'bourne'

data/spec/support/heroku.rb

@@ -1,33 +1,23 @@
 shared_context "when on Cedar" do
-  let(:command_line) { mock("Kumade::CommandLine instance") }
+  let(:command_line)  { mock("Kumade::CommandLine") }
+  let(:stack_command) { "bundle exec heroku stack --remote staging" }
+  let(:heroku_output) { ["aspen-mri-1.8.6", "bamboo-mri-1.9.2", "bamboo-ree-1.8.7", "* cedar (beta)"].join("\n") }
 
   before do
-    Kumade::CommandLine.expects(:new).
-      with("bundle exec heroku stack --remote staging").
-      returns(command_line)
+    Kumade::CommandLine.expects(:new).with(stack_command).returns(command_line)
 
-    command_line.expects(:run_or_error).returns(%{
-  aspen-mri-1.8.6
-  bamboo-mri-1.9.2
-  bamboo-ree-1.8.7
-* cedar (beta)
-})
+    command_line.expects(:run_or_error).returns(heroku_output)
   end
 end
 
 shared_context "when not on Cedar" do
-  let(:command_line) { mock("Kumade::CommandLine") }
+  let(:command_line)  { mock("Kumade::CommandLine") }
+  let(:stack_command) { "bundle exec heroku stack --remote staging" }
+  let(:heroku_output) { ["aspen-mri-1.8.6", "* bamboo-mri-1.9.2", "bamboo-ree-1.8.7", "cedar (beta)"].join("\n") }
 
   before do
-    Kumade::CommandLine.expects(:new).
-      with("bundle exec heroku stack --remote staging").
-      returns(command_line)
+    Kumade::CommandLine.expects(:new).with(stack_command).returns(command_line)
 
-    command_line.expects(:run_or_error).returns(%{
-  aspen-mri-1.8.6
-* bamboo-mri-1.9.2
-  bamboo-ree-1.8.7
-  cedar (beta)
-})
+    command_line.expects(:run_or_error).returns(heroku_output)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumade
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2153892060 !ruby/object:Gem::Requirement
+  requirement: &70180072865600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153892060
+  version_requirements: *70180072865600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153891080 !ruby/object:Gem::Requirement
+  requirement: &70180072864740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153891080
+  version_requirements: *70180072864740
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &2153890460 !ruby/object:Gem::Requirement
+  requirement: &70180072862960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153890460
+  version_requirements: *70180072862960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153889820 !ruby/object:Gem::Requirement
+  requirement: &70180072854560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2153889820
+  version_requirements: *70180072854560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153889040 !ruby/object:Gem::Requirement
+  requirement: &70180072853060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153889040
+  version_requirements: *70180072853060
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153888380 !ruby/object:Gem::Requirement
+  requirement: &70180072851460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153888380
+  version_requirements: *70180072851460
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2153887700 !ruby/object:Gem::Requirement
+  requirement: &70180072850160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *2153887700
+  version_requirements: *70180072850160
 - !ruby/object:Gem::Dependency
   name: jammit
-  requirement: &2153887040 !ruby/object:Gem::Requirement
+  requirement: &70180072849500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.6.3
   type: :development
   prerelease: false
-  version_requirements: *2153887040
+  version_requirements: *70180072849500
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &2153886240 !ruby/object:Gem::Requirement
+  requirement: &70180072848760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2153886240
+  version_requirements: *70180072848760
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &2153885660 !ruby/object:Gem::Requirement
+  requirement: &70180072848100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153885660
+  version_requirements: *70180072848100
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70180072840840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70180072840840
 description: A well-tested script for easy deploying to Heroku
 email:
 - gabe@thoughtbot.com
@@ -132,6 +143,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .simplecov
 - .travis.yml
 - Changelog.md
 - Gemfile
@@ -199,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1939713887165989663
+      hash: -2390276882750566623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,10 +220,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1939713887165989663
+      hash: -2390276882750566623
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A well-tested script for easy deploying to Heroku