cloudstack_client 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1908e792f8375d14f488b04d8cb71135c1a73bc
-  data.tar.gz: 9988940067c7287d18419bcfba91ca73a7e52e2f
+  metadata.gz: 22cde3225726af7ad083a0e1229787ac49dbdea1
+  data.tar.gz: a5a7875cf042c75c5f7f30b613c5e3f6a373bedf
 SHA512:
-  metadata.gz: 47de7e778de3e3c4eb718603aee7d7177b1ae1dea1fa703953e30d6c18356b4d59c11fc030cbb1963dabefd7f3d02aba8ad084fe3c9c730d6e595a26a277967f
-  data.tar.gz: c96b9eed861a34eb49c7f13194b0c43b39793a99e69625547f36be9b7f777b5f72d706e17bd63328b7aaf83e4ffd5e97e5822ff363b9f8c86ae4afcf4d6a256d
+  metadata.gz: b5816f54df0d72a8d19e003f32f962025abc3d582c2aebdf4fe33b3d39d224d0eca91dc2fea8632b3be3280b6b01f0a1c763b9efb2c821f2acf773f963041cc2
+  data.tar.gz: 3a9f9ed794405204cdd3773d8f63ec20c7b0f5e846f2eb51d595d46f38213a48913df144f84cdfb054e8bce92724b1fb52c7d65dcaec1e4f57eb4ae0e7a14482

data/.gitignore

@@ -1,5 +1,6 @@
-Gemfile.lock
 .bundle/*
 .bundle
+vendor
+vendor/*
 pkg/*
-pkg
+pkg

data/.travis.yml

@@ -1 +1,13 @@
 language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - 2.3.0
+before_install:
+  - gem update --system
+  - gem update bundler
+install:
+  - bundle install --deployment --path vendor/bundle
+cache: bundler

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    cloudstack_client (1.2.0)
+      multi_json (~> 1.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bond (0.5.1)
+    minitest (5.8.3)
+    multi_json (1.11.2)
+    rake (10.4.2)
+    ripl (0.7.1)
+      bond (~> 0.5.1)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cloudstack_client!
+  minitest (~> 5.8)
+  rake (~> 10.4)
+  ripl (~> 0.7)
+  thor (~> 0.19)

data/README.md

@@ -14,13 +14,13 @@ $ gem install cloudstack_client
 ```
 
 ## Features
-  - Dynamically builds API methods based on the lisApis function of CloudStack
+  - Interactive console for playing with the CloudStack API: ```cloudstack_client console```
+  - Dynamically builds API methods based on the listApis function of CloudStack
   - Command names are converted to match Ruby naming conventions (i.e. ListVirtualMachines becomes list_virtual_machines)
-  - Accepts Ruby style args passed to commands (i.e. list_all: true becomes listall=true)
-  - makes sure all required arguments are passed
+  - Accepts Ruby Hash arguments passed to commands as options (i.e. list_all: true becomes listall=true)
+  - Makes sure all required arguments are passed
   - Removes unsupported arguments and arguments with nil values from commands
 
-
 ## Usage
 
 ### Basic usage
@@ -41,7 +41,7 @@ end
 
 ### Initialize with options
 
-Load API definition file from a alternative path and set the version:
+*Load API definition file from a alternative path and set the version:*
 
 ```ruby
 cs = CloudstackClient::Client.new(
@@ -55,7 +55,7 @@ cs = CloudstackClient::Client.new(
 )
 ```
 
-..or load the API definition directly from a file:
+*..or load the API definition directly from a file:*
 
 ```ruby
 cs = CloudstackClient::Client.new(
@@ -66,29 +66,29 @@ cs = CloudstackClient::Client.new(
 )
 ```
 
-## Development
-
-### Generate/Update API versions
+### Interactive Console
 
-New API configs can be generated using the list_apis command.
+cloudstack_client comes with an interactive shell to test the client.
 
 *Example:*
 
 ```bash
-# running against an CloudStack 4.5 API endpoint:
-$ cloudstack_client list_apis > data/4.5.json
-$ gzip data/4.5.json
+$ cloudstack_client console -e prod
+prod >> list_virtual_machines
 ```
 
-### Interactive Console
+## Development
 
-cloudstack_client comes with an interactive shell to test the client.
+### Generate/Update API versions
+
+New API configs can be generated using the list_apis command.
 
 *Example:*
 
 ```bash
-$ cloudstack_client console -e prod
-prod >> list_virtual_machines
+# running against an CloudStack 4.5 API endpoint:
+$ cloudstack_client list_apis > data/4.5.json
+$ gzip data/4.5.json
 ```
 
 ## References
@@ -104,6 +104,6 @@ prod >> list_virtual_machines
 
 ## License
 
-Copyright (c) 2014-2015, Nik Wolfgramm
+Copyright (c) 2014-2016, Nik Wolfgramm
 
 Released under the MIT License. See the [LICENSE](https://raw.github.com/niwo/cloudstack_client/master/LICENSE.txt) file for further details.

data/cloudstack_client.gemspec

@@ -20,11 +20,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
-  gem.add_development_dependency('rdoc', '~> 4.2.0')
-  gem.add_development_dependency('rake', '~> 10.4.2')
-  gem.add_development_dependency('thor', '~> 0.19.1')
-  gem.add_development_dependency('ripl', '~> 0.7.0')
-  gem.add_development_dependency('minitest', '~> 5.8.2')
+  gem.add_development_dependency('rake', '~> 10.4')
+  gem.add_development_dependency('thor', '~> 0.19')
+  gem.add_development_dependency('ripl', '~> 0.7')
+  gem.add_development_dependency('minitest', '~> 5.8')
 
-  gem.add_dependency('json_pure', '~> 1.8.3')
+  gem.add_dependency('multi_json', '~> 1.11')
 end

data/lib/cloudstack_client/api.rb

@@ -1,5 +1,5 @@
 require "zlib"
-require "json"
+require "multi_json"
 
 module CloudstackClient
   class Api
@@ -46,8 +46,8 @@ module CloudstackClient
 
     def missing_params_msg(command)
       "#{command} requires the following parameter" +
-        "#{ 's' if required_params(command).size > 1 }: " +
-        required_params(command).join(", ")
+      "#{ 's' if required_params(command).size > 1 }: " +
+      required_params(command).join(", ")
     end
 
     private
@@ -87,7 +87,7 @@ module CloudstackClient
     def load_commands
       @commands = {}
       Zlib::GzipReader.open(@api_file) do |gz|
-        JSON.parse(gz.read)
+        MultiJson.load(gz.read)
       end.each {|cmd| @commands[cmd["name"]] = cmd }
     rescue => e
       raise "Error: Unable to read file '#{@api_file}': #{e.message}"

data/lib/cloudstack_client/cli.rb

@@ -1,6 +1,6 @@
 require "cloudstack_client/client"
 require "yaml"
-require "json"
+require "multi_json"
 
 begin
   require "thor"
@@ -63,7 +63,7 @@ module CloudstackClient
       when "yaml"
         apis.to_yaml
       else
-        options[:pretty_print] ? JSON.pretty_generate(apis) : apis.to_json
+        MultiJson.dump(apis, pretty: options[:pretty_print])
       end
     end
 
@@ -73,6 +73,10 @@ module CloudstackClient
       default: CloudstackClient::Api::DEFAULT_API_VERSION
     option :api_file,
       desc: 'specify a custom API definition file'
+    option :pretty_print,
+      desc: 'pretty client output',
+      type: :numeric,
+      default: true
     def console
       cs_client = client(options)
 

data/lib/cloudstack_client/connection.rb

@@ -4,10 +4,11 @@ require "uri"
 require "cgi"
 require "net/http"
 require "net/https"
-require "json"
+require "multi_json"
 
 module CloudstackClient
   class Connection
+    include Utils
 
     attr_accessor :api_url, :api_key, :secret_key, :verbose, :debug
     attr_accessor :async_poll_interval, :async_timeout
@@ -36,7 +37,7 @@ module CloudstackClient
         "#{key}=#{value}"
       end
 
-      debug_output JSON.pretty_generate(params) if @debug
+      print_debug_output MultiJson.dump(params, pretty: true) if @debug
 
       data = params_arr.join('&')
       signature = OpenSSL::HMAC.digest('sha1', @secret_key, data.downcase)
@@ -60,10 +61,10 @@ module CloudstackClient
       end
 
       begin
-        body = JSON.parse(response.body).values.first
-      rescue JSON::ParserError
+        body = MultiJson.load(response.body).values.first
+      rescue MultiJson::ParseError
         raise ParseError,
-          "Response from server is not readable. Check if the API endpoint (#{@api_url}) is correct and accessible."
+          "Response from server is not readable. Check if the API endpoint (#{@api_url}) is valid and accessible."
       end
 
       if response.is_a? Net::HTTPOK
@@ -122,13 +123,5 @@ module CloudstackClient
       (@async_timeout / @async_poll_interval).round
     end
 
-    def debug_output(output, seperator = '-' * 80)
-      puts
-      puts seperator
-      puts output
-      puts seperator
-      puts
-    end
-
   end
 end

data/lib/cloudstack_client/utils.rb

@@ -1,10 +1,20 @@
 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
+
+    def print_debug_output(output, seperator = '-' * 80)
+      puts
+      puts seperator
+      puts output
+      puts seperator
+      puts
+    end
+    
   end
 end

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test/benchmark.rb

@@ -2,7 +2,7 @@
 
 require "cloudstack_client/api"
 require "benchmark"
-require "json"
+require "multi_json"
 
 GC.disable
 
@@ -22,8 +22,13 @@ end
 gc_stat_after = GC.stat
 memory_after = `ps -o rss= -p #{Process.pid}`.to_i/1024
 
-puts({
-  time: time.round(2),
-  gc_count: gc_stat_after[:count] - gc_stat_before[:count],
-  memory: "%dM" % (memory_after - memory_before)
-}.to_json)
+puts(
+  MultiJson.dump(
+    {
+      time: time.round(2),
+      gc_count: gc_stat_after[:count] - gc_stat_before[:count],
+      memory: "%dM" % (memory_after - memory_before)
+    },
+    pretty: true
+  )
+)

metadata

@@ -1,99 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: ripl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.2
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.2
+        version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '1.11'
 description: CloudStack API client written in Ruby
 email:
 - nik.wolfgramm@gmail.com
@@ -105,6 +91,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -147,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: CloudStack API client written in Ruby