kibo 0.3.1 → 0.3.2

data/lib/kibo/commands/deploy.rb

@@ -9,29 +9,29 @@ module Kibo::Commands
     else
       h.check_missing_remotes(:error)
     end
-      #
-      # create a deployment branch, if there is none yet.
-      checkout_branch Kibo.environment
+    #
+    # create a deployment branch, if there is none yet.
+    checkout_branch Kibo.environment
+  
+    git "merge", "master"
+    run_commands Kibo.config.deployment["pre"]
+    W "pre commands done"
+    
+    h.configured_remotes.each do |remote| 
+      deploy_remote! remote
+    end
     
-      git "merge", "master"
-      run_commands Kibo.config.deployment["pre"]
-      W "pre commands done"
-      
-      h.configured_remotes.each do |remote| 
-        deploy_remote! remote
-      end
-      
-      W "Deployment succeeded."
-      run_commands Kibo.config.deployment["post"]
-    rescue StandardError
-      W $!
-      raise
-    ensure
-      unless current_branch == "master"
-        git "reset", "--hard"
-        git "checkout", "master"
-      end
+    W "Deployment succeeded."
+    run_commands Kibo.config.deployment["post"]
+  rescue StandardError
+    W $!
+    raise
+  ensure
+    unless current_branch == "master"
+      git "reset", "--hard"
+      git "checkout", "master"
     end
+  end
 
   private
   
@@ -55,7 +55,7 @@ module Kibo::Commands
   end
     
   def deploy_remote!(remote)
-    git "push", remote, "master"
+    git "push", remote, "HEAD:master"
   end
 
   def run_commands(commands)

data/lib/kibo/commands/reconfigure.rb

@@ -3,9 +3,9 @@ module Kibo::Commands
 
   # kibo [options] reconfigure                ... reconfigure all existing remotes
   def reconfigure
-    check_missing_remotes :warn
+    h.check_missing_remotes :warn
     
-    configured_remotes.each do |remote| 
+    h.configured_remotes.each do |remote| 
       configure_remote! remote
     end
   end

data/lib/kibo/commands/spin.rb

@@ -7,7 +7,7 @@ module Kibo::Commands
   subcommand :spindown, "stops all remote instances"
 
   def spinup
-    check_missing_remotes(Kibo.command_line.force? ? :warn : :error)
+    h.check_missing_remotes(Kibo.command_line.force? ? :warn : :error)
     spin Kibo.config.processes
   end
 
@@ -23,7 +23,7 @@ module Kibo::Commands
       
       remotes.each do |remote|
         if number_of_processes > 0
-          configure_remote remote 
+          h.configure_remote remote 
           heroku "ps:scale", "#{name}=1", "--app", remote
           number_of_processes -= 1
         else

data/lib/kibo/helpers.rb

@@ -8,6 +8,10 @@ module Kibo::Helpers
   extend self
 
   extend Heroku
+
+  def sys
+    Kibo::System
+  end
   
   def check_missing_remotes(mode = :warn)
     return if missing_remotes.empty?
@@ -29,7 +33,7 @@ Missing remote(s): #{missing_remotes.map(&:inspect).join(", ")}. Run
   # -- configure remotes ----------------------------------------------
   
   def configure_remote!(remote)
-    heroku "config:set", 
+    sys.heroku "config:set", 
       "RACK_ENV=#{environment}", 
       "RAILS_ENV=#{environment}", 
       "INSTANCE=#{instance_for_remote(remote)}", 
@@ -45,8 +49,8 @@ Missing remote(s): #{missing_remotes.map(&:inspect).join(", ")}. Run
     # name of the of the remote without the namespace part; e.g. the 
     # INSTANCE for the remote named "bountyhill-staging-twirl2" is 
     # "staging-twirl2".
-    instance = remote[config.namespace.length + 1 .. -1]
-    current_instance = heroku "config:get", "INSTANCE", "--app", remote
+    instance = remote[Kibo.config.namespace.length + 1 .. -1]
+    current_instance = sys.heroku "config:get", "INSTANCE", "--app", remote
     return if instance == current_instance
   end
 

data/lib/kibo/version.rb

@@ -1,3 +1,3 @@
 module Kibo
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/kibo.rb

@@ -1,6 +1,3 @@
-require "pp"
-require "heroku"
-
 module Kibo
 end
 

data/man/kibo.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KIBO" "1" "September 2012" "Kibo 0.3.1" "Kibo Manual"
+.TH "KIBO" "1" "September 2012" "Kibo 0.3.2" "Kibo Manual"
 .
 .SH "NAME"
 \fBkibo\fR \- manage heroku applications

data/man/kibo.1.html

@@ -172,7 +172,7 @@ kibo -e production spindown
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Kibo 0.3.1</li>
+    <li class='tl'>Kibo 0.3.2</li>
     <li class='tc'>September 2012</li>
     <li class='tr'>kibo(1)</li>
   </ol>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kibo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1974233322748316422
+      hash: -2765814247850884652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: