cloudstack_client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43509af9b335f021f6a89803c57489e0fa9a4c41
-  data.tar.gz: f3ea42424fd79f38946b04d06f4199efb0820c33
+  metadata.gz: 6127adfd7dadcb64018f35d332657b3bc1337249
+  data.tar.gz: 400f596034466b1efc5f406646f26b0cc1a2846a
 SHA512:
-  metadata.gz: 843305242656b87b1bc394156b093a627285b07e9164f5e20831aa4152677e6c9843f48908398d06b49c74ad7aaad8b34fc917922b285314b6feb2b291f882be
-  data.tar.gz: 51e7e002f60f1a0b6be2186811eb71c9bde6c1d2a14dfed07febc2a73f3938d006ed4b45dd5e91399f5f2d63d0413f8c629183dcf40a4a5ef60883ca8a65efc5
+  metadata.gz: f4edc4749533a536be14b1b8c718abd47144ebba52a6bc9f737901cf32a94723394da94328680b6c1206857690ef7921ab6bf0403f3c9a45de155971ddef29e1
+  data.tar.gz: 51a48c6e1934569891e42fa012645d831ebac09fbf397b89f1191371370355fcea9cfb7c91b9491d1e2e6da6c930770a7fc8246c49445182d01150cdc4d997e0

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Nik Wolfgramm
+Copyright (c) 2013-2015 Nik Wolfgramm
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/lib/cloudstack_client/api.rb

@@ -7,6 +7,8 @@ module CloudstackClient
 
     DEFAULT_API_VERSION = "4.2"
 
+    attr_reader :commands
+
     def initialize(options = {})
       if options[:api_file]
         @api_file = options[:api_file]
@@ -15,15 +17,46 @@ module CloudstackClient
         @api_version = options[:api_version] || DEFAULT_API_VERSION
         @api_file = File.expand_path("../../../config/#{@api_version}.msgpack", __FILE__)
       end
+      @commands = load_commands
+    end
+
+    def command_supports_param?(command, key)
+      commands[command].params.detect { |p| p["name"] == key }
+    end
+
+    def required_params(command)
+      commands[command].params.map do |param|
+        param["name"] if param["required"] == true
+      end.compact
+    end
+
+    def all_required_params?(command, args)
+      required_params(command).all? {|k| args.key? k}
     end
 
-    def commands
+    def normalize_key(key)
+      key.to_s.gsub("_", "")
+    end
+
+    def missing_params_msg(command)
+      requ = required_params(command)
+      "#{command} requires the following parameter#{ 's' if requ.size > 1}: #{requ.join(', ')}"
+    end
+
+    private
+
+    def load_commands
       begin
         api = MessagePack.unpack(IO.read @api_file)
       rescue => e
         raise "Error: Unable to read file '#{@api_file}' : #{e.message}"
       end
-      api["api"].map {|command| OpenStruct.new command }
+      @command_map
+      commands = Hash.new
+      api["api"].each do |command|
+        commands[command["name"]] = OpenStruct.new command
+      end
+      commands
     end
 
   end

data/lib/cloudstack_client/cli.rb

@@ -1,9 +1,9 @@
-require 'cloudstack_client/client'
-require 'yaml'
+require "cloudstack_client/client"
+require "yaml"
 
 begin
-  require 'thor'
-  require 'ripl'
+  require "thor"
+  require "ripl"
 rescue LoadError => e
   missing_gem = if e.message =~ /thor/
     "thor"
@@ -12,7 +12,7 @@ rescue LoadError => e
   else
     raise
   end
-  puts "Please install the #{missing_gem} gem first ('gem install #{missing_gem}')"
+  puts "Please install the #{missing_gem} gem first ('gem install #{missing_gem}')."
   exit 1
 end
 

data/lib/cloudstack_client/client.rb

@@ -1,35 +1,36 @@
 require "cloudstack_client/api"
 require "cloudstack_client/error"
+require "cloudstack_client/utils"
 require "cloudstack_client/connection"
 
 module CloudstackClient
   class Client < Connection
-
-    attr_accessor :api_version, :api_path
+    include Utils
+    attr_accessor :options
+    attr_reader :api
 
     def initialize(api_url, api_key, secret_key, options = {})
-      super(api_url, api_key, secret_key, options = {})
-      @api_version = options[:api_version] if options[:api_version]
-      @api_file = options[:api_file] if options[:api_file]
+      super(api_url, api_key, secret_key, options)
       define_api_methods unless options[:no_api_methods]
     end
 
     def define_api_methods
-      Api.new(api_file: @api_file, api_version: @api_version).commands.each do |command|
+      @api = Api.new(@options)
+      @api.commands.each do |name, command|
         method_name = camel_case_to_underscore(command.name).to_sym
 
         define_singleton_method(method_name) do |args = {}, options = {}|
           params = {"command" => command.name}
 
           args.each do |k, v|
-            k = normalize_key(k)
-            if v != nil && command_supports_key?(command, k)
+            k = @api.normalize_key(k)
+            if v != nil && @api.command_supports_param?(command.name, k)
               params[k] = v
             end
           end
 
-          unless all_required_args?(command, params)
-            raise ParameterError, missing_args_msg(command)
+          unless @api.all_required_params?(command.name, params)
+            raise ParameterError, @api.missing_params_msg(command.name)
           end
 
           sync = command.isasync == false || options[:sync]
@@ -38,37 +39,5 @@ module CloudstackClient
       end
     end
 
-    def command_supports_key?(command, key)
-      command.params.detect { |p| p["name"] == key }
-    end
-
-    def required_args(command)
-      command.params.map do |param|
-        param["name"] if param["required"] == true
-      end.compact
-    end
-
-    def all_required_args?(command, args)
-      required_args(command).all? {|k| args.key? k}
-    end
-
-    private
-
-    def normalize_key(key)
-      key.to_s.gsub("_", "")
-    end
-
-    def missing_args_msg(command)
-      requ = required_args(command)
-      "#{command.name} requires the following argument#{ 's' if requ.size > 1}: #{requ.join(', ')}"
-    end
-
-    def camel_case_to_underscore(camel_case)
-      camel_case.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").downcase
-    end
-
   end # class
 end

data/lib/cloudstack_client/connection.rb

@@ -1,10 +1,10 @@
-require 'base64'
-require 'openssl'
-require 'uri'
-require 'cgi'
-require 'net/http'
-require 'net/https'
-require 'json'
+require "base64"
+require "openssl"
+require "uri"
+require "cgi"
+require "net/http"
+require "net/https"
+require "json"
 
 module CloudstackClient
   class Connection
@@ -20,6 +20,7 @@ module CloudstackClient
       @debug = options[:debug] ? true : false
       @async_poll_interval = options[:async_poll_interval] || 2.0
       @async_timeout = options[:async_timeout] || 400
+      @options = options
     end
 
     ##
@@ -62,7 +63,7 @@ module CloudstackClient
         body = JSON.parse(response.body).values.first
       rescue JSON::ParserError
         raise ParseError,
-          "Response from server is not readable. Check if the API endpoint (#{@api_url}) is correct is accessible."
+          "Response from server is not readable. Check if the API endpoint (#{@api_url}) is correct and accessible."
       end
 
       if response.is_a? Net::HTTPOK
@@ -77,8 +78,8 @@ module CloudstackClient
           body.size == 0 ? [] : body
         end
       else
-        message = data[data.keys.first]['errortext'] rescue body
-        raise ApiError, "Error #{response.code} - #{message}."
+        message = body['errortext'] rescue body
+        raise ApiError, "Status #{response.code}: #{message}."
       end
     end
 

data/lib/cloudstack_client/utils.rb

@@ -0,0 +1,10 @@
+module CloudstackClient
+  module Utils
+    def camel_case_to_underscore(camel_case)
+      camel_case.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").downcase
+    end
+  end
+end

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -102,6 +102,7 @@ files:
 - lib/cloudstack_client/client.rb
 - lib/cloudstack_client/connection.rb
 - lib/cloudstack_client/error.rb
+- lib/cloudstack_client/utils.rb
 - lib/cloudstack_client/version.rb
 homepage: https://github.com/niwo/cloudstack_client
 licenses: