kumade 0.1.0 → 0.2.0

data/README.md

@@ -1,4 +1,4 @@
-# Kumade [![Build Status](https://secure.travis-ci.org/thoughtbot/kumade.png)](http://travis-ci.org/gabebw/kumade)
+# Kumade [![Build Status](https://secure.travis-ci.org/thoughtbot/kumade.png)](http://travis-ci.org/thoughtbot/kumade)
 Kumade is a set of basic Rake tasks for deploying to Heroku. It aims to
 provide most of what you want. Unlike other Heroku deploy gems, it is
 well-tested.

data/bin/kumade

@@ -2,4 +2,4 @@
 
 require 'kumade'
 
-Kumade::ThorTask.start
+Kumade::Runner.run

data/features/kumade_executable.feature

@@ -16,7 +16,7 @@ Feature: Kumade executable
     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`
+    When I run `kumade pretend-staging -p`
     Then the output should contain "In Pretend Mode"
     And the output should contain:
       """
@@ -37,10 +37,26 @@ Feature: Kumade executable
     Then the output should contain "==> Deployed to: staging"
 
   Scenario: Can deploy to arbitrary environment
-    When I run `kumade deploy bamboo`
+    When I run `kumade bamboo`
     Then the output should contain "==> Deploying to: bamboo"
     Then the output should match /Cannot deploy: /
 
   Scenario: Deploying to a non-Heroku remote fails
-    When I run `kumade deploy bad-remote`
+    When I run `kumade bad-remote`
     Then the output should match /==> ! Cannot deploy: "bad-remote" remote does not point to Heroku/
+
+  Scenario: Deploy from another branch
+    When I run `git checkout -b new_branch`
+    When I run `kumade pretend-staging -p`
+    Then the output should contain:
+      """
+      ==> Git repo is clean
+      ==> Packaged assets with Jammit
+               run  git push origin new_branch
+      ==> Pushed new_branch -> origin
+               run  git push -f pretend-staging deploy:master
+      ==> Force pushed new_branch -> pretend-staging
+      ==> Migrated pretend-staging-app
+               run  git checkout new_branch && git branch -D deploy
+      ==> Deployed to: pretend-staging
+      """

data/kumade.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('heroku')
+  s.add_dependency('heroku', '~> 2.0')
   s.add_dependency('thor', '~> 0.14')
 
   s.add_development_dependency('rake', '~> 0.8.7')

data/lib/kumade.rb

@@ -1,7 +1,6 @@
 require 'thor'
-
 require 'kumade/deployer'
-require 'kumade/thor_task'
+require 'kumade/runner'
 
 module Kumade
   def self.app_for(environment)

data/lib/kumade/deployer.rb

@@ -7,6 +7,7 @@ module Kumade
       super()
       @environment = environment
       @pretending  = pretending
+      @branch      = current_branch
     end
 
     def deploy
@@ -24,15 +25,15 @@ module Kumade
     end
 
     def sync_github
-      run_or_error("git push origin master",
-                   "Failed to push master -> origin")
-      success("Pushed master -> origin")
+      run_or_error("git push origin #{@branch}",
+                   "Failed to push #{@branch} -> origin")
+      success("Pushed #{@branch} -> origin")
     end
 
     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}")
+      success("Force pushed #{@branch} -> #{environment}")
     end
 
     def heroku_migrate
@@ -43,7 +44,7 @@ module Kumade
     end
 
     def post_deploy
-      run_or_error(["git checkout master", "git branch -D #{DEPLOY_BRANCH}"],
+      run_or_error(["git checkout #{@branch}", "git branch -D #{DEPLOY_BRANCH}"],
                    "Failed to clean up #{DEPLOY_BRANCH} branch")
     end
 
@@ -146,20 +147,6 @@ module Kumade
           end)
     end
 
-    def default_task_exists?
-      `rake -s -P | grep 'rake default'`.strip.size > 0
-    end
-
-    def rake_succeeded?
-      return true if pretending
-
-      begin
-        run "bundle exec rake"
-      rescue
-        false
-      end
-    end
-
     def git_dirty?
       `git diff --exit-code`
       !$?.success?
@@ -179,10 +166,6 @@ module Kumade
       config[:capture] ? `#{command}` : system("#{command}")
     end
 
-    def announce(message)
-      say "==> #{message}"
-    end
-
     def error(message)
       say("==> ! #{message}", :red)
       exit 1
@@ -211,5 +194,9 @@ module Kumade
         `git remote` =~ /^#{remote_name}$/
       end
     end
+
+    def current_branch
+      `git symbolic-ref HEAD`.sub("refs/heads/", "").strip
+    end
   end
 end

data/lib/kumade/runner.rb

@@ -0,0 +1,53 @@
+require 'optparse'
+
+module Kumade
+  class Runner
+    class << self
+      attr_reader :environment
+    end
+
+    def self.run(args=ARGV, out=$stdout)
+      @out         = out
+      @options     = parse_arguments!(args)
+      @environment = args.shift || 'staging'
+
+      deploy
+    end
+
+    def self.deploy
+      if pretending?
+        @out.puts "==> In Pretend Mode"
+      end
+      @out.puts "==> Deploying to: #{environment}"
+      Deployer.new(environment, pretending?).deploy
+      @out.puts "==> Deployed to: #{environment}"
+    end
+
+    def self.parse_arguments!(args)
+      options = {}
+      OptionParser.new do |opts|
+        opts.banner = "Usage: kumade <environment> [options]"
+
+        opts.on("-p", "--pretend", "Pretend mode: print what kumade would do") do |p|
+          options[:pretend] = p
+        end
+
+        opts.on_tail('-v', '--version', 'Show version') do
+          @out.puts "kumade #{Kumade::VERSION}"
+          exit
+        end
+
+        opts.on_tail('-h', '--help', 'Show this message') do
+          @out.puts opts
+          exit
+        end
+      end.parse!(args)
+
+      options
+    end
+
+    def self.pretending?
+      @options[:pretend]
+    end
+  end
+end

data/lib/kumade/version.rb

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

data/spec/kumade/deployer_spec.rb

@@ -38,8 +38,6 @@ describe Kumade::Deployer, "#deploy" do
     force_add_heroku_remote(remote_name, app_name)
   end
 
-  after  { remove_remote(remote_name) }
-
   it "calls the correct methods in order" do
     subject.stub(:run => true)
 
@@ -166,25 +164,6 @@ describe Kumade::Deployer, "#ensure_clean_git" do
   end
 end
 
-describe Kumade::Deployer, "#default_task_exists?" do
-  it "returns true because a default task does exist" do
-    subject.default_task_exists?.should be_true
-  end
-end
-
-describe Kumade::Deployer, "#rake_succeeded?" do
-  it "returns true if the default task passed" do
-    subject.should_receive(:run).with("bundle exec rake").and_return(true)
-
-    subject.rake_succeeded?.should be_true
-  end
-
-  it "returns false if the default task failed" do
-    subject.should_receive(:run).with("bundle exec rake").and_raise("blerg")
-    subject.rake_succeeded?.should be_false
-  end
-end
-
 describe Kumade::Deployer, "#package_assets" do
   context "with Jammit installed" do
     it "calls package_with_jammit" do
@@ -418,8 +397,6 @@ describe Kumade::Deployer, "#heroku_migrate" do
     force_add_heroku_remote(environment, app_name)
   end
 
-  after { remove_remote(environment) }
-
   it "runs db:migrate with the correct app" do
     subject.stub(:run => true)
     subject.should_receive(:heroku).
@@ -441,11 +418,6 @@ describe Kumade::Deployer, "#ensure_heroku_remote_exists" do
     `git remote add #{bad_environment} blerg@example.com`
   end
 
-  after do
-    remove_remote(environment)
-    remove_remote(bad_environment)
-  end
-
   context "when the remote points to Heroku" do
     subject { Kumade::Deployer.new(environment) }
 
@@ -489,7 +461,6 @@ describe Kumade::Deployer, "#remote_exists?" do
   let(:remote_name){ 'staging' }
 
   before { force_add_heroku_remote(remote_name, 'i-am-a-heroku-app') }
-  after  { remove_remote(remote_name) }
 
   it "returns true if the remote exists" do
     subject.remote_exists?(remote_name).should be_true
@@ -522,12 +493,6 @@ describe Kumade::Deployer, "#heroku" do
   end
 end
 
-describe Kumade::Deployer, "#announce" do
-  it "exists" do
-    subject.should respond_to(:announce)
-  end
-end
-
 describe Kumade::Deployer, "#success" do
   it "exists" do
     subject.should respond_to(:success)

data/spec/kumade/runner_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Kumade::Runner do
+  subject { Kumade::Runner }
+  let(:out){ StringIO.new }
+  let(:environment){ 'my-environment' }
+
+  %w(-p --pretend).each do |pretend_arg|
+    it "sets pretend mode when run with #{pretend_arg}" do
+      subject.stub(:deploy)
+
+      subject.run([environment, pretend_arg], out)
+      subject.pretending?.should be_true
+    end
+  end
+
+  it "defaults to staging" do
+    subject.stub(:deploy)
+    subject.run([], out)
+    subject.environment.should == 'staging'
+  end
+
+  it "deploys" do
+    Kumade::Deployer.any_instance.should_receive(:deploy)
+
+    subject.run([environment], out)
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'rspec'
 require 'kumade'
 require 'rake'
+require 'stringio'
+require 'aruba/api'
 
 module GitRemoteHelpers
   def force_add_heroku_remote(remote_name, app_name)
@@ -16,4 +18,17 @@ end
 RSpec.configure do |config|
   config.include RSpec::Mocks::Methods
   config.include GitRemoteHelpers
+  config.include Aruba::Api
+
+  config.around do |example|
+    FileUtils.rm_rf(current_dir)
+    FileUtils.mkdir_p(current_dir)
+    in_current_dir do
+      `git init .`
+      `touch .gitkeep`
+      `git add .`
+      `git commit -m First`
+      example.run
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kumade
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gabe Berke-Williams
@@ -16,26 +16,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 -04:00
+date: 2011-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: heroku
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
-  type: :runtime
+        version: "2.0"
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +48,11 @@ dependencies:
         - 0
         - 14
         version: "0.14"
-  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +64,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +80,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +96,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +112,11 @@ dependencies:
         - 4
         - 3
         version: 0.4.3
-  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jammit
   prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,7 +128,6 @@ dependencies:
         - 6
         - 3
         version: 0.6.3
-  type: :development
   version_requirements: *id007
 description: Simple rake tasks for deploying to Heroku
 email: 
@@ -153,10 +154,10 @@ files:
 - kumade.gemspec
 - lib/kumade.rb
 - lib/kumade/deployer.rb
-- lib/kumade/thor_task.rb
+- lib/kumade/runner.rb
 - lib/kumade/version.rb
 - spec/kumade/deployer_spec.rb
-- spec/kumade/thor_task_spec.rb
+- spec/kumade/runner_spec.rb
 - spec/kumade_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Simple rake tasks for deploying to Heroku
@@ -199,6 +200,6 @@ test_files:
 - features/step_definitions/git_steps.rb
 - features/support/env.rb
 - spec/kumade/deployer_spec.rb
-- spec/kumade/thor_task_spec.rb
+- spec/kumade/runner_spec.rb
 - spec/kumade_spec.rb
 - spec/spec_helper.rb

data/lib/kumade/thor_task.rb

@@ -1,18 +0,0 @@
-require 'thor'
-
-module Kumade
-  class ThorTask < Thor
-    default_task :deploy
-
-    desc "deploy [ENV]", "Deploy to ENV (default: staging)"
-    method_option :pretend, :aliases => "-p", :desc => "Pretend Mode - print out what kumade would do", :default => false
-    def deploy(environment = 'staging')
-      say("==> In Pretend Mode", :red) if options[:pretend]
-      say "==> Deploying to: #{environment}"
-
-      Deployer.new(environment, options[:pretend]).deploy
-
-      say "==> Deployed to: #{environment}", :green
-    end
-  end
-end

data/spec/kumade/thor_task_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-module Kumade
-  describe ThorTask, "deploy" do
-    before { subject.stub(:say) }
-
-    let(:environment){ 'bamboo' }
-
-    it "calls the deploy method" do
-      Deployer.any_instance.should_receive(:deploy)
-      subject.deploy(environment)
-    end
-  end
-end