kibo 0.3.3 → 0.3.4

data/bin/kibo

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift File.join(File.dirname(__FILE__), "../lib")
 
-require_relative "../lib/kibo"
+require "kibo"
 Kibo.run

data/lib/kibo/commandline.rb

@@ -1,5 +1,4 @@
 require "trollop"
-require "kibo/version"
 
 module Kibo::CommandLine
   extend self

data/lib/kibo/commands/deploy.rb

@@ -10,47 +10,74 @@ module Kibo::Commands
       h.check_missing_remotes(:error)
     end
 
-    run_commands Kibo.config.deployment["first"]
-    W "first commands done"
-
+    ENV["ENVIRONMENT"] = 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
+    # Run source commands
+    with_commands :source do
+
+      # create a deployment branch, if there is none yet.
+      in_branch "kibo.#{Kibo.environment}" do
+        git "merge", "master"
+
+        with_commands :deployment do
+          h.configured_remotes.each do |remote| 
+            deploy_remote! remote
+          end
+        end
+      end
     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
+
+  def with_commands(sym, &block)
+    commands_hash = Kibo.config.send(sym) || {}
+    
+    run = lambda { |key| 
+      next unless commands = commands_hash[key]
+
+      W "Running #{sym}.#{key} commands"
+      [ *commands ].each do |command|
+        Kibo::System.sh! command
+      end
+    }
+
+    run.call("pre")
+
+    yield
+
+    run.call("success")
+  ensure
+    run.call("final")
+  end
   
-  def checkout_branch(name)
-    unless branches.include?(name)
-      Kibo::System.git "branch", name
+  #
+  # checkout the branch +name+, create it if necessary.
+  def in_branch(name, &block)
+    previous_branch = current_branch
+
+    if name != previous_branch
+      git "branch", name unless branches.include?(name)
+      git "checkout", name
     end
     
-    git "checkout", name
+    yield
+  rescue StandardError
+    STDERR.puts $!
+    raise
+  ensure
+    unless current_branch == previous_branch
+      git "reset", "--hard"
+      git "checkout", previous_branch
+    end
   end
-  
+
   def current_branch
-    `git branch`.split(/\n/).detect do |line|
-      line =~ /^* /
-    end.sub(/^\* /, "")
+    `git rev-parse --abbrev-ref HEAD`.chomp
   end
   
   def branches
@@ -59,15 +86,6 @@ module Kibo::Commands
   end
     
   def deploy_remote!(remote)
-    git "push", remote, "HEAD:master"
-  end
-
-  def run_commands(commands)
-    return unless commands
-    commands = [ commands ] if commands.is_a?(String)
-
-    commands.each do |command|
-      Kibo::System.sh! command
-    end
+    git "push", "--force", remote, "HEAD:master"
   end
 end

data/lib/kibo/config.rb

@@ -55,6 +55,8 @@ class Kibo::Config
       W "No such file", path
     end
     
+    verify_version!
+    
     @procfile = Kibo::Configfile.new(self["procfile"])
   end
   
@@ -66,6 +68,23 @@ class Kibo::Config
     end
   end
 
+  def verify_version!
+    return unless self["version"]
+
+    files_version = self["version"].split(".").map(&:to_i)
+    kibos_version = Kibo::VERSION.split(".").map(&:to_i)
+
+    files_version.zip(kibos_version).each do |files, kibos|
+      next if kibos == files
+      if kibos > files
+        W "The Kibofile requires kibo version #{self["version"]}. You have #{Kibo::VERSION}... this might work."
+        return
+      end
+      
+      E "The Kibofile requires kibo version #{self["version"]}. You have #{Kibo::VERSION}."
+    end
+  end
+
   #
   # we need namespace-ENVIRONMENT-process<1>
   
@@ -78,6 +97,11 @@ class Kibo::Config
   def deployment
     self["deployment"] || {}
   end
+
+  # returns source specific configuration
+  def source
+    self["source"] || {}
+  end
   
   # returns the heroku namespace
   def namespace

data/lib/kibo/version.rb

@@ -1,3 +1,3 @@
 module Kibo
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/kibo.rb

@@ -1,6 +1,7 @@
 module Kibo
 end
 
+require_relative "kibo/version"
 require_relative "kibo/log"
 require_relative "kibo/system"
 require_relative "kibo/config"

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.3" "Kibo Manual"
+.TH "KIBO" "1" "September 2012" "Kibo 0.3.4" "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.3</li>
+    <li class='tl'>Kibo 0.3.4</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.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3660277376767937513
+      hash: -3856345431074645108
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: