kibo 0.3.4 → 0.3.5

data/lib/kibo/commands/create.rb

@@ -1,13 +1,43 @@
 module Kibo::Commands
-  subcommand :create, "create missing targets" do
-    opt :all, "Create all missing targets.", :short => "a"
+  subcommand :remotes, "create missing remotes" do
+    opt :all, "Create all missing remotes.", :short => "a"
   end
 
+  subcommand :create, "create missing apps"
+  
+  subcommand :collaborate, "add collaborations"
+
   def create
     verify_heroku_login
 
+    apps = heroku("apps").split("\n").reject { |line| line =~ /===/ }
+    missing_apps = h.expected_remotes - apps
+    
+    confirm! <<-MSG
+I am going to create these instances: #{missing_apps.map(&:inspect).join(", ")} for you [#{Kibo.config.account}].
+MSG
+
+    missing_apps.each do |instance|
+      create_instance(instance)
+      Kibo.config.collaborations.each do |email|
+        heroku "sharing:add", email 
+      end
+    end
+  end
+
+  def collaborate
+    verify_heroku_login
+    
+    h.expected_remotes.each do |instance|
+      Kibo.config.collaborations.each do |email|
+        heroku "sharing:add", email, "--app", instance
+      end
+    end
+  end
+  
+  def remotes
     if Kibo.command_line.all? 
-      instances = missing_remotes
+      instances = h.missing_remotes
       if instances.empty?
         W "Nothing to do."
         exit 0
@@ -20,7 +50,7 @@ module Kibo::Commands
       end
 
       # only create instances that are actually missing.
-      extra_instances = instances - missing_remotes
+      extra_instances = instances - h.missing_remotes
       unless extra_instances.empty?
         E <<-MSG
 kibo cannot create these instances for you: #{extra_instances.map(&:inspect).join(", ")}, because I don't not know anything about these.
@@ -28,13 +58,8 @@ MSG
       end
     end
 
-    confirm! <<-MSG
-I am going to create these instances: #{instances.map(&:inspect).join(", ")}. Is this what you want? Note:
-You are logged in at heroku as #{config.account}.
-MSG
-
-    instances.each do |instance|
-      create_instance(instance)
+    h.missing_remotes.each do |remote|
+      git "remote", "add", remote, "git@heroku.com:#{remote}.git"
     end
   end
   
@@ -50,7 +75,7 @@ MSG
     if !whoami
       E "Please log in ('heroku auth:login') as #{config.account}."
     elsif whoami != Kibo.config.account
-      E "You are currently logged in as #{whoami}; please log in ('heroku auth:login') as #{config.account}."
+      E "You are currently logged in as #{whoami}; please log in ('heroku auth:login') as #{Kibo.config.account}."
     end
   end
 end

data/lib/kibo/commands/info.rb

@@ -10,10 +10,28 @@ module Kibo::Commands
       info.line "current account", h.whoami
       info.line "expected account", Kibo.config.account
 
+      info.head "processes"      
+      Kibo.config.processes.each do |key, value|
+        info.line key, value
+      end
+
       info.head "remotes"
       info.line "remotes", h.expected_remotes
       info.line "configured", h.configured_remotes
       info.line "missing", h.missing_remotes
     end
   end
+
+  subcommand :logs, "Show log files for current instances"
+  def logs
+    h.configured_remotes.each do |remote|
+      fork do
+        cmd = "heroku logs --tail --app #{remote} | sed s/^/\\\\[#{remote}\\\\]\\ /"
+        W cmd
+        exec(cmd)
+      end
+    end
+    
+    Process.waitall
+  end
 end

data/lib/kibo/commands/reconfigure.rb

@@ -6,7 +6,7 @@ module Kibo::Commands
     h.check_missing_remotes :warn
     
     h.configured_remotes.each do |remote| 
-      configure_remote! remote
+      h.configure_remote! remote
     end
   end
 end

data/lib/kibo/config.rb

@@ -10,6 +10,7 @@ class Kibo::Configfile < Hash
       split("\n").
       each_with_index do |line, lineno|
         next if line =~ /^\s*#/
+        next if line =~ /^\s*$/
         die(lineno, "Can't parse line: #{line.inspect}") unless line =~ /\s*([a-z]+):\s*(.*)$/
         key, value = $1, $2.gsub(/\s+$/, "")
         
@@ -98,6 +99,10 @@ class Kibo::Config
     self["deployment"] || {}
   end
 
+  def collaborations
+    self["collaborations"] || {}
+  end
+  
   # returns source specific configuration
   def source
     self["source"] || {}
@@ -117,15 +122,13 @@ class Kibo::Config
   def remotes_by_process
     remotes = Kibo.git("remote", :quiet).split("\n")
     
-    @remotes_by_process ||= remotes.group_by do |remote| 
-      case remote
-      when /^#{namespace}-#{environment}-(\w+)(\d+)/
-        $1
-      when /^#{namespace}-#{environment}-/ 
-        W "#{remote.inspect}: Ignoring target..."
-        nil
-      else
+    @remotes_by_process ||= begin
+      r = processes.map do |process, count| 
+        prefix = "#{namespace}-#{environment}-#{process}"
+        remotes = 1.upto(count).map { |idx| "#{prefix}#{idx}" }
+        [ process, remotes ]
       end
-    end.tap { |hash| hash.delete(nil) }
+      Hash[r]
+    end
   end
 end

data/lib/kibo/helpers.rb

@@ -21,6 +21,8 @@ module Kibo::Helpers
       return
     end
 
+    environment = Kibo.environment
+    
     E <<-MSG
 Missing remote(s): #{missing_remotes.map(&:inspect).join(", ")}. Run
 
@@ -33,7 +35,8 @@ Missing remote(s): #{missing_remotes.map(&:inspect).join(", ")}. Run
   # -- configure remotes ----------------------------------------------
   
   def configure_remote!(remote)
-    sys.heroku "config:set", 
+    environment = Kibo.environment
+      sys.heroku "config:set", 
       "RACK_ENV=#{environment}", 
       "RAILS_ENV=#{environment}", 
       "INSTANCE=#{instance_for_remote(remote)}", 
@@ -41,7 +44,7 @@ Missing remote(s): #{missing_remotes.map(&:inspect).join(", ")}. Run
   end
   
   def instance_for_remote(remote)
-    remote[config.namespace.length + 1 .. -1]
+    remote[Kibo.config.namespace.length + 1 .. -1]
   end
   
   def configure_remote(remote)

data/lib/kibo/log.rb

@@ -37,8 +37,8 @@ def S(*args)
 end
 
 def confirm!(msg)
-  puts msg
-  puts "\n\nPress ^C to abort or return to continue."
+  UI.warn msg
+  puts "Press ^C to abort or return to continue."
   
   STDIN.readline
 end

data/lib/kibo/version.rb

@@ -1,3 +1,3 @@
 module Kibo
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 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.4" "Kibo Manual"
+.TH "KIBO" "1" "September 2012" "Kibo 0.3.5" "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.4</li>
+    <li class='tl'>Kibo 0.3.5</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.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-05 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: -3856345431074645108
+      hash: 173262939670169996
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: