cloudstack_client 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4cd4b017446c7e94c52e7f8522852bf0dad509
-  data.tar.gz: 91e77bfe5a99bd81d3fb304afd7c87d90057271b
+  metadata.gz: 7fff1252133afca0d217d2dba42a9ef41f9d0124
+  data.tar.gz: 8004e1b1557234b62fde004cbd1461f7fc42f4fd
 SHA512:
-  metadata.gz: a9a4801541cc3d5c7f63938822a7ceaf19206a19097ed11eabf1e30619d63d791d3f7e7d10d9752d9cf834824d2de834885b8415fefb3d5c9a41421a281e01a8
-  data.tar.gz: 0c239a5ac06de097b634297d44cc039cd1ad68e461be8beb90d0b77e50cb6701052c38d9bc15e3d562c9b2f0471c92a4287e5067776a6d7f94d93986fc266d8a
+  metadata.gz: 0b12dc68ad181f9b03338814820d2951779ff5fe994db00ebc63128bd8bdc22c90a93e562297cc713fbea477458e144f5ff471bcac9f4e55bcad2f43ab6b9546
+  data.tar.gz: 0379fd6f4294c0d93cfa500f56fd4133e1b1448046c0ebf20b7c20d85f87e7cae39aa5d407411ad85eec97a5645478d7dabad1e74f79959d96943cdef39f4970

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack_client (1.4.0)
+    cloudstack_client (1.4.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -31,7 +31,7 @@ require "cloudstack_client"
 cs = CloudstackClient::Client.new(
   "https://cloudstack.local/client/api",
   "API_KEY",
-  "API_SECRET"
+  "SECRET_KEY"
 )
 
 cs.list_virtual_machines(state: "running").each do |server|
@@ -47,7 +47,7 @@ end
 cs = CloudstackClient::Client.new(
   "https://cloudstack.local/client/api",
   "API_KEY",
-  "API_SECRET",
+  "SECRET_KEY",
   {
     api_path: "~/cloudstack",
     api_version: "4.6"

data/Rakefile

@@ -6,6 +6,7 @@ Bundler::GemHelper.install_tasks
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = "test/*_test.rb"
+  t.warning = false
 end
 
 desc "Run Tests"

data/lib/cloudstack_client/cli.rb

@@ -34,6 +34,19 @@ module CloudstackClient
       desc: 'enable debug output',
       type: :boolean
 
+    # rescue error globally
+    def self.start(given_args=ARGV, config={})
+      super
+    rescue => e
+      error_class = e.class.name.split('::')
+      if error_class.size == 2 && error_class.first == "CloudstackClient"
+        puts "\e[31mERROR\e[0m: #{error_class.last} - #{e.message}"
+        puts e.backtrace if ARGV.include? "--debug"
+      else
+        raise
+      end
+    end
+
     desc "version", "Print cloudstack_client version number"
     def version
       say "cloudstack_client version #{CloudstackClient::VERSION}"
@@ -123,7 +136,7 @@ module CloudstackClient
         end
 
         unless config.key?(:url) && config.key?(:api_key) && config.key?(:secret_key)
-          say "The environment #{env || '\'-\''} contains no valid data.", :red
+          say "The environment #{env || '\'-\''} does not contain all required keys.", :red
           exit 1
         end
         return config, env

data/lib/cloudstack_client/connection.rb

@@ -13,15 +13,19 @@ module CloudstackClient
     attr_accessor :api_url, :api_key, :secret_key, :verbose, :debug
     attr_accessor :async_poll_interval, :async_timeout
 
+    DEF_POLL_INTERVAL = 2.0
+    DEF_ASYNC_TIMEOUT = 400
+
     def initialize(api_url, api_key, secret_key, options = {})
       @api_url = api_url
       @api_key = api_key
       @secret_key = secret_key
       @verbose = options[:quiet] ? false : true
       @debug = options[:debug] ? true : false
-      @async_poll_interval = options[:async_poll_interval] || 2.0
-      @async_timeout = options[:async_timeout] || 400
+      @async_poll_interval = options[:async_poll_interval] || DEF_POLL_INTERVAL
+      @async_timeout = options[:async_timeout] || DEF_ASYNC_TIMEOUT
       @options = options
+      validate_input!
     end
 
     ##
@@ -127,12 +131,20 @@ module CloudstackClient
 
     private
 
+    def validate_input!
+      raise InputError, "API URL not set." if @api_url == nil
+      raise InputError, "API KEY not set." if @api_key == nil
+      raise InputError, "API SECRET KEY not set." if @secret_key == nil
+      raise InputError, "ASYNC POLL INTERVAL must be at least 1." if @async_poll_interval < 1.0
+      raise InputError, "ASYNC TIMEOUT must be at least 60." if @async_timeout < 60
+    end
+
     def max_tries
       (@async_timeout / @async_poll_interval).round
     end
 
     def escape(input)
-      CGI.escape(input.to_s).gsub('+', '%20').gsub(' ','%20')
+      CGI.escape(input.to_s).gsub('+', '%20').gsub(' ', '%20')
     end
 
   end

data/lib/cloudstack_client/error.rb

@@ -6,4 +6,5 @@ module CloudstackClient
   class ApiError < Error; end
   class JobError < Error; end
   class TimeoutError < Error; end
+  class InputError < Error; end
 end

data/lib/cloudstack_client/utils.rb

@@ -17,11 +17,11 @@ module CloudstackClient
       end
     end
 
-    def print_debug_output(output, seperator = '-' * 80)
+    def print_debug_output(output, separator = '-' * 80)
       puts
-      puts seperator
+      puts separator
       puts output
-      puts seperator
+      puts separator
       puts
     end
 

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake