cloudmonkey 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e31c8c37b9e6a32f225f6142d0a7f413967ead9
+  data.tar.gz: c51471ea36165d660a4f4cb76f59882596e08233
+SHA512:
+  metadata.gz: fded3968fb7d8d3d9c2a567944c3b659ddda1a7679921d1f3abed0fe78119fbabe12fde03eda50f2b5b0ef8528f20e26468d500f0d61a32bed6efd634a5fa16f
+  data.tar.gz: 5737d919a6b3b52fc614d1ba49986e042e82ef4de37095821ab523783926e08620a7132d5788759d32076c73a6aafbc5eb0e1f8e964bb6222723f7764dc21d82

data/lib/cm.rb

@@ -18,7 +18,7 @@ module CloudMonkey
 
       @conf_dir = params[:conf_dir] || File.join("#{Dir.home}", ".cloudmonkey-cmrb")
       Dir.mkdir(@conf_dir) if not Dir.exists?(@conf_dir)
-      
+
       @config = params[:config] || File.join(@conf_dir, "config")
       @cache = File.join(@conf_dir, "cache")
       @log = File.join(@conf_dir, "log")
@@ -83,18 +83,18 @@ module CloudMonkey
     def method_missing(name, *args)
       cmd = name.to_s.split('_').join(' ').strip
       execute cmd, args[0]
-    end    
+    end
 
-    private    
+    private
     # Run a cloudmonkey command.
     def run_cmd(input, params = nil)
       input += ' '
-     
+
       # We recognize hash parameters and straight-up string
       # parameters, but nothing else
       unless params.nil?
         if params.is_a?(Hash)
-          params.each { |key, value| 
+          params.each { |key, value|
             value = "\"#{value}\"" if value.is_a?(String)
             input += "#{key.downcase}=#{value} "
           }
@@ -105,13 +105,20 @@ module CloudMonkey
           raise 'We do not know how to handle these parameters'
         end
       end
-      
+
       cmd = "cloudmonkey -c #{@config} '#{input}'"
       output = nil
+      error = nil
 
       puts "running #{cmd}" if @debug
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
         output = stdout.read
+        error = stderr.read.strip
+      end
+
+      # did stderr return some problem?
+      if !error.nil? && !error.empty?
+        return handle_non_json_output(error)
       end
 
       # usually the output is json, but not if it is an error or just
@@ -122,7 +129,7 @@ module CloudMonkey
         # whatever you are making and the jobid (2 keys)
         if json.has_key?(:jobid) and json.length <= 2
           handle_async_job(json[:jobid])
-        else 
+        else
           # it is a query result.
           return json
         end
@@ -141,7 +148,7 @@ module CloudMonkey
         sleep(3)
         result = run_cmd('query asyncjobresult', :jobid => jobid)
       end
-      
+
       # if there is a job result, we are interested only in
       # that. otherwise just return the whole response because we
       # don't really know what's in it.
@@ -152,7 +159,7 @@ module CloudMonkey
     # error or if it's just a generic message. Errors are raised as a
     # runtime exception, while generic messages are put into a hash
     # with a :message property.
-    def handle_non_json_output(message)     
+    def handle_non_json_output(message)
       # handle various error messages, otherwise simply return a hash
       # with the message
       if message.start_with?('[Errno') or message.start_with?('Unauthorized:')
@@ -172,7 +179,7 @@ module CloudMonkey
     def initialize(cm)
       @cm = cm
     end
-    
+
     # Return a single network by name.
     def list_physical_network(name)
       networks = @cm.list_physicalnetworks(:name => name)
@@ -195,7 +202,7 @@ module CloudMonkey
     def enable_custom_vrouter_provider(provider, iface_id, zone_id)
       nsp = @cm.add_networkserviceprovider(:name => provider, :physicalnetworkid => iface_id)
       nsp = nsp[:networkserviceprovider]
-       
+
       element = @cm.create_virtualrouterelement(:nspid => nsp[:id])[:virtualrouterelement]
       @cm.configure_virtualrouterelement(:enabled => true, :id => element[:id])
       new_nsp = @cm.update_networkserviceprovider(:state => 'Enabled', :id => nsp[:id])
@@ -214,4 +221,4 @@ module CloudMonkey
     end
 
   end
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudmonkey
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - GreenQloud
@@ -23,26 +22,26 @@ files:
 homepage: https://github.com/greenqloud/cloudmonkey-ruby
 licenses:
 - Apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CloudMonkey-Ruby
 test_files: []
+has_rdoc: