cloudstack_client 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c717a0dab3ed2016549deae5d529b9da29b1f083
-  data.tar.gz: 13c959b12cbc809503910b5bfd97e910ab166946
+  metadata.gz: 908b77c3fa4065282abe3a2ef5f2a48952618919
+  data.tar.gz: dcf47dca5f020ff59b9d7048f3158b847bf2e37b
 SHA512:
-  metadata.gz: c22640516a49e62f7346de350219097d9f155789435d9928b09c50c52e80bbf40584a42c3407516ca37a489862335657df6625214c18d857c459f30f846264a3
-  data.tar.gz: 61e750a05e16187411fb5b26bf26e5f363a5b2728f0442ccb4aa5b73a663f6465d084fd3320efdf038764852f5a982e9d11ad01f59721609df9c179ec031cbb6
+  metadata.gz: c8a64dbb06a0130f92c03e368296ddf9f6e6b9cc351668b8f6471c813d30cc0378fd060fc4e7b5d71e081f188f4c27ad66044bb89fb34d73e07c34c08aeae09f
+  data.tar.gz: 61f29d0710140c0dbcdd73c2ea78e63caac9b641611fbc82ac812c61261c25f5486934b6aa21704b6e9185ba9621cd47ff25c8389408d079d4dd4b6e5e8d3d93

data/lib/cloudstack_client/api.rb

@@ -3,9 +3,20 @@ require "msgpack"
 module CloudstackClient
   class Api
 
-    DEFAULT_API_VERSION = "4.2"
+    DEFAULT_API_VERSION = "4.5"
 
     attr_reader :commands
+    attr_reader :api_version
+
+    def self.versions
+      Dir["#{self.config_path}/*.msgpack"].map do |path|
+        File.basename(path, ".msgpack")
+      end
+    end
+
+    def self.config_path
+      File.expand_path("../../../config/", __FILE__)
+    end
 
     def initialize(options = {})
       if options[:api_file]
@@ -13,7 +24,10 @@ module CloudstackClient
         @api_version = File.basename(@api_file, ".msgpack")
       else
         @api_version = options[:api_version] || DEFAULT_API_VERSION
-        @api_file = File.expand_path("../../../config/#{@api_version}.msgpack", __FILE__)
+        unless Api.versions.include? @api_version
+          raise "API definition not found for #{@api_version}"
+        end
+        @api_file = File.join(Api.config_path, "#{@api_version}.msgpack")
       end
       @commands = load_commands
     end

data/lib/cloudstack_client/cli.rb

@@ -69,13 +69,22 @@ module CloudstackClient
     end
 
     desc "console", "Cloudstack Client interactive shell"
+    option :api_version,
+      desc: 'API version to use',
+      default: CloudstackClient::Api::DEFAULT_API_VERSION
+    option :api_file,
+      desc: 'specify a custom API definition file'
     def console
-      puts "cloudstack_client version #{CloudstackClient::VERSION}"
+      cs_client = client(options)
+
+      print "cloudstack_client version #{CloudstackClient::VERSION}"
+      puts " (CloudStack API version #{cs_client.api.api_version})"
       puts '  try: list_virtual_machines state: "Started"'
+
       ARGV.clear
       env = options[:env] ? options[:env] : load_configuration.last
       Ripl.config[:prompt] = "#{env} >> "
-      Ripl.start binding: client.instance_eval('binding')
+      Ripl.start binding: cs_client.instance_eval('binding')
     end
 
     no_commands do

data/lib/cloudstack_client/client.rb

@@ -1,3 +1,4 @@
+require "cloudstack_client/version"
 require "cloudstack_client/api"
 require "cloudstack_client/error"
 require "cloudstack_client/utils"

data/lib/cloudstack_client/connection.rb

@@ -105,7 +105,7 @@ module CloudstackClient
         when 1
           return data['jobresult']
         when 2
-          raise JobError, "Request failed (#{data['jobresultcode']}). #{data['jobresult']}."
+          raise JobError, "Request failed (#{data['jobresultcode']}): #{data['jobresult']['errortext']}."
         end
 
         STDOUT.flush if @verbose

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -111,6 +111,7 @@ files:
 - bin/cloudstack_client
 - cloudstack_client.gemspec
 - config/4.2.msgpack
+- config/4.5.msgpack
 - lib/cloudstack_client.rb
 - lib/cloudstack_client/api.rb
 - lib/cloudstack_client/cli.rb