occi-cli 4.2.0.beta.18 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 636013164f6e96bad6aa0dd8c4cf279735ecc5e1
-  data.tar.gz: 4cf7a194060a2572ac09647b4907ea39262be32b
+  metadata.gz: 65e10804d47573dec0a66e2b3c787414f459de59
+  data.tar.gz: 54c7e23213d0571c2a702f1a7869e5f761f462c7
 SHA512:
-  metadata.gz: 509f1ef2f7adb7b9e4c9180729639a3d332584a637c4dcab103dcd0ec7cff96697516543b9be4ef499a08c560e5833feb6a3247dacad02171d09371e02bf3149
-  data.tar.gz: d7f9a5f2e31b13078be79672e54a14f60d631d27ea0bf08a2966d59a7ca0dcfcb5cb3f5724af7b0ad9f87aeccc5ec2be08688597f89e3581d3348e856118fd6a
+  metadata.gz: eb575a9516a736fa9bafb3e71f9a4920c564953ce1588d18dc499a6590398df5130fbd064b519dd6a08574b4284be017e228438cec972b2313b9f207ce1717d3
+  data.tar.gz: 9eb16ad029683427ff326ca544715155e7bd12b2a4e11d9141bf17e1997178d8fb1a8030b5b780e55f696eb2a50de5c9c1278ee0cc8e8901cca84ed5c78f7fc9

data/.travis.yml

@@ -41,3 +41,4 @@ branches:
     - master
     - 4.0.x
     - 4.1.x
+    - 4.2.x

data/bin/occi

@@ -33,7 +33,7 @@ options.log[:logger] = logger.api_log
 output = Occi::Cli::ResourceOutputFactory.new options.output_format
 
 Occi::Cli::Log.info "Starting OCCI client ..."
-Occi::Cli::Log.debug "Options: #{options}"
+Occi::Cli::Log.debug "Options: #{options.inspect}"
 
 # running with an empty password, we should ask the user for one
 # if auth method is not "none"
@@ -49,7 +49,7 @@ end
 
 # establish a connection
 begin
-  Occi::Cli::Log.info "Establishing a connection to #{options.endpoint} ..."
+  Occi::Cli::Log.info "Establishing a connection to #{options.endpoint.inspect} ..."
 
   options.auto_connect = true
   connect :http, options
@@ -73,13 +73,13 @@ rescue OpenSSL::PKey::RSAError => key_ex
 rescue Errno::ECONNREFUSED
   # the remote server has refused our connection attempt(s)
   # there is nothing we can do ...
-  Occi::Cli::Log.fatal "Connection refused by #{options.endpoint}!"
+  Occi::Cli::Log.fatal "Connection refused by #{options.endpoint.inspect}!"
   exit!
-rescue Errno::ETIMEDOUT
+rescue Errno::ETIMEDOUT, Net::OpenTimeout, Net::ReadTimeout
   # connection attempt timed out
-  Occi::Cli::Log.fatal "Connection to #{options.endpoint} timed out!"
+  Occi::Cli::Log.fatal "Connection to #{options.endpoint.inspect} timed out!"
   exit!
-rescue Exception => ex
+rescue => ex
   # something went wrong during the execution
   # hide the stack trace in non-debug modes
   Occi::Cli::Log.fatal "An error occurred! Message: #{ex.message}"
@@ -101,7 +101,7 @@ if options.dump_model
   # iterate through available instance variables
   collection.instance_variables.each do |inst_var_sym|
     puts "#"*79
-    puts "Dumping #{inst_var_sym.to_s}:"
+    puts "Dumping #{inst_var_sym.to_s.inspect}:"
 
     inst_var = collection.instance_variable_get(inst_var_sym)
     next unless inst_var.respond_to? :each
@@ -130,7 +130,7 @@ end
 # start executing actions
 begin
 
-  Occi::Cli::Log.info "Executing action #{options.action.to_s} on #{options.resource} ..."
+  Occi::Cli::Log.info "Executing action #{options.action.inspect} on #{options.resource.inspect} ..."
 
   # call the appropriate helper and then format its output
   case options.action
@@ -151,15 +151,19 @@ begin
     when :skip, :test, :dry_run
       Occi::Cli::Log.info "Just a connection test ..."
     else
-      raise "Unknown action [#{options.action}]!"
+      raise "Unknown action #{options.action.inspect}!"
   end
 
 rescue Errno::ECONNREFUSED
   # remote server refused our connection attempt(s)
   # even though initial connect was successful
-  Occi::Cli::Log.fatal "Connection refused by #{options.endpoint}!"
+  Occi::Cli::Log.fatal "Connection refused by #{options.endpoint.inspect}!"
   exit!
-rescue Exception => ex
+rescue Errno::ETIMEDOUT, Net::OpenTimeout, Net::ReadTimeout
+  # connection attempt timed out
+  Occi::Cli::Log.fatal "Connection to #{options.endpoint.inspect} timed out!"
+  exit!
+rescue => ex
   # something went wrong during the execution
   # hide the stack trace in non-debug modes
   Occi::Cli::Log.fatal "An error occurred! Message: #{ex.message}"

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.2.0.beta.18" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.2.0" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'occi-api', '= 4.2.0.beta.17'
+  gem.add_dependency 'occi-api', '~> 4.2.0'
   gem.add_dependency 'json'
   gem.add_dependency 'highline'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.18
+  version: 4.2.0
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -16,16 +16,16 @@ dependencies:
   name: occi-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.17
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.17
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -118,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11