cloudkick 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/cloudkick.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudkick}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cloudkick"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-02-23}
   s.default_executable = %q{cloudkick}
   s.description = %q{Ruby interface to the Cloudkick API}
   s.email = %q{support@cloudkick.com}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/cloudkick/base.rb",
      "lib/cloudkick/command.rb",
      "lib/cloudkick/commands/base.rb",
+     "lib/cloudkick/commands/help.rb",
      "lib/cloudkick/commands/parallel.rb",
      "lib/cloudkick/node.rb",
      "test/helper.rb",

data/lib/cloudkick/command.rb

@@ -9,7 +9,15 @@ module Cloudkick
 
     class << self
       def run(command, args)
-        run_internal(command, args.dup)
+        begin
+          run_internal(command, args.dup)
+        rescue InvalidCommand
+          error "Unknown command. Run 'cloudkick help' for usage information."
+        rescue CommandFailed => e
+          error e.message
+        rescue Interrupt => e
+          error "\n[canceled]"
+        end
       end
 
       def run_internal(command, args)
@@ -19,6 +27,11 @@ module Cloudkick
         runner.send(method)
       end
 
+      def error(msg)
+        STDERR.puts(msg)
+        exit 1
+      end
+
       def parse(command)
         return eval("Cloudkick::Command::#{command.capitalize}"), :index
       end

data/lib/cloudkick/commands/base.rb

@@ -6,6 +6,15 @@ module Cloudkick::Command
       @args = args
     end
 
+    def display(msg, newline=true)
+      if newline
+        puts(msg)
+      else
+        print(msg)
+        STDOUT.flush
+      end
+    end
+    
     def client
       if !@client
         key, secret = credentials
@@ -16,18 +25,37 @@ module Cloudkick::Command
     end
 
     def credentials
-      key = ''
-      File.open('/etc/cloudkick.conf') do |f|
-        f.grep(/oauth_key (\w+)/) { key = $1 }
-      end
+      begin
+        key = ''
+        File.open('/etc/cloudkick.conf') do |f|
+          f.grep(/oauth_key (\w+)/) { key = $1 }
+        end
 
-      secret = ''
-      File.open('/etc/cloudkick.conf') do |f|
-        f.grep(/oauth_secret (\w+)/) { secret = $1 }
-      end
+        secret = ''
+        File.open('/etc/cloudkick.conf') do |f|
+          f.grep(/oauth_secret (\w+)/) { secret = $1 }
+        end
 
-      return key, secret
+        return key, secret
+      rescue
+        raise CommandFailed, 'Unable to open /etc/cloudkick.conf'
+      end
     end
 
+    def extract_option(options, default=true)
+      values = options.is_a?(Array) ? options : [options]
+      return unless opt_index = args.select { |a| values.include? a }.first
+      opt_position = args.index(opt_index) + 1
+      if args.size > opt_position && opt_value = args[opt_position]
+        if opt_value.include?('--')
+          opt_value = nil
+        else
+          args.delete_at(opt_position)
+        end
+      end
+      opt_value ||= default
+      args.delete(opt_index)
+      block_given? ? yield(opt_value) : opt_value
+    end
   end
 end

data/lib/cloudkick/commands/help.rb

@@ -0,0 +1,72 @@
+module Cloudkick::Command
+  class Help < Base
+    class HelpGroup < Array
+      attr_reader :title
+
+      def initialize(title)
+        @title = title
+      end
+
+      def command(name, description)
+        self << [name, description]
+      end
+
+      def space
+        self << ['', '']
+      end
+    end
+
+    def self.groups
+      @groups ||= []
+    end
+
+    def self.group(title, &block)
+      groups << begin
+                  group = HelpGroup.new(title)
+                  yield group
+                  group
+                end
+    end
+
+    def self.create_default_groups!
+      group 'Commands' do |group|
+        group.command 'help',                               'show this usage'
+        group.command 'version',                            'show the gem version'
+        group.space
+        group.command 'pssh <username> <output> <command>', 'parallel ssh your nodes'
+      end
+    end
+
+    def index
+      display usage
+    end
+
+    def version
+      display Cloudkick::Client.version
+    end
+
+    def usage
+      longest_command_length = self.class.groups.map do |group|
+        group.map { |g| g.first.length }
+      end.flatten.max
+
+      self.class.groups.inject(StringIO.new) do |output, group|
+        output.puts "=== %s" % group.title
+        output.puts
+
+        group.each do |command, description|
+          if command.empty?
+            output.puts
+          else
+            output.puts "%-*s # %s" % [longest_command_length, command, description]
+          end
+        end
+
+        output.puts
+        output
+      end.string
+    end
+  end
+end
+
+Cloudkick::Command::Help.create_default_groups!

data/lib/cloudkick/commands/parallel.rb

@@ -3,6 +3,10 @@ require 'tempfile'
 module Cloudkick::Command
   class Pssh < Base
     def index
+      unless args.size == 3
+        raise CommandFailed, 'usage: cloudkick pssh <username> <output> <command>'
+      end
+
       file = Tempfile.new('ck')
 
       client.get('nodes').each do |node|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudkick
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Cloudkick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -08:00
+date: 2010-02-23 00:00:00 -08:00
 default_executable: cloudkick
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/cloudkick/base.rb
 - lib/cloudkick/command.rb
 - lib/cloudkick/commands/base.rb
+- lib/cloudkick/commands/help.rb
 - lib/cloudkick/commands/parallel.rb
 - lib/cloudkick/node.rb
 - test/helper.rb