occi-cli 4.2.0.beta.15 → 4.2.0.beta.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a2b00987c176b2bfa6e48fb90a96c1b1efb207
-  data.tar.gz: 6a1e5ec53ad4c893a13d9ec11af762fd64499cfc
+  metadata.gz: 2ae47add82d1e227122778d88ee9a300dfb63873
+  data.tar.gz: 938818b0e0210f0fd3dfe7c90d546f4da81b1829
 SHA512:
-  metadata.gz: cc7c1212bfe3a953cb825b15658b90af30fbd5b68dda96130c0c5729aa63cf3da759b169d01eac468f597fc0d2e867fef90098c4997fa1df8e0dd34e9b025693
-  data.tar.gz: c647cc2830298c3c0269b63ad0c7cc679a53c459f79c9759a32448aa0562e25bb4d7333e1a0d17a8341c6069d42450ecee4980cb591ee08222306ef5af66b8d3
+  metadata.gz: 73dca9cb77e9018df43f469db3253f688915407c842c1c896d95562bea9394f02149ad1308f56dd8b47f254a7cb30b8b67ae365d40217f9fe4edaf6e8f63f95c
+  data.tar.gz: 0d8c8f459612f1bbf8ffc150252805baf6399cff58f5e5471084a79d47830cfcf1c08678d1f2af980947a48b18fcb22f656a9a1dd5f86bd05e5b2090b6483e9e

data/bin/occi

@@ -25,20 +25,20 @@ require 'occi-cli'
 options = Occi::Cli::OcciOpts.parse ARGV
 
 # initialize logger
-logger = Occi::Log.new(options.log[:out])
+logger = Occi::Cli::Log.new(options.log[:out])
 logger.level = options.log[:level]
-options.log[:logger] = logger
+options.log[:logger] = logger.api_log
 
 # initialize output factory
 output = Occi::Cli::ResourceOutputFactory.new options.output_format
 
-Occi::Log.info "Starting OCCI client ..."
-Occi::Log.debug "Options: #{options}"
+Occi::Cli::Log.info "Starting OCCI client ..."
+Occi::Cli::Log.debug "Options: #{options}"
 
 # running with an empty password, we should ask the user for one
 # if auth method is not "none"
 if options.auth[:password].nil? || options.auth[:user_cert_password].nil?
-  Occi::Log.debug "Password is not set, asking for it now ..."
+  Occi::Cli::Log.debug "Password is not set, asking for it now ..."
 
   options.auth[:user_cert_password] = ask("Enter a password: ") {
       |q| q.echo = '*'
@@ -49,14 +49,14 @@ end
 
 # establish a connection
 begin
-  Occi::Log.info "Establishing a connection to #{options.endpoint} ..."
+  Occi::Cli::Log.info "Establishing a connection to #{options.endpoint} ..."
 
   options.auto_connect = true
   connect :http, options
 rescue OpenSSL::SSL::SSLError => ssl_ex
   # generic SSL error raised whilst establishing a connection
   # possibly an untrusted server cert or invalid user credentials 
-  Occi::Log.fatal "An SSL error occurred! Please, make sure your credentials " \
+  Occi::Cli::Log.fatal "An SSL error occurred! Please, make sure your credentials " \
                   "are valid and recognized by the endpoint! Message: #{ssl_ex.message}"
 
   raise ssl_ex if options.debug
@@ -64,7 +64,7 @@ rescue OpenSSL::SSL::SSLError => ssl_ex
 rescue OpenSSL::PKey::RSAError => key_ex
   # generic X509 error raised whilst reading user's credentials from a file
   # possibly a wrong password or mangled/unsupported credential format
-  Occi::Log.fatal "An X509 error occurred! Please, make sure you are using the " \
+  Occi::Cli::Log.fatal "An X509 error occurred! Please, make sure you are using the " \
                   "right password and the file contains both your certificate " \
                   "and your private key! Message: #{key_ex.message}"
 
@@ -73,16 +73,16 @@ 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::Log.fatal "Connection refused by #{options.endpoint}!"
+  Occi::Cli::Log.fatal "Connection refused by #{options.endpoint}!"
   exit!
 rescue Errno::ETIMEDOUT
   # connection attempt timed out
-  Occi::Log.fatal "Connection to #{options.endpoint} timed out!"
+  Occi::Cli::Log.fatal "Connection to #{options.endpoint} timed out!"
   exit!
 rescue Exception => ex
   # something went wrong during the execution
   # hide the stack trace in non-debug modes
-  Occi::Log.fatal "An error occurred! Message: #{ex.message}"
+  Occi::Cli::Log.fatal "An error occurred! Message: #{ex.message}"
 
   raise ex if options.debug
   exit!
@@ -92,7 +92,7 @@ end
 if options.dump_model
 
   if !model.respond_to? :instance_variables
-    Occi::Log.fatal "Your Ruby doesn't support 'instance_variables' calls!"
+    Occi::Cli::Log.fatal "Your Ruby doesn't support 'instance_variables' calls!"
     exit!
   end
 
@@ -130,7 +130,7 @@ end
 # start executing actions
 begin
 
-  Occi::Log.info "Executing action #{options.action.to_s} on #{options.resource} ..."
+  Occi::Cli::Log.info "Executing action #{options.action.to_s} on #{options.resource} ..."
 
   # call the appropriate helper and then format its output
   case options.action
@@ -149,7 +149,7 @@ begin
     when :refresh
       refresh
     when :skip, :test, :dry_run
-      Occi::Log.info "Just a connection test ..."
+      Occi::Cli::Log.info "Just a connection test ..."
     else
       raise "Unknown action [#{options.action}]!"
   end
@@ -157,15 +157,15 @@ begin
 rescue Errno::ECONNREFUSED
   # remote server refused our connection attempt(s)
   # even though initial connect was successful
-  Occi::Log.fatal "Connection refused by #{options.endpoint}!"
+  Occi::Cli::Log.fatal "Connection refused by #{options.endpoint}!"
   exit!
 rescue Exception => ex
   # something went wrong during the execution
   # hide the stack trace in non-debug modes
-  Occi::Log.fatal "An error occurred! Message: #{ex.message}"
+  Occi::Cli::Log.fatal "An error occurred! Message: #{ex.message}"
 
   raise ex if options.debug
   exit!
 end
 
-Occi::Log.info "OCCI client is shutting down ..."
+Occi::Cli::Log.info "OCCI client is shutting down ..."

data/lib/occi/cli/helpers/create_helper.rb

@@ -6,7 +6,7 @@ module Occi::Cli::Helpers::CreateHelper
     if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource)
       location = helper_create_resource(options)
     else
-      Occi::Log.warn "I have no idea what #{options.resource.inspect} is ..."
+      Occi::Cli::Log.warn "I have no idea what #{options.resource.inspect} is ..."
       raise "Unknown resource #{options.resource.inspect}, there is nothing to create here!"
     end
 
@@ -16,11 +16,11 @@ module Occi::Cli::Helpers::CreateHelper
   end
 
   def helper_create_resource(options)
-    Occi::Log.debug "#{options.resource.inspect} is a resource type."
+    Occi::Cli::Log.debug "#{options.resource.inspect} is a resource type."
 
     res = resource(options.resource)
 
-    Occi::Log.debug "Creating #{options.resource.inspect}: #{res.inspect}"
+    Occi::Cli::Log.debug "Creating #{options.resource.inspect}: #{res.inspect}"
 
     helper_create_attach_mixins(options, res)
 
@@ -42,14 +42,14 @@ module Occi::Cli::Helpers::CreateHelper
     # TODO: enable check
     #res.check
 
-    Occi::Log.debug "Creating #{options.resource.inspect}: #{res.inspect}"
+    Occi::Cli::Log.debug "Creating #{options.resource.inspect}: #{res.inspect}"
 
     create res
   end
 
   def helper_create_attach_links(options, res)
     return unless options.links
-    Occi::Log.debug "with links: #{options.links.inspect}"
+    Occi::Cli::Log.debug "with links: #{options.links.inspect}"
 
     options.links.each do |link|
       if link.start_with? options.endpoint
@@ -57,10 +57,10 @@ module Occi::Cli::Helpers::CreateHelper
       end
 
       if link.include? "/storage/"
-        Occi::Log.debug "Adding storagelink to #{options.resource.inspect}"
+        Occi::Cli::Log.debug "Adding storagelink to #{options.resource.inspect}"
         res.storagelink link
       elsif link.include? "/network/"
-        Occi::Log.debug "Adding networkinterface to #{options.resource.inspect}"
+        Occi::Cli::Log.debug "Adding networkinterface to #{options.resource.inspect}"
         res.networkinterface link
       else
         raise "Unknown link type #{link.inspect}, stopping here!"
@@ -70,10 +70,10 @@ module Occi::Cli::Helpers::CreateHelper
 
   def helper_create_attach_mixins(options, res)
     return unless options.mixins
-    Occi::Log.debug "with mixins: #{options.mixins.inspect}"
+    Occi::Cli::Log.debug "with mixins: #{options.mixins.inspect}"
 
     options.mixins.to_a.each do |mxn|
-      Occi::Log.debug "Adding mixin #{mxn.inspect} to #{options.resource.inspect}"
+      Occi::Cli::Log.debug "Adding mixin #{mxn.inspect} to #{options.resource.inspect}"
 
       orig_mxn = model.get_by_id(mxn.type_identifier)
       if orig_mxn.blank?
@@ -89,7 +89,7 @@ module Occi::Cli::Helpers::CreateHelper
   def helper_create_attach_context_vars(options, res)
     # TODO: find a better/universal way to do contextualization
     return unless options.context_vars
-    Occi::Log.debug "with context variables: #{options.context_vars.inspect}"
+    Occi::Cli::Log.debug "with context variables: #{options.context_vars.inspect}"
 
     options.context_vars.each_pair do |var, val|
       schema = nil
@@ -104,7 +104,7 @@ module Occi::Cli::Helpers::CreateHelper
         schema = "http://schemas.openstack.org/compute/instance#"
         mxn_attrs['org.openstack.compute.user_data'] = {}
       else
-        Occi::Log.warn "Unknown context variable! #{var.to_s.inspect}"
+        Occi::Cli::Log.warn "Unknown context variable! #{var.to_s.inspect}"
         schema = "http://schemas.ogf.org/occi/core#"
       end
 
@@ -118,7 +118,7 @@ module Occi::Cli::Helpers::CreateHelper
       when 'user_data', :user_data
         res.attributes['org.openstack.compute.user_data'] = val
       else
-        Occi::Log.warn "Not setting attributes for an unknown context variable! #{var.to_s.inspect}"
+        Occi::Cli::Log.warn "Not setting attributes for an unknown context variable! #{var.to_s.inspect}"
       end
     end
   end

data/lib/occi/cli/helpers/delete_helper.rb

@@ -4,16 +4,16 @@ module Occi::Cli::Helpers::DeleteHelper
     unless resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) || options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
       message = "Resource #{options.resource.inspect} cannot be deleted!"
 
-      Occi::Log.error message
+      Occi::Cli::Log.error message
       raise ArgumentError, message
     end
 
     if delete(options.resource)
-      Occi::Log.info "Resource #{options.resource.inspect} successfully removed!"
+      Occi::Cli::Log.info "Resource #{options.resource.inspect} successfully removed!"
     else
       message = "Failed to remove resource #{options.resource.inspect}!"
 
-      Occi::Log.error message
+      Occi::Cli::Log.error message
       raise message
     end
 

data/lib/occi/cli/helpers/describe_helper.rb

@@ -2,17 +2,17 @@ module Occi::Cli::Helpers::DescribeHelper
 
   def helper_describe(options, output = nil)
     if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) || options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
-      Occi::Log.debug "#{options.resource.inspect} is a resource type, type identifier or an actual resource."
+      Occi::Cli::Log.debug "#{options.resource.inspect} is a resource type, type identifier or an actual resource."
 
       found = Occi::Core::Resources.new
       found.merge describe(options.resource)
     elsif mixin_types.include?(options.resource) || mixin_type_identifiers.include?(options.resource)
-      Occi::Log.debug "#{options.resource.inspect} is a mixin type or type identifier."
+      Occi::Cli::Log.debug "#{options.resource.inspect} is a mixin type or type identifier."
 
       found = mixins(options.resource)
       found = mixins(options.resource, true) if found.blank?
     elsif options.resource.include?('#')
-      Occi::Log.debug "#{options.resource.inspect} might be a specific mixin identifier."
+      Occi::Cli::Log.debug "#{options.resource.inspect} might be a specific mixin identifier."
 
       potential_mixin = options.resource.split('/').last.split('#')
       raise "Given resource is not a specific mixin identifier! #{options.resource.inspect}" unless potential_mixin.size == 2
@@ -23,7 +23,7 @@ module Occi::Cli::Helpers::DescribeHelper
       found = Occi::Core::Mixins.new
       found << mxn
     else
-      Occi::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      Occi::Cli::Log.error "I have no idea what #{options.resource.inspect} is ..."
       raise "Unknown resource #{options.resource.inspect}, there is nothing to describe here!"
     end
 

data/lib/occi/cli/helpers/link_helper.rb

@@ -42,7 +42,7 @@ module Occi::Cli::Helpers::LinkHelper
   end
 
   def helper_link_create_link(options, link_kind, link)
-    Occi::Log.debug "Linking #{link.inspect} to #{options.resource.inspect}"
+    Occi::Cli::Log.debug "Linking #{link.inspect} to #{options.resource.inspect}"
 
     link_instance = Occi::Core::Link.new(link_kind)
     link_instance.source = sanitize_instance_link(options.resource)
@@ -60,10 +60,10 @@ module Occi::Cli::Helpers::LinkHelper
   def helper_link_attach_mixins(mixins, link)
     return if mixins.blank?
 
-    Occi::Log.debug "with mixins: #{mixins.inspect}"
+    Occi::Cli::Log.debug "with mixins: #{mixins.inspect}"
 
     mixins.to_a.each do |mxn|
-      Occi::Log.debug "Adding mixin #{mxn.inspect} to #{link.inspect}"
+      Occi::Cli::Log.debug "Adding mixin #{mxn.inspect} to #{link.inspect}"
 
       orig_mxn = model.get_by_id(mxn.type_identifier)
       if orig_mxn.blank?

data/lib/occi/cli/helpers/list_helper.rb

@@ -4,13 +4,13 @@ module Occi::Cli::Helpers::ListHelper
     found = []
 
     if resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource)
-      Occi::Log.debug "#{options.resource.inspect} is a resource type."
+      Occi::Cli::Log.debug "#{options.resource.inspect} is a resource type."
       found = list options.resource
     elsif mixin_types.include?(options.resource) || mixin_type_identifiers.include?(options.resource)
-      Occi::Log.debug "#{options.resource.inspect} is a mixin type."
+      Occi::Cli::Log.debug "#{options.resource.inspect} is a mixin type."
       found = mixin_list options.resource
     else
-      Occi::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      Occi::Cli::Log.error "I have no idea what #{options.resource.inspect} is ..."
       raise "Unknown resource #{options.resource.inspect}, there is nothing to list here!"
     end
 

data/lib/occi/cli/helpers/trigger_helper.rb

@@ -4,7 +4,7 @@ module Occi::Cli::Helpers::TriggerHelper
     unless resource_types.include?(options.resource) || resource_type_identifiers.include?(options.resource) \
                                                      || \
            options.resource.start_with?(options.endpoint) || options.resource.start_with?('/')
-      Occi::Log.error "I have no idea what #{options.resource.inspect} is ..."
+      Occi::Cli::Log.error "I have no idea what #{options.resource.inspect} is ..."
       raise "Unknown resource #{options.resource.inspect}, there is nothing to trigger here!"
     end
 
@@ -13,11 +13,11 @@ module Occi::Cli::Helpers::TriggerHelper
     action_instance.attributes = options.attributes
 
     if trigger(options.resource, action_instance)
-      Occi::Log.info "Action #{options.trigger_action.type_identifier.inspect} " \
+      Occi::Cli::Log.info "Action #{options.trigger_action.type_identifier.inspect} " \
                      "triggered on #{options.resource.inspect}!"
     else
       message = "Failed to trigger an action on #{options.resource.inspect}!"
-      Occi::Log.error message
+      Occi::Cli::Log.error message
       raise message
     end
 
@@ -30,7 +30,7 @@ module Occi::Cli::Helpers::TriggerHelper
     ti = action_type_identifier(action.term)
     if ti.blank?
       message = "Failed to identify action #{action.type_identifier.inspect} in the model!"
-      Occi::Log.error message
+      Occi::Cli::Log.error message
       raise message
     end
 

data/lib/occi/cli/log.rb

@@ -0,0 +1,31 @@
+require 'logger'
+
+module Occi::Cli
+  class Log < ::Occi::Log
+
+    SUBSCRIPTION_HANDLE = "rOCCI-cli.log"
+
+    attr_reader :api_log
+
+    def initialize(log_dev, log_prefix = '[rOCCI-cli]')
+      @api_log = ::Occi::Api::Log.new(log_dev) 
+      super
+    end
+
+    def close
+      super
+      @api_log.close
+    end
+
+    # @param severity [::Logger::Severity] severity
+    def level=(severity)
+      @api_log.level = severity
+      super
+    end
+
+    def core_log
+      @api_log.core_log
+    end
+
+  end
+end

data/lib/occi/cli/occi_opts.rb

@@ -212,8 +212,8 @@ module Occi::Cli
                 "--log-level LEVEL",
                 LOG_LEVELS,
                 "Set the specified logging level, only: [#{LOG_LEVELS.join('|')}]") do |log_level|
-          unless options.log.level == Occi::Log::DEBUG
-            options.log.level = Occi::Log.const_get(log_level.to_s.upcase)
+          unless options.log.level == Occi::Cli::Log::DEBUG
+            options.log.level = Occi::Cli::Log.const_get(log_level.to_s.upcase)
           end
         end
 
@@ -243,7 +243,7 @@ module Occi::Cli
                      "--debug",
                      "Enable debugging messages") do |debug|
           options.debug = debug
-          options.log.level = Occi::Log::DEBUG
+          options.log.level = Occi::Cli::Log::DEBUG
         end
 
         opts.on_tail("-h",
@@ -299,7 +299,7 @@ module Occi::Cli
 
       options.log = {}
       options.log.out = STDERR
-      options.log.level = Occi::Log::ERROR
+      options.log.level = Occi::Cli::Log::ERROR
 
       options.filter = nil
       options.dump_model = false

data/lib/occi/cli/version.rb

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

data/lib/occi-cli.rb

@@ -4,6 +4,7 @@ require 'occi-api'
 module Occi::Cli; end
 
 require 'occi/cli/version'
+require 'occi/cli/log'
 require 'occi/cli/errors'
 require 'occi/cli/resource_output_factory'
 require 'occi/cli/occi_opts'
@@ -12,4 +13,4 @@ require 'occi/cli/occi_opts'
 extend Occi::Api::Dsl
 
 # include helpers
-require 'occi/cli/helpers'
+require 'occi/cli/helpers'

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.14'
+  gem.add_dependency 'occi-api', '= 4.2.0.beta.15'
   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.15
+  version: 4.2.0.beta.16
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.14
+        version: 4.2.0.beta.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta.14
+        version: 4.2.0.beta.15
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - lib/occi/cli/helpers/link_helper.rb
 - lib/occi/cli/helpers/list_helper.rb
 - lib/occi/cli/helpers/trigger_helper.rb
+- lib/occi/cli/log.rb
 - lib/occi/cli/occi_opts.rb
 - lib/occi/cli/occi_opts/cli_examples.erb
 - lib/occi/cli/occi_opts/occi_opts_helper.rb