kibo 0.3.5 → 0.4.0

data/.gitignore

@@ -1,2 +1,3 @@
 spec.old
 pkg
+coverage

data/Gemfile

@@ -4,6 +4,9 @@ gem "trollop"
 gem "thor"
 gem 'rake'
 gem 'netrc'
+gem 'mash'
+gem 'foreman'
+gem 'heroku'
 
 group :development do
   gem 'ronn'
@@ -12,5 +15,9 @@ group :development do
   gem 'rspec',  '~> 2.0'
   gem "simplecov", :require => false
   gem 'timecop'
+  gem 'ruby-debug19'
+  gem 'test-unit'
+  gem 'mocha'
+  gem 'awesome_print'
   # gem 'yard'
 end

data/Gemfile.lock

@@ -1,14 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.2)
+    archive-tar-minitar (0.5.2)
+    awesome_print (1.1.0)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
+    excon (0.16.4)
     fakefs (0.3.2)
+    foreman (0.60.0)
+      thor (>= 0.13.6)
+    heroku (2.32.6)
+      heroku-api (~> 0.3.5)
+      launchy (>= 0.3.2)
+      netrc (~> 0.7.7)
+      rest-client (~> 1.6.1)
+      rubyzip
+    heroku-api (0.3.5)
+      excon (~> 0.16.1)
     hpricot (0.8.6)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mash (0.1.1)
+    metaclass (0.0.1)
+    mime-types (1.19)
+    mocha (0.12.4)
+      metaclass (~> 0.0.1)
     multi_json (1.3.6)
     mustache (0.99.4)
     netrc (0.7.7)
     rake (0.9.2.2)
     rdiscount (1.6.8)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -22,10 +48,22 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    rubyzip (0.9.9)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    test-unit (2.5.2)
     thor (0.16.0)
     timecop (0.5.0)
     trollop (2.0)
@@ -34,13 +72,20 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   fakefs (~> 0.3.2)
+  foreman
+  heroku
+  mash
+  mocha
   netrc
   rake
   ronn
   rr (~> 1.0.2)
   rspec (~> 2.0)
+  ruby-debug19
   simplecov
+  test-unit
   thor
   timecop
   trollop

data/YUILICENSE.md

@@ -0,0 +1,29 @@
+The yuicompressor-2.4.7.jar file is copyright © 2012 Yahoo! Inc. and is licensed under the following terms:
+
+# Software License Agreement (BSD License)
+
+## Copyright © 2012 Yahoo! Inc. All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+Neither the name of Yahoo! Inc. nor the names of YUI's contributors may be used to endorse or promote products derived from this software without specific prior written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Sources of Intellectual Property Included in the YUI Library
+
+YUI is issued by Yahoo! under the BSD license above. Below is a list of certain publicly available software that is the source of intellectual property in YUI, along with the licensing terms that pertain to those sources of IP. This list is for informational purposes only and is not intended to represent an exhaustive list of third party contributions to YUI.
+
+- Douglas Crockford's JSON parsing and stringifying methods: In the JSON Utility, Douglas Crockford's JSON parsing and stringifying methods are adapted from work published at JSON.org. The adapted work is in the public domain.
+
+- Robert Penner's animation-easing algorithms: In the Animation Utility, YUI makes use of Robert Penner's algorithms for easing.
+
+- Geoff Stearns's SWFObject: In the Charts Control and the Uploader versions through 2.7.0, YUI makes use of Geoff Stearns's SWFObject v1.5 for Flash Player detection and embedding. More information on SWFObject can be found at http://blog.deconcept.com/swfobject/. SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License (http://www.opensource.org/licenses/mit-license.php).
+
+- Diego Perini's IEContentLoaded technique: The Event Utility employs a technique developed by Diego Perini and licensed under GPL. YUI's use of this technique is included under our BSD license with the author's permission.
+
+- Yehuda Katz's Handlebars.js: YUI includes a wrapped version of Handlebars in our distribution. Handlebars.js is licensed under the MIT license which is in compliance with YUI's BSD license.

data/lib/kibo/commandline.rb

@@ -39,8 +39,7 @@ where [options] are:
 EOS
 
       opt :environment, "Set environment", :short => 'e', :type => String, :default => "staging"
-      opt :kibofile, "Set Kibofile name", :short => 'k', :type => String, :default => "Kibofile"
-      opt :procfile, "Set Procfile name", :short => 'p', :type => String, :default => "Procfile"
+      opt :config, "Set Kibofile name", :short => 'c', :type => String, :default => "Kibofile"
 
       stop_on Kibo::Commands.commands
     end

data/lib/kibo/commands/compress.rb

@@ -1,21 +1,21 @@
+#
+# 
 module Kibo::Commands
   subcommand :compress, "compress JS and CSS files" do
     opt :quiet, "Be less verbose.", :short => "q"
   end
   
   def compress
-    dirs = Kibo.command_line.args
-    dirs.each do |dir| compress_dir(dir) end
+    Kibo::CommandLine.args.each do |path|
+      compress_dir path
+    end
   end
   
   private
 
-  def kibo_bin_path
-    File.join(File.dirname(__FILE__), "..", "bin")
-  end
-  
   def yuicompressor(*args)
-    yuicompressor = "#{kibo_bin_path}/yuicompressor-2.4.7.jar"
+    yuipath = File.join(File.dirname(__FILE__), "..", "bin")
+    yuicompressor = "#{yuipath}/yuicompressor-2.4.7.jar"
     Kibo::System.sys! "java", "-jar", yuicompressor, *args
   end
   
@@ -59,27 +59,32 @@ module Kibo::Commands
       log_file = lambda do |file|
         old_size, new_size = old_sizes[file], File.size(file)
 
-        unless Kibo.command_line.quiet?
+        unless Kibo::CommandLine.quiet?
           info.line file, "#{old_size} -> #{new_size}"
         end
         old_sum += old_size
         new_sum += new_size
       end
       
-      info.head "JS" unless Kibo.command_line.quiet?
+      info.head "JS" unless Kibo::CommandLine.quiet?
       
       js_files.sort.each do |file|
         log_file.call(file)
       end
       
-      info.head "CSS" unless Kibo.command_line.quiet?
+      info.head "CSS" unless Kibo::CommandLine.quiet?
       
       css_files.sort.each do |file|
         log_file.call(file)
       end
 
-      info.head "Summary" unless Kibo.command_line.quiet?
-      info.line "#{files.length} files", "#{old_sum} -> #{new_sum} byte: #{(new_sum * 100.0 / old_sum).round(1)} %"
+      info.head "Summary" unless Kibo::CommandLine.quiet?
+      
+      if old_sum > 0
+        info.line "#{files.length} files", "#{old_sum} -> #{new_sum} byte: #{(new_sum * 100.0 / old_sum).round(1)} %"
+      else
+        info.line "#{files.length} files", "#{old_sum} -> #{new_sum} byte"
+      end
     end
   end
 end

data/lib/kibo/commands/deploy.rb

@@ -1,15 +1,7 @@
 module Kibo::Commands
-  subcommand :deploy, "updates all remote instances" do
-    opt :force, "Ignore outstanding changes.", :short => "f"
-  end
+  subcommand :deploy, "updates all remote instances"
 
   def deploy
-    if Kibo.command_line.force?
-      h.check_missing_remotes(:warn)
-    else
-      h.check_missing_remotes(:error)
-    end
-
     ENV["ENVIRONMENT"] = Kibo.environment
      
     #
@@ -20,9 +12,9 @@ module Kibo::Commands
       in_branch "kibo.#{Kibo.environment}" do
         git "merge", "master"
 
-        with_commands :deployment do
-          h.configured_remotes.each do |remote| 
-            deploy_remote! remote
+        with_commands :arena do
+          Kibo.config.instances.each do |instance| 
+            git "push", "--force", instance, "HEAD:master"
           end
         end
       end
@@ -34,6 +26,10 @@ module Kibo::Commands
 
   private
 
+  # Run the commands under "<key>.pre", 
+  # then yield the block, 
+  # then run the commands under "<key>.success", if the block was successful,
+  # then run the commands under "<key>.final".
   def with_commands(sym, &block)
     commands_hash = Kibo.config.send(sym) || {}
     
@@ -42,7 +38,7 @@ module Kibo::Commands
 
       W "Running #{sym}.#{key} commands"
       [ *commands ].each do |command|
-        Kibo::System.sh! command
+        Kibo::System.sys! command
       end
     }
 
@@ -52,7 +48,7 @@ module Kibo::Commands
 
     run.call("success")
   ensure
-    run.call("final")
+    run.call("final") if run
   end
   
   #
@@ -60,6 +56,8 @@ module Kibo::Commands
   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
@@ -74,6 +72,8 @@ module Kibo::Commands
       git "reset", "--hard"
       git "checkout", previous_branch
     end
+    
+    git "stash", "pop"
   end
 
   def current_branch
@@ -84,8 +84,4 @@ module Kibo::Commands
     branches = `git branch`
     ("\n" + branches).split(/\n[\* ]+/).reject(&:empty?)
   end
-    
-  def deploy_remote!(remote)
-    git "push", "--force", remote, "HEAD:master"
-  end
 end

data/lib/kibo/commands/helpers.rb

@@ -0,0 +1,15 @@
+require "forwardable"
+require_relative "../system"
+
+
+module Kibo::Commands
+
+  private 
+  
+  extend Forwardable
+  
+  delegate [:git, :heroku, :sys, :sh] => Kibo::System
+
+  # -- which remotes are defined, present and configured --------------
+
+end

data/lib/kibo/commands/info.rb

@@ -1,3 +1,5 @@
+require_relative "../helpers/info"
+
 module Kibo::Commands
   subcommand :info, "show information about the current settings"
 
@@ -5,33 +7,34 @@ module Kibo::Commands
     Kibo::Helpers::Info.print do |info|
       info.head "general"
       info.line "environment", Kibo.environment
-
+      info.line "namespace", Kibo.namespace
+      
       info.head "heroku"
-      info.line "current account", h.whoami
-      info.line "expected account", Kibo.config.account
+      info.line "current account", Kibo::Heroku.whoami
+      info.line "expected account", Kibo.config.heroku.account
 
       info.head "processes"      
+      info.line "mode", Kibo.config.heroku.mode
       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
+      # info.head "remotes"
+      # 
+      # info.line "expected", Kibo.expected_remotes
+      # info.line "configured", Kibo.configured_remotes
+      # info.line "missing", Kibo.missing_remotes
+
+      info.head "instances"
+      
+      info.line "expected", Kibo.config.instances
+      info.line "configured", configured_instances
     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
+  def configured_instances
+    sys("git remote").split("\n").select { |line|
+      line =~ /^#{Kibo.namespace}-/
+    }
   end
 end

data/lib/kibo/commands/logs.rb

@@ -0,0 +1,30 @@
+module Kibo::Commands
+  subcommand :logs, "Show log files for current instances"
+  def logs
+    require "foreman/engine/cli"
+
+    cli = Foreman::Engine::CLI.new
+    
+    Kibo.config.instances.map do |remote|
+      cli.register remote.split("-", 3).last, "#{Kibo.binary} log #{remote}"
+    end
+    
+    cli.start
+  end
+
+  subcommand :log, "Show log file for a single instance"
+  def log
+    require "heroku"
+
+    instance = Kibo::CommandLine.args.first 
+
+    $stdout.sync = true
+    
+    heroku = Heroku::Auth.client
+    heroku.read_logs(instance, [ "tail=1" ]) do |chunk|
+      chunk.split("\n").each do |line|
+        $stdout.puts line.split(": ", 2)[1]
+      end
+    end
+  end
+end

data/lib/kibo/commands/setup.rb

@@ -0,0 +1,67 @@
+#
+# 
+
+require_relative "../heroku"
+
+module Kibo::Commands
+  subcommand :setup, "Setup and configure application instances" do
+    opt :force, "Reconfigure existing instances, too.", :short => "f"
+  end
+
+  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|
+      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
+      provide_instance instance
+      configure_instance instance
+    end
+  end
+  
+  def create_instance(instance)
+    return false if sys("git remote | grep #{instance}", :quiet)
+
+    heroku_url = "git@heroku.com:#{instance}.git"
+
+    if Kibo::Heroku.apps.include?(instance)
+      git :remote, :add, instance, heroku_url
+    else
+      heroku "apps:create", instance, "--remote", instance
+    end
+    
+    true
+  end
+  
+  def collaborate_instance(instance)
+    Kibo.config.collaborators.each do |email|
+      heroku "sharing:add", email, "--app", instance
+    end
+  end
+  
+  def provide_instance(instance)
+    instance.addons.each do |addon|
+      heroku "addons:add", addon
+    end
+  end
+
+  def configure_instance(instance)
+    heroku "config:set", "INSTANCE=#{instance}"
+  end
+
+  def verify_heroku_login
+    whoami = Kibo::Heroku.whoami
+    return if whoami == Kibo.config.heroku.account
+
+    if !whoami
+      E "Please log in ('heroku auth:login') as #{Kibo.config.heroku.account}."
+    elsif whoami != Kibo.config.heroku.account
+      E "You are currently logged in as #{whoami}; please log in ('heroku auth:login') as #{Kibo.config.heroku.account}."
+    end
+  end
+end

data/lib/kibo/commands/spin.rb

@@ -1,39 +1,22 @@
 # --spin up/spin down remotes
 module Kibo::Commands
-  subcommand :spinup, "starts all remote instances" do
-    opt :force, "Ignore missing targets.", :short => "f"
-  end
-
+  subcommand :spinup, "starts all remote instances"
   subcommand :spindown, "stops all remote instances"
 
   def spinup
-    h.check_missing_remotes(Kibo.command_line.force? ? :warn : :error)
-    spin Kibo.config.processes
+    spin :up
   end
 
   def spindown
-    spin({})
+    spin :down
   end
 
   private
   
-  def spin(processes)
-    Kibo.config.remotes_by_process.each do |name, remotes|
-      number_of_processes = processes[name] || 0
-      
-      remotes.each do |remote|
-        if number_of_processes > 0
-          h.configure_remote remote 
-          heroku "ps:scale", "#{name}=1", "--app", remote
-          number_of_processes -= 1
-        else
-          heroku "ps:scale", "#{name}=0", "--app", remote
-        end
-      end
-      
-      if number_of_processes > 0
-        W "Missing #{name} remote(s)", number_of_processes
-      end
+  def spin(mode)
+    Kibo.config.instances.each do |instance|
+      count = mode == :up ? instance.count : 0
+      heroku "ps:scale", "#{instance.role}=#{count}", "--app", instance
     end
   end
 end

data/lib/kibo/commands.rb

@@ -1,6 +1,3 @@
-require_relative "helpers"
-require_relative "system"
-
 module Kibo::Commands
   extend self
 
@@ -20,24 +17,6 @@ module Kibo::Commands
   def self.commands
     public_instance_methods.map(&:to_s)
   end
-  
-  private 
-  
-  def h
-    Kibo::Helpers
-  end
-
-  def sys
-    Kibo::System
-  end
-
-  def git(*args)
-    sys.git *args
-  end
-
-  def heroku(*args)
-    sys.heroku *args
-  end
 end
 
 subfiles = Dir.glob( __FILE__.gsub(/\.rb$/, "/*.rb")).sort