kylichuku-grate-handle 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/gh

@@ -4,5 +4,17 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'grate-handle'
 
-GrateHandle::CLIProcessor.new(ARGV).process
+Choice.options do
+  header ''
+  header 'Specific options:'
+
+  option :account do
+    short '-a'
+    long '--account=default'
+    desc 'An account name, specified in ~/.ghrc which will be used.'
+  end
+end
+
+
+GrateHandle::CLIProcessor.new(ARGV, GoGridManager.new(Choice.choices[:account])).process
 

data/grate-handle.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grate-handle}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kirill Ishanov"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-09-05}
   s.default_executable = %q{gh}
   s.description = %q{ Grate Handle is a small gem which simplifies the with GoGrid's API from ruby code. Also ships with a CLI tool called 'gh' which allows to perform most of the actions from http://my.gogrid.com but using true Unix CLI way. }
   s.email = %q{kirill.ishanov@gmail.com}
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "bin/gh",
      "grate-handle.gemspec",
      "lib/cli_processor.rb",
+     "lib/exceptions.rb",
      "lib/gogrid_client.rb",
      "lib/gogrid_manager.rb",
      "lib/grate-handle.rb",

data/lib/cli_processor.rb

@@ -1,5 +1,3 @@
-require 'gogrid_manager'
-
 module GrateHandle
   class CLIProcessor
     #{{{1 Initialization and accessors
@@ -14,7 +12,7 @@ module GrateHandle
     #}}}
     #{{{1 Ugly Options processing
     def process
-      case @args.shift(1).first
+      case @args.shift
       when 'list'      then list_action
       when 'help', nil then print_usage
       else             @out.puts "unknown action"
@@ -22,7 +20,7 @@ module GrateHandle
     end
 
     def list_action
-      case @args.shift(1).first
+      case @args.shift
       when 'servers'    then print_servers
       when 'images'     then print_images
       when 'ips'        then print_ips

data/lib/exceptions.rb

@@ -0,0 +1 @@
+class ConfigError < StandardError; end

data/lib/gogrid_manager.rb

@@ -18,9 +18,19 @@ module GrateHandle
     private
 
     def from_config(account=nil)
-      configs = YAML::load(File.read(File.expand_path('~/.ghrc')))
-      config = (account ? configs.select { |conf| conf['account'] == account }.first : configs.first)
-      from_params(config['apikey'], config['secret'])
+      all_configs = YAML::load(File.read(path_to_config))
+      config_for_given_acc = all_configs.select { |c| c['account'] == account }
+
+      raise ConfigError, "Account #{account} is not specified in ~/.ghrc" if (account && config_for_given_acc.empty?)
+
+      config_to_use = account ? config_for_given_acc.first : all_configs.first
+      from_params(config_to_use['apikey'], config_to_use['secret'])
+    end
+
+    def path_to_config
+      path = File.expand_path('~/.ghrc')
+      raise ConfigError, "Cannot find file with grate-handle settings (#{path})" unless File.exist?(path)
+      path
     end
 
     def from_params(apikey, secret)

data/lib/grate-handle.rb

@@ -1,3 +1,4 @@
+require 'exceptions'
 require 'gogrid_client'
 require 'monkey_patches'
 require 'gogrid_manager'
@@ -7,5 +8,6 @@ require 'cli_processor'
 require 'rubygems'
 require 'yaml'
 require 'json'
+require 'choice'
 
 include GrateHandle

data/spec/gogrid_manager_spec.rb

@@ -26,6 +26,18 @@ describe GoGridManager do
       manager = GoGridManager.new("acc2", nil)
     end
 
+    it "should raise ConfigException if there is no such account" do
+      lambda {
+        GoGridManager.new('non-existent-account', nil)
+      }.should raise_error(ConfigError)
+    end
+
+    it "should raise ConfigException if ~/.ghrc doesn't exist" do
+      stub(File).exist? { false }
+      lambda {
+        GoGridManager.new('acc', nil)
+      }.should raise_error(ConfigError)
+    end
   end
 
   def config_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kylichuku-grate-handle
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kirill Ishanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: gh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - bin/gh
 - grate-handle.gemspec
 - lib/cli_processor.rb
+- lib/exceptions.rb
 - lib/gogrid_client.rb
 - lib/gogrid_manager.rb
 - lib/grate-handle.rb
@@ -76,7 +77,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/kylichuku/grate-handle
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: A ruby library and a CLI client to GoGrid API