kibo 0.3.5 → 0.4.0

data/lib/kibo/config.rb

@@ -1,134 +1,119 @@
 require "yaml"
+require "mash"
 
-class Kibo::Configfile < Hash
-  attr :path
+class Kibo::Config < Mash
+  DEFAULTS = {
+    "heroku"          => {
+      "mode" => "freemium"
+    },
+    "deployment"      => {},
+    "collaborations"  => {},
+    "source"          => {},
+    "collaborators"   => []
+  }
+
+  attr :environment, :kibofile
   
-  def initialize(path)
-    @path = path
+  def initialize(kibofile, environment)
+    @kibofile, @environment = kibofile, environment
+    @kibofile = File.expand_path @kibofile
     
-    File.read(path).
-      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+$/, "")
-        
-        die(lineno, "Multiple entries for #{key.inspect}") if key?(key)
+    kibo = begin
+      YAML.load File.read(kibofile)
+    rescue Errno::ENOENT
+      E "No such file", File.expand_path(@kibofile)
+    end
 
-        update key => value
-      end
-  rescue
-    E "No such file", path
+    build_config(kibo)
+    verify_config
   end
-
-  def die(lineno, msg)
-    E "#{path}:#{lineno}", msg
+  
+  def processes
+    return unless processes = super
+    processes.reject { |k,v| v.to_s.to_i <= 0 } 
   end
-end
 
-class Kibo::Config
-  attr :procfile
-
-  DEFAULTS = {
-    "procfile" => "Procfile"
-  }
-  
-  def [](key)
-    @data[key]
+  def freemium?
+    heroku.mode == "freemium"
   end
   
-  def environment
-    Kibo.environment
+  def namespace
+    heroku.namespace
   end
   
-  def initialize(path)
-    super()
-
-    @data = DEFAULTS.dup
+  private
+  
+  def build_config(kibo)
+    config = DEFAULTS.dup
     
-    begin
-      kibo = YAML.load File.read(path)
-      @data.update(kibo)
-      @data.update(kibo["defaults"] || {})
-      @data.update(kibo[environment] || {})
-    rescue Errno::ENOENT
-      W "No such file", path
+    [ kibo, kibo["defaults"], kibo[environment] ].each do |hash|
+      next unless hash
+      config = config.deep_merge(hash)
     end
     
-    verify_version!
-    
-    @procfile = Kibo::Configfile.new(self["procfile"])
+    self.update config
   end
   
-  # processes are defined in the Procfile. The scaling, however, is defined in 
-  # the Kibofile.
-  def processes
-    @processes ||= procfile.keys.inject({}) do |hash, key|
-      hash.update key => (self[key] || 1)
-    end
+  def verify_config
+    Kibo::Config.verify_version!(self.version)
+    
+    # verify required entries
+    E("#{@kibofile}: Please set the heroku namespace.") unless heroku.namespace?
+    E("#{@kibofile}: Please set the heroku account email") unless heroku.account?
+    E("#{@kibofile}: Missing 'processes' settings") unless self.processes.is_a?(Hash)
   end
+  
+  def self.verify_version!(version)
+    return unless version
 
-  def verify_version!
-    return unless self["version"]
+    kibofile_version = version.split(".").map(&:to_i)
+    kibo_version = Kibo::VERSION.split(".").map(&:to_i)
 
-    files_version = self["version"].split(".").map(&:to_i)
-    kibos_version = Kibo::VERSION.split(".").map(&:to_i)
+    return if kibo_version >= kibofile_version
 
-    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
+    E "The Kibofile requires kibo version #{version}. You have #{Kibo::VERSION}."
   end
+end
 
-  #
-  # we need namespace-ENVIRONMENT-process<1>
+class Kibo::Instance < String
+  attr :count, :role
   
-  # returns the heroku configuration
-  def heroku
-    self["heroku"] || {}
-  end
-  
-  # returns deployment specific configuration
-  def deployment
-    self["deployment"] || {}
+  def initialize(config, role, count)
+    @role, @count = role, count
+    
+    super "#{config.namespace}-#{config.environment}-#{role}"
   end
 
-  def collaborations
-    self["collaborations"] || {}
+  def addons
+    []
   end
   
-  # returns source specific configuration
-  def source
-    self["source"] || {}
-  end
-  
-  # returns the heroku namespace
-  def namespace
-    heroku["namespace"] || E("Please set the heroku namespace in your Kibofile.")
+  class Freemium < self
+    def initialize(config, role, number)
+      super config, role, 1
+      @number = number
+    
+      concat "#{@number}"
+    end
   end
+end
 
-  # returns the heroku account email. This is the account that
-  # you should be logged in
-  def account
-    heroku["account"] || E("Please set the heroku account email in your Kibofile")
-  end
+class Kibo::Config
 
-  def remotes_by_process
-    remotes = Kibo.git("remote", :quiet).split("\n")
-    
-    @remotes_by_process ||= begin
-      r = processes.map do |process, count| 
-        prefix = "#{namespace}-#{environment}-#{process}"
-        remotes = 1.upto(count).map { |idx| "#{prefix}#{idx}" }
-        [ process, remotes ]
+  # return an array of instances.
+  def instances
+    instances = if freemium?
+      processes.map do |process, count|
+        1.upto(count).map { |idx| 
+          Kibo::Instance::Freemium.new self, process, idx 
+        }
+      end.flatten
+    else
+      processes.map do |process, count|
+        Kibo::Instance.new self, process, count
       end
-      Hash[r]
     end
+
+    instances.sort_by(&:to_s)
   end
 end

data/lib/kibo/ext/ruby_ext.rb

@@ -0,0 +1,30 @@
+class Array
+  def self.diff(one, other)
+    one.zip(other).each do |ones, others|
+      return 0 if ones.nil? && others.nil?
+      
+      return -1 if ones.nil?
+      return 1 if others.nil?
+      
+      return -1 if ones < others
+      return 1 if others < ones
+    end
+    
+    return 0
+  end
+
+  def < (other);  Array.diff(self, other) < 0; end
+  def > (other);  Array.diff(self, other) > 0; end
+  def <= (other); Array.diff(self, other) <= 0; end
+  def >= (other); Array.diff(self, other) >= 0; end
+end
+
+class Hash
+  def deep_merge(other_hash)
+    self.merge(other_hash) do |key, oldval, newval|
+      oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
+      newval = newval.to_hash if newval.respond_to?(:to_hash)
+      oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? oldval.deep_merge(newval) : newval
+    end
+  end
+end

data/lib/kibo/helpers/info.rb

@@ -1,3 +1,5 @@
+module Kibo::Helpers; end
+
 class Kibo::Helpers::Info < Array
   def self.print(out = STDOUT, &block)
     out.puts build(&block).to_s

data/lib/kibo/{helpers/heroku.rb → heroku.rb}

@@ -12,9 +12,11 @@
 # The heroku gem is licensed under the terms of the MIT license,
 # see the file License.MIT.
 #
-# The heroku has been created by Adam Wiggins, and is currently maintained
+# The heroku gem has been created by Adam Wiggins, and is currently maintained
 # by Wesley Beary.
-module Kibo::Helpers::Heroku
+module Kibo::Heroku
+  extend self
+  
   require "netrc"
 
   def whoami
@@ -72,4 +74,16 @@ module Kibo::Helpers::Heroku
       end
     end
   end
+
+  # --- helpers for kibo ----------------------------------------------
+
+  public
+  
+  # returns names of all apps for the current user on heroku
+  def apps
+    @apps ||= Kibo::System.heroku("apps").
+      split(/\n/).
+      reject { |line| line.empty? || line =~ /=== / }.
+      map { |line| line.split(" ").first }
+  end
 end

data/lib/kibo/log.rb

@@ -13,12 +13,14 @@ def D(*args)
 end
 
 def W(*args)
-  UI.warn log_message(*args)
+  UI.warn log_message(*args).to_s
+end
+
+class FatalError < RuntimeError
 end
 
 def E(*args)
-  UI.error log_message(*args)
-  exit 1
+  raise FatalError, log_message(*args)
 end
 
 def B(*args, &block)

data/lib/kibo/system.rb

@@ -10,9 +10,11 @@ module Kibo::System
   end
 
   def sys(*args)
-    cmd = build_command(*args)
+    quiet = args.pop if args.last == :quiet
+
+    cmd = build_command(quiet, *args)
     result = Kernel.send "`", "bash -c \"#{cmd}\""
-    if command_succeeded?(cmd)
+    if command_succeeded?(quiet, cmd)
       result.chomp
     end
   end
@@ -21,30 +23,19 @@ module Kibo::System
     sys(*args) || exit(1)
   end
 
-  def sh(*args)
-    cmd = build_command(*args)
-    system(cmd)
-    command_succeeded?(cmd)
-  end
-
-  def sh!(*args)
-    sh(*args) || exit(1)
-  end
-
   private
-  
-  def build_command(*args)
-    quiet = args.pop if args.last == :quiet
+
+  def build_command(quiet, *args)
     args[0].sub!(/^kibo\b/, $0)
     cmd = args.map(&:to_s).join(" ") 
     W cmd unless quiet
     cmd
   end
 
-  def command_succeeded?(cmd)
+  def command_succeeded?(quiet, cmd)
     return true if $?.exitstatus == 0
     
-    UI.error("Command failed: #{cmd}")
+    UI.error("Command failed: #{cmd}") unless quiet
     false
   end
 end

data/lib/kibo/version.rb

@@ -1,3 +1,3 @@
 module Kibo
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/kibo.rb

@@ -1,6 +1,7 @@
 module Kibo
 end
 
+require_relative "kibo/ext/ruby_ext.rb"
 require_relative "kibo/version"
 require_relative "kibo/log"
 require_relative "kibo/system"
@@ -12,22 +13,25 @@ module Kibo
   extend self
   
   def config
-    @config ||= Config.new(kibofile)
+    @config ||= Config.new(CommandLine.config, CommandLine.environment)
   end
 
   def environment
-    CommandLine.environment
+    Kibo.config.environment
+  end
+  
+  def namespace
+    Kibo.config.heroku.namespace
   end
   
   def run
     Commands.send CommandLine.subcommand
+  rescue RuntimeError
+    UI.error $!.to_s 
+    exit 1
   end
-
-  def command_line
-    CommandLine
-  end
-
-  def kibofile
-    command_line.kibofile
+  
+  def binary
+    File.join(File.dirname(__FILE__), "..", "bin", "kibo")
   end
 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.5" "Kibo Manual"
+.TH "KIBO" "1" "October 2012" "Kibo 0.4.0" "Kibo Manual"
 .
 .SH "NAME"
 \fBkibo\fR \- manage heroku applications

data/man/kibo.1.html

@@ -172,8 +172,8 @@ kibo -e production spindown
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Kibo 0.3.5</li>
-    <li class='tc'>September 2012</li>
+    <li class='tl'>Kibo 0.4.0</li>
+    <li class='tc'>October 2012</li>
     <li class='tr'>kibo(1)</li>
   </ol>
 

data/test/Kibofile

@@ -0,0 +1,33 @@
+# This is an example Kibofile. Use with kibo(1) to configure
+# remote instances.
+heroku:
+  # The email of the heroku account to create app instances on heroku.
+  account: kibo@kibo.local
+
+  # Namespace to use when generating names for git remotes and heroku app
+  # instances. With a "kibo" namespace our instances will be called 
+  # 'kibo-staging-clerk1', 'kibo-production-twirl1', etc.
+  namespace: kibo
+
+# How many instances to spin up?
+defaults:
+  processes:
+    stats: 0
+    clerk: 1
+    twirl: 1
+
+# Live mode will have 1 clerk and 3 twirls.
+live:
+  heroku:
+    mode: pro
+  processes:
+    clerk: 1
+    twirl: 3
+  
+source:
+  pre:
+    - rake bountybase:release 
+  success:
+    - git tag $ENVIRONMENT-$(date "+%Y.%m.%d-%H.%M")
+
+#arena:

data/test/kibo_test.rb

@@ -0,0 +1,59 @@
+require_relative 'test_helper'
+
+
+module Kibo::CommandLine
+  extend self
+  
+  def parse
+    raise "CommandLine::parse"
+  end
+end
+
+class KiboTest < Test::Unit::TestCase
+  def config(environment = "staging")
+    Kibo::Config.new(File.dirname(__FILE__) + "/Kibofile", environment)
+  end
+  
+  def test_missing_config
+    assert_raise(FatalError) {  
+      Kibo::Config.new(File.dirname(__FILE__) + "/Kibofile.missing", "environment")
+    }
+  end
+
+  def test_verify_version
+    assert(Kibo::VERSION =~ /^0\.4/)
+    
+    assert_raise(FatalError) {  
+      Kibo::Config.verify_version!("1.0")
+    }
+
+    assert_raise(FatalError) {  
+      Kibo::Config.verify_version!("0.5")
+    }
+
+    assert_nothing_raised(FatalError) {  
+      Kibo::Config.verify_version!(Kibo::VERSION)
+      Kibo::Config.verify_version!("0.1")
+    }
+  end
+  
+  def test_config
+    config = self.config
+    
+    assert_equal({"clerk"=>1, "twirl"=>1}, config.processes)
+    
+    assert_equal config.namespace, "kibo"
+    assert config.freemium?
+    assert_equal ["kibo-staging-clerk1", "kibo-staging-twirl1"], config.instances
+  end
+
+  def test_live_config
+    config = self.config("live")
+
+    assert_equal({"clerk"=>1, "twirl"=>3}, config.processes)
+    
+    assert_equal config.namespace, "kibo"
+    assert !config.freemium?
+    assert_equal ["kibo-live-clerk", "kibo-live-twirl"], config.instances
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'bundler/setup'
+
+ENV["RACK_ENV"] ||= "test"
+
+require 'ruby-debug'
+require 'simplecov'
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'   
+
+class Test::Unit::UI::Console::TestRunner
+  def guess_color_availability; true; end
+end
+
+require 'mocha'
+require 'awesome_print'
+
+SimpleCov.start do
+  add_filter "test/*.rb"
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'kibo'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kibo
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -75,6 +75,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mash
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: foreman
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: heroku
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage heroku instances with ease
 email:
 - eno@radiospiel.org
@@ -88,6 +136,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- YUILICENSE.md
 - bin/kibo
 - kibo.gemspec
 - lib/kibo.rb
@@ -95,16 +144,17 @@ files:
 - lib/kibo/commandline.rb
 - lib/kibo/commands.rb
 - lib/kibo/commands/compress.rb
-- lib/kibo/commands/create.rb
 - lib/kibo/commands/deploy.rb
 - lib/kibo/commands/generate.rb
+- lib/kibo/commands/helpers.rb
 - lib/kibo/commands/info.rb
-- lib/kibo/commands/reconfigure.rb
+- lib/kibo/commands/logs.rb
+- lib/kibo/commands/setup.rb
 - lib/kibo/commands/spin.rb
 - lib/kibo/config.rb
-- lib/kibo/helpers.rb
-- lib/kibo/helpers/heroku.rb
+- lib/kibo/ext/ruby_ext.rb
 - lib/kibo/helpers/info.rb
+- lib/kibo/heroku.rb
 - lib/kibo/log.rb
 - lib/kibo/system.rb
 - lib/kibo/version.rb
@@ -113,6 +163,9 @@ files:
 - man/kibo.1.markdown
 - man/kibo.1.ronn
 - tasks/doc.rake
+- test/Kibofile
+- test/kibo_test.rb
+- test/test_helper.rb
 homepage: http://github.com/radiospiel/kibo
 licenses: []
 post_install_message: 
@@ -127,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 173262939670169996
+      hash: -3844677239198829294
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,4 +193,7 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage heroku instances with ease
-test_files: []
+test_files:
+- test/Kibofile
+- test/kibo_test.rb
+- test/test_helper.rb