kibo 0.4.1 → 0.4.2

data/lib/kibo/commands/setup.rb

@@ -5,7 +5,7 @@ require_relative "../heroku"
 
 module Kibo::Commands
   subcommand :setup, "Setup and configure application instances" do
-    opt :force, "Reconfigure existing instances, too.", :short => "f"
+    opt :force, "Reconfigure existing instances.", :short => "f"
   end
   
   subcommand :reconfigure, "Reconfigure application instances"
@@ -18,10 +18,11 @@ module Kibo::Commands
     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
-      # a new instance has been created.
-      collaborate_instance instance
+      # The following only when forced (--force) to do so 
+      # or when a new instance has been created.
+
       provide_instance instance
+      share_instance instance
       configure_instance instance
     end
   end
@@ -30,7 +31,8 @@ module Kibo::Commands
     # 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
+      provide_instance instance
+      share_instance instance
       configure_instance instance
     end
   end
@@ -49,15 +51,30 @@ module Kibo::Commands
     true
   end
   
-  def collaborate_instance(instance)
-    Kibo.config.collaborators.each do |email|
+  def share_instance(instance)
+    Kibo.config.sharing.each do |email|
       heroku "sharing:add", email, "--app", instance
     end
   end
   
   def provide_instance(instance)
-    instance.addons.each do |addon|
-      heroku "addons:add", addon
+    partial_instance_name = instance.split("-").last # e.g. "web1"
+
+    return unless instance_addons = Kibo.config.addons[partial_instance_name]
+
+    existing_instance_addons = 
+      heroku("addons", "--app", instance, :quiet).
+      split("\n").
+      map do |line| 
+        next if line =~ /^=== /
+        line.split(/\s+/).first
+      end.compact
+
+    W "[#{instance}] addons", *existing_instance_addons
+
+    missing = instance_addons - existing_instance_addons
+    missing.each do |addon|
+      heroku "addons:add", addon, "--app", instance
     end
   end
 

data/lib/kibo/config.rb

@@ -9,7 +9,8 @@ class Kibo::Config < Mash
     "deployment"      => {},
     "collaborations"  => {},
     "source"          => {},
-    "collaborators"   => []
+    "sharing"         => [],
+    "addons"          => {}
   }
 
   attr :environment, :kibofile

data/lib/kibo/version.rb

@@ -1,3 +1,3 @@
 module Kibo
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 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.1" "Kibo Manual"
+.TH "KIBO" "1" "October 2012" "Kibo 0.4.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.4.1</li>
+    <li class='tl'>Kibo 0.4.2</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.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2440088423911513347
+      hash: 3119348914101748523
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: