capricorn 2.0.6 → 2.0.7

data/bin/capricornctl

@@ -7,4 +7,4 @@ rescue LoadError
   require 'capricorn-client'
 end
 
-Capricorn::Runner.start
+Capricorn::CLI.start

data/lib/capricorn-client.rb

@@ -2,85 +2,56 @@ module Capricorn
   require 'thor'
   require 'yaml'
   require 'bertrpc'
-  require 'highline'
   require 'fileutils'
 
   require 'capricorn-client/helpers'
 
-  module CLI
+  class CLI  < Thor
+    namespace "default"
+
     require 'capricorn-client/cli/applications'
+    require 'capricorn-client/cli/applications/domains'
+    require 'capricorn-client/cli/applications/gems'
     require 'capricorn-client/cli/gems'
     require 'capricorn-client/cli/machines'
-  end
-
-  module Runner
-
-    HELP = <<-EOH
-Topics:
-  CLUSTER applications
-  # manage applications
-
-  CLUSTER gems
-  # manage gems
-
-  CLUSTER machines
-  # manage machines
-EOH
-
-    DEFAULT_CONFIG = <<-EOH
-cluster_name:
-  host: localhost
-  port: 3457
-  username: dummy
-  password: dummy
-EOH
-
-    def start
-      cluster_name = ARGV.shift
-      unless cluster_name
-        help
-        exit 1
-      end
 
-      @cluster = config[cluster_name]
-      unless @cluster
-        puts "I don't know this cluster"
-        exit 1
-      end
+    def self.banner(task)
+      "#{banner_base} #{task.formatted_usage(self, true)}"
+    end
 
-      case ARGV.shift
-      when 'applications'
-        Capricorn::CLI::Applications.start
-      when 'gems'
-        Capricorn::CLI::Gems.start
-      when 'machines'
-        Capricorn::CLI::Machines.start
+    def help(meth=nil)
+      if meth && !self.respond_to?(meth)
+        klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+        klass.start(["-h", task].compact, :shell => self.shell)
       else
-        help
+        super
       end
     end
 
-    def help
-      puts HELP
+    def method_missing(meth, *args)
+      meth = meth.to_s
+      klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+      args.unshift(task) if task
+      klass.start(args, :shell => self.shell)
     end
 
-    def cluster
-      @cluster
-    end
+    class_option :cluster,     :type => :string, :aliases => ['-c']
+    class_option :machine,     :type => :string, :aliases => ['-m', '-n', '--node']
+    class_option :application, :type => :string, :aliases => ['-a', '--app']
+    class_option :environment, :type => :string, :aliases => ['-e', '--env']
 
-    def config
-      @config ||= begin
-        config_path = File.expand_path('~/.capricorn/config.yml')
-        unless File.file?(config_path)
-          FileUtils.mkdir_p(File.dirname(config_path))
-          File.open(config_path, 'w+', 0600) { |file| file.write DEFAULT_CONFIG }
-          puts "Please edit your config file in ~/.capricorn/config.yml"
-          exit 2
-        end
-        YAML.load_file(config_path)
-      end
+    desc "deploy", "deploy an new gem"
+    def deploy
+      last = Dir.glob("pkg/*.gem").sort do |a, b|
+        File.stat(a).mtime <=> File.stat(b).mtime
+      end.last
+
+      $capr_gems_weak_push = true
+
+      invoke "gems:push", [last]
+      invoke "apps:fupdate"
     end
 
-    extend self
   end
+
 end

data/lib/capricorn-client/cli/applications.rb

@@ -1,256 +1,183 @@
-class Capricorn::CLI::Applications < Thor
+class Capricorn::CLI::Applications < Capricorn::CLI
+
+  require 'public_suffix_service'
+
   include Capricorn::Helpers
-  
+
+  namespace :apps
+
+  desc "init", "initialize the .capricorn.yml file"
+  def init
+    if File.file?('.capricorn.yml')
+      halt ".capricorn.yml already exists"
+    end
+
+    File.open(".capricorn.yml", 'w+') do |file|
+      file.write <<-EOS
+staging:
+  cluster:     CLUSTER_NAME
+  machine:     MACHINE_ID
+  application: APPLICATION_ID
+EOS
+    end
+    info "initialized .capricorn.yml"
+  end
+
   desc "list", "list all applications on MACHINE"
   def list
-    machine = select_machine
-    
     apps = client.call.applications.all(machine.to_sym).last || []
     apps.collect! do |app|
-      [app[1], app[3]]
+      [app[3], app[1]]
     end
-    apps.flatten!
-    
-    ui.table %w( Id Name ), apps, :columns_across, 2
-  end
-  
-  desc "info", "get info of an application on MACHINE"
-  def info
-    machine, id = *select_application
-    app = find_app(machine, id)
-    show_app(app)
-  end
-  
-  desc "create", "create an application on MACHINE"
-  def create
-    machine     = select_machine
-    name        = ui.ask("name: ") do |q|
-      q.validate = /^.+$/
+    apps.sort! do |a,b|
+      a[0] <=> b[0]
     end
-    environment = ui.choose do |q|
-      q.choices(*%w( production development staging testing ))
-      q.prompt = "environment: "
-      q.default = 'production'
+    width = apps.inject(0) { |m, (n, _)| (m > n.size ? m : n.size) }
+
+    apps.each do |(name, id)|
+      padding = ' ' * (width - name.size)
+      puts "#{name}#{padding} : #{id}"
     end
-    domains = []
-    domains << ui.ask("domain: ") do |q|
-      q.validate  = /^[\w\d]+(\.[\w\d]+)*$/
+  end
+
+  desc "show", "get info of an application on MACHINE"
+  def show
+    puts "           Id: #{application_info[1]}"
+    puts "      Machine: #{application_info[2]}"
+    puts "         Name: #{application_info[3]}"
+    puts "  Environment: #{application_info[5]}"
+    puts "         User: #{application_info[6]}"
+    puts "        Group: #{application_info[7]}"
+    puts "         Root: #{application_info[8]}"
+  end
+
+  desc "create NAME ENVIRONMENT DOMAINS...", "create an application on MACHINE"
+  def create(name, environment, *domains)
+    name = name.to_s.strip
+    if name.empty?
+      halt "Please choose a name!"
+    end
+
+    environment = environment.to_s.strip
+    unless %w( production development staging testing ).include?(environment)
+      halt "Please select a valid environment!"
     end
-    loop do
-      domain = ui.ask("more:   ") do |q|
-        q.validate = /^([\w\d]+(\.[\w\d]+)*)?$/
+    environment = environment.to_sym
+
+    domains = domains.flatten do |domain|
+      if domain
+        domain = domain.to_s.downcase.strip.sub(/^www\./, '')
+        begin
+          PublicSuffixService.parse(domain).to_s
+        rescue Exception
+          halt "invalid domain: #{domain}"
+        end
       end
-      break if domain.strip.empty?
-      domains << domain
+    end.compact.uniq
+    domains.delete('')
+    if domains.empty?
+      halt "Please add at least one domain!"
     end
-    
-    domains = domains.flatten.compact
-    domains = domains.collect { |d| d.downcase.sub(/^www\./, '') }
-    domains = domains.uniq
-    
-    environment = environment.to_sym
-    
+
     p client.call.applications.create(machine.to_sym, name, domains, environment)
   end
-  
-  desc "import", "import an application on MACHINE (only use this from an application dir)"
-  def import
+
+  desc "import NAME ENVIRONMENT DOMAINS...", "import an application on MACHINE (only use this from an application dir)"
+  def import(name, environment, *domains)
     root = File.expand_path(Dir.pwd)
-    
+
     unless File.file?(File.join(root, "host/config/milkshake.yml"))
-      puts ui.color('This doesn\'t appear to be a milkshake app!', :red)
-      puts ui.color('no milkshake config was found', :red)
-      exit 1
+      info 'no milkshake config was found'
+      halt 'This doesn\'t appear to be a milkshake app!'
     end
-    
+
     unless File.directory?(File.join(root, "shared"))
-      puts ui.color('This doesn\'t appear to be a milkshake app!', :red)
-      puts ui.color('no shared dir was found', :red)
-      exit 1
+      info 'no shared dir was found'
+      halt 'This doesn\'t appear to be a milkshake app!'
     end
-    
+
     gems = YAML.load_file(File.join(root, "host/config/milkshake.yml"))
     gems = (gems['gems'].keys rescue [])
     if gems.empty?
-      puts ui.color('This doesn\'t appear to be a milkshake app!', :red)
-      puts ui.color('no gems were found', :red)
-      exit 1
+      info 'no gems were found'
+      halt 'This doesn\'t appear to be a milkshake app!'
     end
-    
+
     stats = (File.stat(File.join(root, "host/config/environment.rb")) rescue nil)
     unless stats
-      puts ui.color('This doesn\'t appear to be a milkshake app!', :red)
-      puts ui.color('no environment.rb was found', :red)
-      exit 1
+      info 'no environment.rb was found'
+      halt 'This doesn\'t appear to be a milkshake app!'
     end
-    
+
     uid = (Etc.getpwuid(stats.uid).name rescue nil)
     unless uid
-      puts ui.color('This doesn\'t appear to be a milkshake app!', :red)
-      puts ui.color('no uid was found', :red)
-      exit 1
+      info 'no uid was found'
+      halt 'This doesn\'t appear to be a milkshake app!'
     end
-    
+
     gid = (Etc.getgrgid(stats.gid).name rescue nil)
     unless gid
-      puts ui.color('This doesn\'t appear to be a milkshake app!', :red)
-      puts ui.color('no gid was found', :red)
-      exit 1
-    end
-    
-    machine     = select_machine
-    name        = ui.ask("name: ") do |q|
-      q.validate = /^.+$/
-    end
-    environment = ui.choose do |q|
-      q.choices(*%w( production development staging testing ))
-      q.prompt = "environment: "
-      q.default = 'production'
+      info 'no gid was found'
+      halt 'This doesn\'t appear to be a milkshake app!'
     end
-    domains = []
-    domains << ui.ask("domain: ") do |q|
-      q.validate  = /^[\w\d]+(\.[\w\d]+)*$/
+
+    name = name.to_s.strip
+    if name.empty?
+      halt "Please choose a name!"
     end
-    loop do
-      domain = ui.ask("more:   ") do |q|
-        q.validate = /^([\w\d]+(\.[\w\d]+)*)?$/
-      end
-      break if domain.strip.empty?
-      domains << domain
+
+    environment = environment.to_s.strip
+    unless %w( production development staging testing ).include?(environment)
+      halt "Please select a valid environment!"
     end
-    
-    domains = domains.flatten.compact
-    domains = domains.collect { |d| d.downcase.sub(/^www\./, '') }
-    domains = domains.uniq
-    
     environment = environment.to_sym
-    
-    p client.call.applications.import(machine.to_sym, name, domains, environment, root, gems, uid, gid)
-  end
-  
-  desc "update", "update an application on MACHINE"
-  def update
-    machine, id = *select_application
-    app = find_app(machine, id)
-    
-    app[4]  ||= []
-    app[9]  ||= []
-    app[10] ||= []
-    
-    loop do
-      print "\e[H\e[2J" ; $stdout.flush
-      
-      show_app(app)
-      
-      puts
-      
-      ui.choose do |q|
-        q.header = "Actions"
-        q.prompt = 'What do you wan to do? '
-        
-        q.choice('gem-add') do
-          name = ui.ask("enter a gem name: ") do |q|
-            q.validate = /^([a-zA-Z0-9_-]+)?$/
-          end
-          app[10] << name unless name.strip.empty?
+
+    domains = domains.flatten do |domain|
+      if domain
+        domain = domain.to_s.downcase.strip.sub(/^www\./, '')
+        begin
+          PublicSuffixService.parse(domain).to_s
+        rescue Exception
+          halt "invalid domain: #{domain}"
         end
-        
-        q.choice('gem-remove') do
-          g = ui.choose do |q|
-            q.header = "Gems"
-            q.prompt = 'choose a gem to remove: '
-            q.choices(*app[10])
-          end
-          app[10].delete(g)
-        end
-        
-        q.choice('domain-add') do
-          domain = ui.ask("enter a domain: ") do |q|
-            q.validate = /^([\w\d]+(\.[\w\d]+)*)?$/
-          end
-          app[4] << domain unless domain.strip.empty?
-        end
-        
-        q.choice('domain-remove') do
-          domain = ui.choose do |q|
-            q.header = "Domains"
-            q.prompt = 'choose a domain to remove: '
-            q.choices(*app[4])
-          end
-          app[4].delete(domain)
-        end
-        
-        q.choice('abort') do
-          exit(0)
-        end
-        
-        q.choice('commit') do
-          p client.call.applications.update(machine.to_sym, id, app[4], app[10])
-          exit(0)
-        end
-        
       end
+    end.compact.uniq
+    domains.delete('')
+    if domains.empty?
+      halt "Please add at least one domain!"
     end
+
+    p client.call.applications.import(machine.to_sym, name, domains, environment, root, gems, uid, gid)
   end
-  
+
   desc "fupdate", "force update an application on MACHINE"
   def fupdate
-    machine, id = *select_application
+    machine, id = *application
     p client.call.applications.fupdate(machine.to_sym, id)
   end
-  
+
   desc "relink", "relink an application on MACHINE"
   def relink
-    machine, id = *select_application
+    machine, id = *application
     p client.call.applications.relink(machine.to_sym, id)
   end
-  
+
   desc "restart", "restart an application on MACHINE"
   def restart
-    machine, id = *select_application
+    machine, id = *application
     p client.call.applications.restart(machine.to_sym, id)
   end
-  
+
   desc "start", "start an application on MACHINE"
   def start
-    machine, id = *select_application
+    machine, id = *application
     p client.call.applications.start(machine.to_sym, id)
   end
-  
+
   desc "stop", "stop an application on MACHINE"
   def stop
-    machine, id = *select_application
+    machine, id = *application
     p client.call.applications.stop(machine.to_sym, id)
   end
-  
-private
-  
-  def find_app(machine ,id)
-    apps = client.call.applications.all(machine.to_sym).last || []
-    app = apps.detect do |app|
-      app[1] == id
-    end
-    
-    unless app
-      puts ui.color('Application not found!', :red)
-      exit(1)
-    end
-    
-    app
-  end
-  
-  def show_app(app)
-    app = app.to_a.dup
-    app.shift
-    app.pop
-    app.collect! do |v|
-      case v
-      when Array then v.join(', ')
-      else v.to_s
-      end
-    end
-    
-    ui.table %w( Id Machine Name Domains Environment User Group Root Installed\ Gems Requested\ Gems  ), app, :columns_down, 2
-  end
-  
+
 end

data/lib/capricorn-client/cli/applications/domains.rb

@@ -0,0 +1,61 @@
+class Capricorn::CLI::ApplicationsDomains < Capricorn::CLI
+
+  include Capricorn::Helpers
+
+  namespace "apps:domains"
+
+  desc "list", "list all domains"
+  def list
+    application_info[4].sort! do |a, b|
+      a <=> b
+    end
+    application_info[4].each do |domain|
+      puts "- #{domain}"
+    end
+  end
+
+  desc "add DOMAIN", "add a new domain"
+  def add(domain)
+    domain = domain.strip.sub(/^www\./, '')
+
+    begin
+      domain = PublicSuffixService.parse(domain).to_s
+    rescue Exception
+      halt "invalid domain: #{domain}"
+    end
+
+    machine, id = *application
+    app         = application_info
+
+    if app[4].include?(domain)
+      halt "Domain is already configured"
+    end
+
+    app[4].push(domain)
+
+    p client.call.applications.update(machine.to_sym, id, app[4], app[10])
+  end
+
+  desc "remove DOMAIN", "remove a domain"
+  def remove(domain)
+    domain = domain.strip.sub(/^www\./, '')
+
+    begin
+      domain = PublicSuffixService.parse(domain).to_s
+    rescue Exception
+      halt "invalid domain: #{domain}"
+    end
+
+    machine, id = *application
+    app         = application_info
+
+    unless app[4].include?(domain)
+      halt "Domain is not configured"
+    end
+
+    app[4].delete(domain)
+
+    p client.call.applications.update(machine.to_sym, id, app[4], app[10])
+  end
+
+end

data/lib/capricorn-client/cli/applications/gems.rb

@@ -0,0 +1,61 @@
+class Capricorn::CLI::ApplicationsGems < Capricorn::CLI
+
+  include Capricorn::Helpers
+
+  namespace "apps:gems"
+
+  desc "list", "list all gems"
+  def list
+    application_info[9].sort! do |a,b|
+      a[1] <=> b[1]
+    end
+
+    application_info[10].sort! do |a,b|
+      a <=> b
+    end
+
+    puts "Configured gems:"
+    application_info[10].each do |name|
+      puts "- #{name}"
+    end
+    puts
+
+    puts "Used gems:"
+    application_info[9].each do |gem|
+      puts "- #{gem[1]} (#{gem[2].flatten.join('.')})"
+    end
+  end
+
+  desc "add GEM_NAME", "add a new gem"
+  def add(gem_name)
+    gem_name = gem_name.strip
+
+    machine, id = *application
+    app         = application_info
+
+    if app[10].include?(gem_name)
+      halt "Gem is already configured"
+    end
+
+    app[10].push(gem_name)
+
+    p client.call.applications.update(machine.to_sym, id, app[4], app[10])
+  end
+
+  desc "remove GEM_NAME", "remove a gem"
+  def remove(gem_name)
+    gem_name = gem_name.strip
+
+    machine, id = *application
+    app         = application_info
+
+    unless app[10].include?(gem_name)
+      halt "Gem is not configured"
+    end
+
+    app[10].delete(gem_name)
+
+    p client.call.applications.update(machine.to_sym, id, app[4], app[10])
+  end
+
+end

data/lib/capricorn-client/cli/gems.rb

@@ -1,45 +1,67 @@
-class Capricorn::CLI::Gems < Thor
+class Capricorn::CLI::Gems < Capricorn::CLI
   include Capricorn::Helpers
-  
+
+  namespace :gems
+
   desc "push PATHS...", "push gems to capricorn"
   def push(*paths)
     paths = paths.flatten.collect do |path|
       Dir.glob(path)
     end.flatten
+
     paths.each do |path|
       begin
         client.call(:stream => path).gems.push
-        puts ui.color("Pushed: #{File.basename(path)}", :green)
+        info "Pushed: #{File.basename(path)}"
       rescue BERTRPC::UserError => e
-        puts ui.color(e.message, :red)
+        halt(e.message, $capr_gems_weak_push)
       end
     end
   end
-  
+
   desc "missing", "list missing gems"
   def missing
-    ui.table %w( Gem Requirements ), clean_missing(client.call.gems.missing), :columns_across, 2
+    all = clean_missing(client.call.gems.missing)
+    all.sort! { |a, b| a[0] <=> b[0] }
+    width = all.inject(0) { |m, (name, _)| (m > name.size ? m : name.size) }
+    all.each do |(name, versions)|
+      padding = ' ' * (width - name.size)
+      puts "#{padding}#{name}: #{versions}"
+    end
   end
-  
+
   desc "all", "list all gems"
   def all
-    ui.table %w( Gem Versions ), clean_all(client.call.gems.all), :columns_across, 2
+    all = clean_all(client.call.gems.all)
+    all.sort! { |a, b| a[0] <=> b[0] }
+    width = all.inject(0) { |m, (name, _)| (m > name.size ? m : name.size) }
+    all.each do |(name, versions)|
+      padding = ' ' * (width - name.size)
+      puts "#{padding}#{name}: #{versions}"
+    end
   end
-  
+
 private
-  
+
   def clean_all(gems)
     gems = gems.last
     gems.inject(Hash.new { |h,k| h[k] = [] }) do |m, g|
       header, name, version = *(g.to_ary)
+      next(m) unless version.last
       version = version.last.join('.')
       m[name.to_s] << version
       m
     end.collect do |name, versions|
-      [name, versions.join(', ')]
-    end.flatten
+      versions = versions.reverse
+      if versions.size > 5
+        versions = versions[0, 5].join(', ') + ", (and #{versions.size - 5} more)"
+      else
+        versions = versions.join(', ')
+      end
+      [name, versions]
+    end
   end
-  
+
   def clean_missing(deps)
     deps = deps.last if deps and deps.first == :ok
     return [] if deps.nil? or deps.empty?
@@ -49,9 +71,9 @@ private
         op = req.shift
         version = req.shift.to_a.last.join('.')
         "#{op} #{version}"
-      end.join(', ')
+      end.reverse.join(', ')
       [dep.first, reqs]
-    end.flatten
+    end
   end
-  
+
 end

data/lib/capricorn-client/cli/machines.rb

@@ -1,20 +1,29 @@
-class Capricorn::CLI::Machines < Thor
+class Capricorn::CLI::Machines < Capricorn::CLI
   include Capricorn::Helpers
 
+  namespace :machines
+
   desc "list", "list all machines"
   def list
-    ui.table("Machines", self.machines)
+    machines.sort! do |a, b|
+      a <=> b
+    end
+
+    puts "Machines:"
+    machines.each do |machine|
+      puts "- #{machine}"
+    end
   end
 
-  desc "reboot [NODE]", "reboot a node"
-  def reboot(node=nil)
-    node ||= select_node
+  desc "reboot", "reboot a node"
+  method_option :node, :type => :string
+  def reboot
     puts client.call.runtime.reboot(node.to_sym)
   end
 
-  desc "selfupdate [NODE]", "update a node"
-  def selfupdate(node=nil)
-    node ||= select_node
+  desc "selfupdate", "update a node"
+  method_option :node, :type => :string
+  def selfupdate
     puts client.call.runtime.selfupdate(node.to_sym)
   end
 

data/lib/capricorn-client/helpers.rb

@@ -1,43 +1,28 @@
 module Capricorn::Helpers
 
-  def select_machine
-    if self.machines.size > 1
-      ui.choose(*self.machines)
-    elsif self.machines.size == 1 and ui.agree("Use machine #{self.machines.first}? ")
-      self.machines.first
-    else
-      puts ui.color('No machines found!!!', :red)
-      exit(1)
-    end
-  end
+  require 'abbrev'
 
-  def select_node
-    if self.nodes.size > 1
-      ui.choose(*self.nodes)
-    elsif self.nodes.size == 1 and ui.agree("Use nodes #{self.nodes.first}? ")
-      self.nodes.first
-    else
-      puts ui.color('No nodes found!!!', :red)
-      exit(1)
+  DEFAULT_CONFIG = <<-EOH
+cluster_name:
+  host: localhost
+  port: 3457
+  username: dummy
+  password: dummy
+EOH
+
+  def application_ids
+    @application_ids ||= begin
+      apps = applications.collect do |app|
+        app[1]
+      end
+      apps.flatten!
+      apps
     end
   end
 
-  def select_application
-    machine = select_machine
-
-    apps = client.call.applications.all(machine.to_sym).last || []
-    apps.collect! do |app|
-      app[1]
-    end
-    apps.flatten!
-
-    if apps.size > 1
-      [machine, ui.choose(*apps)]
-    elsif apps.size == 1 and ui.agree("Use application #{apps.first}? ")
-      [machine, apps.first]
-    else
-      puts ui.color('No application found!!!', :red)
-      exit(1)
+  def applications
+    @applications ||= begin
+      client.call.applications.all(machine.to_sym).last || []
     end
   end
 
@@ -53,27 +38,188 @@ module Capricorn::Helpers
     end
   end
 
-  def client
-    cluster = Capricorn::Runner.cluster
-    host    = (cluster['host'] || 'localhost').to_s
-    port    = (cluster['port'] || 3457).to_i
-    @client ||= BERTRPC::Service.new(host, port)
+  def application_info
+    @application_info ||= begin
+      apps = applications
+      app = apps.detect do |app|
+        app[1] == application.last
+      end
+
+      unless app
+        halt 'Application not found!'
+      end
+
+      app
+    end
   end
 
-  def ui
-    @ui ||= begin
-      @ui = HighLine.new
-      @ui.extend UI
-      @ui
+  def application
+    @application ||= begin
+      application = nil
+      if options.application
+        application = options.application
+      elsif environment['application']
+        application = environment['application']
+      elsif application_ids.size == 1
+        application = application_ids.first
+        info "Selected default application: #{application}"
+      else
+        halt "Please select a application!"
+      end
+
+      if application
+        application = application_ids.abbrev[application]
+      end
+
+      unless application_ids.include?(application)
+        halt "I don't know this application!"
+      end
+
+      [machine, application]
+    end
+  end
+
+  def machine
+    @machine ||= begin
+      machine = nil
+      if options.machine
+        machine = options.machine
+      elsif environment['machine']
+        machine = environment['machine']
+      elsif machines.size == 1
+        machine = machines.first
+        info "Selected default machine: #{machine}"
+      else
+        halt "Please select a machine!"
+      end
+
+      if machine
+        machine = machines.abbrev[machine]
+      end
+
+      unless machines.include?(machine)
+        halt "I don't know this machine!"
+      end
+
+      machine
     end
   end
 
-  module UI
+  def node
+    @node ||= begin
+      node = nil
+      if options.machine
+        node = options.machine
+      elsif environment['machine']
+        node = environment['machine']
+      elsif nodes.size == 1
+        node = nodes.first
+        info "Selected default node: #{node}"
+      else
+        halt "Please select a node!"
+      end
+
+      if node
+        node = nodes.abbrev[node]
+      end
 
-    def table(headers, items, mode=:rows, option=nil)
-      headers = [headers].flatten.collect { |h| color(h, :green) }
-      @output.puts list(headers+items, mode, option)
+      unless nodes.include?(node)
+        halt "I don't know this node!"
+      end
+
+      node
     end
+  end
+
+  def cluster
+    @cluster ||= begin
+      cluster = nil
+      if options.cluster
+        cluster = options.cluster
+      elsif environment['cluster']
+        cluster = environment['cluster']
+      elsif config.size == 1
+        cluster = config.keys.first
+        info "Selected default cluster: #{cluster}"
+      else
+        halt "Please select a cluster!"
+      end
+
+      if cluster
+        cluster = config.keys.abbrev[cluster]
+      end
+
+      unless config.keys.include?(cluster)
+        halt "I don't know this cluster!"
+      end
+
+      config[cluster]
+    end
+  end
+
+  def environment
+    @environment ||= begin
+      environment = nil
+      if options.environment
+        environment = options.environment
+      elsif local_config.size == 1
+        environment = local_config.keys.first
+        info "Selected default environment: #{environment}"
+      elsif local_config.size > 1
+        halt "Please select an environment!"
+      end
+
+      if environment
+        environment = local_config.keys.abbrev[environment]
+      end
+
+      config = nil
+      if environment.nil?
+        config = {}
+      elsif local_config.keys.include?(environment)
+        config = local_config[environment]
+      else
+        halt "I don't know this environment!"
+      end
+      config
+    end
+  end
+
+  def local_config
+    @local_config ||= begin
+      if File.file?('.capricorn.yml')
+        YAML.load_file('.capricorn.yml')
+      else
+        {}
+      end
+    end
+  end
+
+  def config
+    @config ||= begin
+      config_path = File.expand_path('~/.capricorn/config.yml')
+      unless File.file?(config_path)
+        FileUtils.mkdir_p(File.dirname(config_path))
+        File.open(config_path, 'w+', 0600) { |file| file.write DEFAULT_CONFIG }
+        info "Please edit your config file in ~/.capricorn/config.yml"
+        exit 2
+      end
+      YAML.load_file(config_path)
+    end
+  end
+
+  def client
+    host    = (cluster['host'] || 'localhost').to_s
+    port    = (cluster['port'] || 3457).to_i
+    @client ||= BERTRPC::Service.new(host, port)
+  end
+
+  def info(msg)
+    shell.say_status('Info', msg)
+  end
 
+  def halt(msg, continue=false)
+    shell.say_status('Error', msg, :red)
+    exit(1) unless continue
   end
 end

data/lib/capricorn/version.rb

@@ -1,5 +1,5 @@
 module Capricorn
 
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - Simon Menke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2010-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,83 +35,83 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: mustache
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
-        - 1
+        - 0
         - 5
-        - 2
-        version: 1.5.2
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mustache
+  name: rush
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 13
         segments: 
         - 0
+        - 6
         - 5
-        - 1
-        version: 0.5.1
+        version: 0.6.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rush
+  name: session
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
+        - 3
+        - 1
         - 0
-        - 6
-        - 5
-        version: 0.6.5
+        version: 3.1.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: session
+  name: thor
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 39
         segments: 
-        - 3
-        - 1
         - 0
-        version: 3.1.0
+        - 13
+        - 6
+        version: 0.13.6
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: public_suffix_service
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 15
         segments: 
         - 0
-        - 12
-        - 3
-        version: 0.12.3
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id006
 description: Build, manage and configure many railsish web applications.
@@ -134,6 +134,8 @@ files:
 - lib/capricorn/recipes/macports.rb
 - lib/capricorn/system_context.rb
 - lib/capricorn/version.rb
+- lib/capricorn-client/cli/applications/domains.rb
+- lib/capricorn-client/cli/applications/gems.rb
 - lib/capricorn-client/cli/applications.rb
 - lib/capricorn-client/cli/gems.rb
 - lib/capricorn-client/cli/machines.rb