kibo 0.4.0 → 0.4.1

data/lib/kibo/commandline.rb

@@ -10,19 +10,33 @@ module Kibo::CommandLine
   def subcommand
     parse; @subcommand
   end
-
+  
+  def environment
+    parse; @environment
+  end
+  
   def args
     parse; @args
   end
   
   private
   
+  COMMANDS_WO_ENVIRONMENT = %w(generate log compress) 
+  
   def parse
     return if @options
 
-    usage = Kibo::Commands.commands.map do |subcommand|
-      next unless description = Kibo::Commands.descriptions[subcommand.to_s]
-      "  kibo [options] %-30s ... %s" % [ subcommand, description ]
+    commands, descriptions = Kibo::Commands.commands, Kibo::Commands.descriptions
+    
+    commands = commands.map(&:to_s) & descriptions.keys
+    ll_commands, hl_commands = commands.partition { |a| COMMANDS_WO_ENVIRONMENT.include?(a) }
+    
+    hl_usage = hl_commands.map do |subcommand|
+      "  kibo [options] %-33s ... %s" % [ "#{subcommand} <environment>", descriptions[subcommand] ]
+    end.compact.join("\n")
+    
+    ll_usage = ll_commands.map do |subcommand|
+      "  kibo [options] %-33s ... %s" % [ subcommand, descriptions[subcommand] ]
     end.compact.join("\n")
     
     @options = Trollop::options do
@@ -32,13 +46,16 @@ kibo manages multiple application roles on single heroku dynos.
 
 Usage:
 
-#{usage}
+#{hl_usage}
+
+More commands:
+
+#{ll_usage}
 
 where [options] are:
  
 EOS
 
-      opt :environment, "Set environment", :short => 'e', :type => String, :default => "staging"
       opt :config, "Set Kibofile name", :short => 'c', :type => String, :default => "Kibofile"
 
       stop_on Kibo::Commands.commands
@@ -54,6 +71,15 @@ EOS
       end
     end
 
+    # Does this subcommand needs the environment setting? 
+    # This includes all subcommands except generate and log
+    unless COMMANDS_WO_ENVIRONMENT.include?(@subcommands)
+      @environment = ARGV.shift || begin
+        W "You should supply the <environment> argument. Using default 'staging'"
+        "staging"
+      end
+    end
+    
     # Is there a specific subcommand options configuration?
 
     if proc = Kibo::Commands.options[@subcommand]

data/lib/kibo/commands/deploy.rb

@@ -3,22 +3,30 @@ module Kibo::Commands
 
   def deploy
     ENV["ENVIRONMENT"] = Kibo.environment
-     
+
+    missing_instances = Kibo.config.instances - configured_instances
+    unless missing_instances.empty?
+      E "Use 'kibo setup #{Kibo.environment}' to set up these missing instances", *missing_instances
+    end
+    
     #
     # Run source commands
     with_commands :source do
+      with_stashed_changes do
+        # create a deployment branch, if there is none yet.
+        in_branch "kibo.#{Kibo.environment}" do
+          git "merge", "master"
 
-      # create a deployment branch, if there is none yet.
-      in_branch "kibo.#{Kibo.environment}" do
-        git "merge", "master"
-
-        with_commands :arena do
-          Kibo.config.instances.each do |instance| 
-            git "push", "--force", instance, "HEAD:master"
+          with_commands :arena do
+            Kibo.config.instances.each do |instance| 
+              git "push", "--force", instance, "HEAD:master"
+            end
           end
         end
       end
     end
+  rescue FatalError
+    raise
   rescue StandardError
     W $!
     raise
@@ -51,13 +59,25 @@ module Kibo::Commands
     run.call("final") if run
   end
   
+  def dirty?
+    return false if git? "diff-index", "--quiet", "HEAD", :quiet
+
+    true
+  end
+  
+  def with_stashed_changes(&block)
+    is_clean = git? "diff-index", "--quiet", "HEAD", :quiet
+    git "stash" unless is_clean
+    yield
+  ensure
+    git "stash", "pop" unless is_clean
+  end
+  
   #
   # checkout the branch +name+, create it if necessary.
   def in_branch(name, &block)
     previous_branch = current_branch
 
-    git "stash"
-    
     if name != previous_branch
       git "branch", name unless branches.include?(name)
       git "checkout", name
@@ -72,8 +92,6 @@ module Kibo::Commands
       git "reset", "--hard"
       git "checkout", previous_branch
     end
-    
-    git "stash", "pop"
   end
 
   def current_branch

data/lib/kibo/commands/generate.rb

@@ -1,3 +1,5 @@
+__END__
+
 module Kibo::Commands
   subcommand :generate, "generate an example Kibofile"
 

data/lib/kibo/commands/helpers.rb

@@ -8,7 +8,7 @@ module Kibo::Commands
   
   extend Forwardable
   
-  delegate [:git, :heroku, :sys, :sh] => Kibo::System
+  delegate [:git, :git?, :heroku, :sys] => Kibo::System
 
   # -- which remotes are defined, present and configured --------------
 

data/lib/kibo/commands/info.rb

@@ -33,8 +33,8 @@ module Kibo::Commands
   end
 
   def configured_instances
-    sys("git remote").split("\n").select { |line|
-      line =~ /^#{Kibo.namespace}-/
+    sys("git remote", :quiet).split("\n").select { |line|
+      line =~ /^#{Kibo.namespace}-#{Kibo.environment}/
     }
   end
 end

data/lib/kibo/commands/setup.rb

@@ -7,13 +7,15 @@ module Kibo::Commands
   subcommand :setup, "Setup and configure application instances" do
     opt :force, "Reconfigure existing instances, too.", :short => "f"
   end
+  
+  subcommand :reconfigure, "Reconfigure application instances"
 
   def setup
     verify_heroku_login
     
     # create all apps on heroku or make sure that they
     # exist as remotes in the local git configuration.
-    instances.each do |instance|
+    Kibo.config.instances.each do |instance|
       next unless create_instance(instance) || Kibo::CommandLine.force?
 
       # The following only when forced (--force) to do so or when
@@ -24,6 +26,15 @@ module Kibo::Commands
     end
   end
   
+  def reconfigure
+    # create all apps on heroku or make sure that they
+    # exist as remotes in the local git configuration.
+    Kibo.config.instances.each do |instance|
+      # provide_instance instance
+      configure_instance instance
+    end
+  end
+  
   def create_instance(instance)
     return false if sys("git remote | grep #{instance}", :quiet)
 
@@ -51,7 +62,7 @@ module Kibo::Commands
   end
 
   def configure_instance(instance)
-    heroku "config:set", "INSTANCE=#{instance}"
+    heroku "config:set", "INSTANCE=#{instance.instance_name}", "--app", instance
   end
 
   def verify_heroku_login

data/lib/kibo/config.rb

@@ -88,6 +88,10 @@ class Kibo::Instance < String
     []
   end
   
+  def instance_name
+    self.split("-", 2).last
+  end
+  
   class Freemium < self
     def initialize(config, role, number)
       super config, role, 1

data/lib/kibo/heroku.rb

@@ -81,7 +81,7 @@ module Kibo::Heroku
   
   # returns names of all apps for the current user on heroku
   def apps
-    @apps ||= Kibo::System.heroku("apps").
+    @apps ||= Kibo::System.heroku("apps", :quiet).
       split(/\n/).
       reject { |line| line.empty? || line =~ /=== / }.
       map { |line| line.split(" ").first }

data/lib/kibo/system.rb

@@ -9,6 +9,10 @@ module Kibo::System
     sys! "git", *args
   end
 
+  def git?(*args)
+    sys "git", *args
+  end
+
   def sys(*args)
     quiet = args.pop if args.last == :quiet
 

data/lib/kibo/version.rb

@@ -1,3 +1,3 @@
 module Kibo
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 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" "October 2012" "Kibo 0.4.0" "Kibo Manual"
+.TH "KIBO" "1" "October 2012" "Kibo 0.4.1" "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.4.0</li>
+    <li class='tl'>Kibo 0.4.1</li>
     <li class='tc'>October 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.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3844677239198829294
+      hash: -2440088423911513347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: