smartdc 0.3.0 → 0.4.0

data/Gemfile

@@ -1,16 +1,16 @@
 source "http://rubygems.org"
 
 group :development do
-  gem "rspec", "~> 2.7.0"
+  gem "rspec", "~> 2.8.0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "jeweler", "~> 1.8.3"
+  gem "rcov", "~> 0.9.11"
   gem "uuid", "~> 2.3.4"
 end
 
 group :runtime do
-  gem "faraday", "~> 0.7.5"
+  gem "faraday", "~> 0.7.6"
   gem "hashie", "~> 1.2.0"
-  gem "multi_json", "~> 1.0.3"
-  gem "multipart-post", "~> 1.1.3"
-end
+  gem "multi_json", "~> 1.1.0"
+  gem "multipart-post", "~> 1.1.4"
+end

data/README.md

@@ -65,23 +65,23 @@ Connect and Machine find.
     end
 
 
-Return type of the variable.
+Format of the return value.
 
     client = Smartdc.new(config)
     
     # Type of a variable to mash. (Default)
-    client.request.return_variable = 'mash'
+    client.format = 'mash'
     puts client.datacenters.find #=> #<Hashie::Mash example="example.com">
 
     # Type of a variable to hash.
-    client.request.return_variable = 'hash'
+    client.format = 'hash'
     puts client.datacenters.find #=> {"example"=>"https://example.com"}
 
     # Type of a variable to json.
-    client.request.return_variable = 'json'
+    client.format = 'json'
     puts client.datacenters.find #=> {"example": "https://example.com"}
 
 
 ## Copyright
 
-Copyright (c) 2011 ogom. See LICENSE.md for further details.
+Copyright (c) 2012 ogom. See LICENSE.md for further details.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/sdc-addmachinemetadata

@@ -23,7 +23,7 @@ end
 
 begin
   metadata = {options[:key] => options[:value]}
-  pp client.machines(ARGV[0]).metadata.create metadata
+  puts client.machines(ARGV[0]).metadata.create metadata
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-addmachinetag

@@ -23,7 +23,7 @@ end
 
 begin
   tag = {options[:key] => options[:value]}
-  pp client.machines(ARGV[0]).tags.create tag
+  puts client.machines(ARGV[0]).tags.create tag
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-createinstrumentation

@@ -21,8 +21,7 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
   puts client.analytics.instrumentations.create options
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-createkey

@@ -26,8 +26,7 @@ else
 end
 
 begin
-  client.request.return_variable = 'json'
   puts client.keys.create key
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-createmachine

@@ -10,12 +10,11 @@ OptionParser.new do |opts|
   opts.on('-p', '--package NAME', 'Name of the package to use on provisioning.') {|v| options[:package] = v }
   opts.on('-h','--help') do
     puts opts
-    print 'Datasets(urn):'
+    print "\n" + 'Datasets(urn):'
     fixture('datasets').each do |dataset|
       print ' ' + dataset['urn']
     end
-    puts
-    print 'Packages(name):'
+    print "\n\n" + 'Packages(name):'
     fixture('packages').each do |packages|
       print ' ' + packages['name']
     end
@@ -32,8 +31,9 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines.create options
-rescue => e
+rescue Smartdc::Error::Conflict => e
   puts e
+rescue => e
+  puts e.inspect
 end

data/bin/sdc-createmachinesnapshot

@@ -21,8 +21,7 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines(ARGV[0]).snapshots.create options
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-deleteinstrumentation

@@ -4,7 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  pp client.analytics.instrumentations(ARGV[0]).delete
+  client.analytics.instrumentations(ARGV[0]).delete
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-deletekey

@@ -4,7 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  pp client.keys(ARGV[0]).delete
+  client.keys(ARGV[0]).delete
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-deletemachine

@@ -4,7 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  pp client.machines(ARGV[0]).delete
+  client.machines(ARGV[0]).delete
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-deletemachinemetadata

@@ -21,7 +21,9 @@ OptionParser.new do |opts|
 end
 
 begin
-  pp client.machines(ARGV[0]).metadata(options[:key]).delete 
+  client.machines(ARGV[0]).metadata(options[:key]).delete 
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-deletemachinesnapshot

@@ -21,8 +21,9 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
-  puts client.machines(ARGV[0]).snapshots(options[:name]).delete 
+  client.machines(ARGV[0]).snapshots(options[:name]).delete 
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-deletemachinetag

@@ -21,7 +21,9 @@ OptionParser.new do |opts|
 end
 
 begin
-  pp client.machines(ARGV[0]).tags(options[:key]).delete 
+  client.machines(ARGV[0]).tags(options[:key]).delete 
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-describeanalytics

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.analytics.describe
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getdatacenter

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.datacenters(ARGV[0]).read
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getdataset

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.datasets(ARGV[0]).read
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getinstrumentation

@@ -21,12 +21,11 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
   if options[:value]
     puts client.analytics.instrumentations(ARGV[0]).value
   else
     puts client.analytics.instrumentations(ARGV[0]).read
   end
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getkey

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.keys(ARGV[0]).read
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getmachine

@@ -4,8 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines(ARGV[0]).read
-rescue => e
+rescue Smartdc::Error::NotFound => e
   puts e
+rescue => e
+  puts e.inspect
 end

data/bin/sdc-getmachinemetadata

@@ -3,9 +3,10 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
+
+
 begin
-  client.request.return_variable = 'json'
-  puts client.machines(ARGV[0]).metadata.find 
+  puts client.machines(ARGV[0]).metadata.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getmachinesnapshot

@@ -21,8 +21,7 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines(ARGV[0]).snapshots(options[:name]).read 
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getmachinetag

@@ -21,8 +21,7 @@ OptionParser.new do |opts|
 end
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines(ARGV[0]).tags(options[:key]).read 
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-getpackage

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.packages((ARGV[0])).read
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listdatacenters

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.datacenters.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listdatasets

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.datasets.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listinstrumentations

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.analytics.instrumentations.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listkeys

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.keys.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listmachines

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listmachinesnapshots

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines(ARGV[0]).snapshots.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listmachinetags

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.machines(ARGV[0]).tags.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-listpackages

@@ -4,8 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  client.request.return_variable = 'json'
   puts client.packages.find
 rescue => e
-  puts e
+  puts e.inspect
 end

data/bin/sdc-rebootmachine

@@ -4,7 +4,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'cli_helper'
 
 begin
-  pp client.machines(ARGV[0]).reboot
+  client.machines(ARGV[0]).reboot
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end

data/bin/sdc-resizemachine

@@ -9,7 +9,7 @@ OptionParser.new do |opts|
   opts.on('-p', '--package NAME', 'Name of the package to use on provisioning.') {|v| options[:package] = v }
   opts.on('-h','--help') do
     puts opts
-    print 'Packages(name):'
+    print "\n" + 'Packages(name):'
     fixture('packages').each do |packages|
       print ' ' + packages['name']
     end
@@ -26,7 +26,9 @@ OptionParser.new do |opts|
 end
 
 begin
-  pp client.machines(ARGV[0]).resize options
+  client.machines(ARGV[0]).resize options
 rescue => e
-  puts e
+  puts e.inspect
+else
+  puts "Success"  
 end