occi-api 4.2.0.beta.14 → 4.2.0.beta.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7610d847f41dcce7d386c39adab48066bac4ae
-  data.tar.gz: 503e8cb17de12da525ab24be836295a05992780f
+  metadata.gz: 1fd9d35cc6faff4bdad01821af58fce357fafa38
+  data.tar.gz: f68dc05a6b11820607275059fc4bc7435be03c4a
 SHA512:
-  metadata.gz: 0197ee150d6c92cea361c2d913848a5c4def90375e3c3efc64a2f747cdad73fe523bcaf84eb17449e9859894a026aea98fdd1d566240d6499a86c44ad9787dd2
-  data.tar.gz: ec1ac07e7ed42c66b5b70bfe8da18632c0c72f609e3cdfde0addd214732b1541137a3ef65df0870cce8cbd540b81c898fef66d680a7482ce5be253ec3a43549b
+  metadata.gz: 995087000d3f6802fbce5d2ab8bfc0525d5e7d0ee0ad4be24db7af897e28d82d9faabbf17443d5e626dc7944cdd86803f50dc3915f5805bee4cd2f6563b8af03
+  data.tar.gz: 1466c82b129a9cf4c9bf70b30dbb914040f2c43ee8b74103c57d450d0acd9e5d2d9c4b61f6e555d1420d1e1147914e61e7d032a00dcf1687c16d06a3c0fa7b78

data/README.md

@@ -132,7 +132,7 @@ To connect to an OCCI endpoint/server (e.g. running on http://localhost:3300/ )
     options = {
       :endpoint => "http://localhost:3300/",
       :auth => {:type => "none"},
-      :log => {:out => STDERR, :level => Occi::Log::WARN, :logger => nil},
+      :log => {:out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil},
       :auto_connect => "value", auto_connect => true,
       :media_type => nil
     }
@@ -209,7 +209,7 @@ To connect to an OCCI endpoint/server (e.g. running on http://localhost:3300/ )
     options = {
       :endpoint => "http://localhost:3300/",
       :auth => {:type => "none"},
-      :log => {:out => STDERR, :level => Occi::Log::WARN, :logger => nil},
+      :log => {:out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil},
       :auto_connect => "value", auto_connect => true,
       :media_type => nil
     }
@@ -286,14 +286,14 @@ The OCCI gem includes its own logging mechanism using a message queue. By defaul
 A new OCCI Logger can be initialized by specifying the log destination (either a filename or an IO object like
 STDOUT) and the log level.
 
-    logger = Occi::Log.new STDOUT
-    logger.level = Occi::Log::INFO
+    logger = Occi::Api::Log.new STDOUT
+    logger.level = Occi::Api::Log::INFO
 
 You can create multiple Loggers to receive the log output.
 
-You can always, even if there is no logger defined, log output using the class methods of OCCI::Log e.g.
+You can always, even if there is no logger defined, log output using the class methods of OCCI::Api::Log e.g.
 
-    Occi::Log.info("Test message")
+    Occi::Api::Log.info("Test message")
 
 Changelog
 ---------

data/examples/dsl_example.rb

@@ -29,7 +29,7 @@ connect(
     },
     :log => {
       :out   => STDERR,
-      :level => Occi::Log::DEBUG
+      :level => Occi::Api::Log::DEBUG
     }
   }
 )

data/examples/x509auth_example.rb

@@ -24,7 +24,7 @@ client = Occi::Api::Client::ClientHttp.new({
   },
   :log => {
     :out   => STDERR,
-    :level => Occi::Log::DEBUG
+    :level => Occi::Api::Log::DEBUG
   }
 })
 

data/lib/occi-api.rb

@@ -9,6 +9,7 @@ module Occi::Api::Dsl; end
 module Occi::Api::Client::Errors; end
 
 require 'occi/api/version'
+require 'occi/api/log'
 require 'occi/api/client/authn_utils'
 require 'occi/api/client/errors'
 require 'occi/api/client/client_base'

data/lib/occi/api/client/base/entity_methods.rb

@@ -15,7 +15,7 @@ module Occi::Api::Client
       # @param resource_type [String] resource name or resource identifier
       # @return [Occi::Core::Resource] new resource instance
       def get_resource(resource_type)
-        Occi::Log.debug("Instantiating #{resource_type.inspect}")
+        Occi::Api::Log.debug("Instantiating #{resource_type.inspect}")
 
         type_id = get_resource_type_identifier(resource_type)
         raise "Unknown resource type! #{resource_type.inspect}" unless type_id

data/lib/occi/api/client/base/kind_methods.rb

@@ -14,7 +14,7 @@ module Occi::Api::Client
       # @return [Array<String>] list of available kind type identifiers related to
       #                         the given type identifier
       def get_kind_type_identifiers_related_to(type_identifier)
-        Occi::Log.debug("Getting kind type identifiers related to #{type_identifier.inspect}")
+        Occi::Api::Log.debug("Getting kind type identifiers related to #{type_identifier.inspect}")
         collection = @model.get(type_identifier)
         collection.kinds.to_a.collect { |kind| kind.type_identifier }
       end

data/lib/occi/api/client/base/mixin_methods.rb

@@ -21,7 +21,7 @@ module Occi::Api::Client
       # @return [String, Occi::Core::Mixin, nil] link, mixin description or nothing found
       def get_mixin(name, type = nil, describe = false)
         # TODO: mixin fix
-        Occi::Log.debug "Looking for mixin #{name.inspect} #{type.inspect} " \
+        Occi::Api::Log.debug "Looking for mixin #{name.inspect} #{type.inspect} " \
                         "#{describe.inspect}"
 
         # TODO: extend this code to support multiple matches and regex filters

data/lib/occi/api/client/base/protected_helpers.rb

@@ -7,13 +7,13 @@ module Occi::Api::Client
       # instances to the rOCCI client.
       #
       # @example
-      #    get_logger { :out => STDERR, :level => Occi::Log::WARN, :logger => nil }
+      #    get_logger { :out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil }
       #
       # @param log_options [Hash] logger options
-      # @return [Occi::Log] instance of the logger
+      # @return [Occi::Api::Log] instance of the logger
       def get_logger(log_options)
-        unless log_options[:logger].kind_of?(Occi::Log)
-          logger = Occi::Log.new(log_options[:out])
+        unless log_options[:logger].kind_of?(Occi::Api::Log)
+          logger = Occi::Api::Log.new(log_options[:out])
           logger.level = log_options[:level]
         else
           logger = log_options[:logger]

data/lib/occi/api/client/client_base.rb

@@ -15,7 +15,7 @@ module Occi::Api::Client
       defaults = Hashie::Mash.new({
         :endpoint => "http://localhost:3000/",
         :auth => {:type => "none"},
-        :log => {:out => STDERR, :level => Occi::Log::WARN, :logger => nil},
+        :log => {:out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil},
         :auto_connect => true,
         :media_type => nil
       })
@@ -25,7 +25,7 @@ module Occi::Api::Client
 
       @options = defaults.merge(options)
 
-      # set Occi::Log
+      # set Occi::Api::Log
       @logger = get_logger(@options[:log])
 
       # check the validity and canonize the endpoint URI

data/lib/occi/api/client/client_http.rb

@@ -28,7 +28,7 @@ module Occi::Api::Client
     #      :endpoint => "http://localhost:3000/",
     #      :timeout => 15
     #      :auth => {:type => "none"},
-    #      :log => {:out => STDERR, :level => Occi::Log::WARN, :logger => nil},
+    #      :log => {:out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil},
     #      :auto_connect => true,
     #      :media_type => nil
     #    }
@@ -110,7 +110,7 @@ module Occi::Api::Client
     def create(entity)
       raise "#{entity.class.name.inspect} not an entity!" unless entity.kind_of? Occi::Core::Entity
 
-      Occi::Log.debug "Entity kind: #{entity.kind.type_identifier.inspect}"
+      Occi::Api::Log.debug "Entity kind: #{entity.kind.type_identifier.inspect}"
       raise "No kind found for #{entity.inspect}" unless entity.kind
 
       # get location for this kind of entity
@@ -118,7 +118,7 @@ module Occi::Api::Client
       collection = Occi::Collection.new
 
       # is this entity a Resource or a Link?
-      Occi::Log.debug "Entity class: #{entity.class.name.inspect}"
+      Occi::Api::Log.debug "Entity class: #{entity.class.name.inspect}"
       collection.resources << entity if entity.kind_of? Occi::Core::Resource
       collection.links << entity if entity.kind_of? Occi::Core::Link
 
@@ -178,7 +178,7 @@ module Occi::Api::Client
       raise 'Resource not provided!' if resource_type_identifier.blank?
       path = path_for_kind_type_identifier(resource_type_identifier)
 
-      Occi::Log.debug("Deleting #{path.inspect} for #{resource_type_identifier.inspect}")
+      Occi::Api::Log.debug("Deleting #{path.inspect} for #{resource_type_identifier.inspect}")
       del path
     end
 

data/lib/occi/api/client/http/authn_plugins/keystone.rb

@@ -27,7 +27,7 @@ module Occi::Api::Client
 
         def set_keystone_base_url
           response = @env_ref.class.head "#{@env_ref.endpoint.to_s}/-/"
-          Occi::Log.debug response.inspect
+          Occi::Api::Log.debug response.inspect
 
           return if response.success?
           raise ::Occi::Api::Client::Errors::AuthnError,
@@ -61,7 +61,7 @@ module Occi::Api::Client
             :body => get_keystone_req(tenant),
             :headers => headers
           )
-          Occi::Log.debug response.inspect
+          Occi::Api::Log.debug response.inspect
 
           if response.success?
             @env_ref.class.headers['X-Auth-Token'] = response['access']['token']['id']
@@ -101,7 +101,7 @@ module Occi::Api::Client
             "#{@keystone_url}/v2.0/tenants",
             :headers => headers
           )
-          Occi::Log.debug response.inspect
+          Occi::Api::Log.debug response.inspect
 
           # TODO: impl match with regexp in case of multiple tenants?
           raise ::Occi::Api::Client::Errors::AuthnError,

data/lib/occi/api/client/http/helpers.rb

@@ -6,7 +6,7 @@ module Occi::Api::Client
       # @see Occi::Api::Client::ClientBase
       def get_logger(log_options)
         logger = super(log_options)
-        self.class.debug_output $stderr if logger.level == Occi::Log::DEBUG
+        self.class.debug_output $stderr if logger.level == Occi::Api::Log::DEBUG
 
         logger
       end
@@ -40,7 +40,7 @@ module Occi::Api::Client
         begin
           @authn_plugin.authenticate
         rescue ::Occi::Api::Client::Errors::AuthnError => e
-          Occi::Log.debug e.message
+          Occi::Api::Log.debug e.message
 
           if @authn_plugin.fallbacks.any?
             # TODO: multiple fallbacks
@@ -64,7 +64,7 @@ module Occi::Api::Client
         else
           media_types = self.class.head(@endpoint.to_s).headers['accept']
 
-          Occi::Log.debug("Available media types: #{media_types.inspect}")
+          Occi::Api::Log.debug("Available media types: #{media_types.inspect}")
           media_type = case media_types
           when /application\/occi\+json/
             'application/occi+json'

data/lib/occi/api/client/http/party_wrappers.rb

@@ -104,24 +104,24 @@ module Occi::Api::Client
       private
 
       def get_process_response(path, response)
-        Occi::Log.debug "Response from location: #{path.inspect}"
+        Occi::Api::Log.debug "Response from location: #{path.inspect}"
         kind = @model.get_by_location(path) if @model
 
-        Occi::Log.debug "Response should contain kind: #{kind.inspect}"
+        Occi::Api::Log.debug "Response should contain kind: #{kind.inspect}"
         entity_type = nil
         if kind && kind.related_to?(Occi::Core::Link)
           entity_type = Occi::Core::Link
         end
         entity_type = Occi::Core::Resource unless entity_type
 
-        Occi::Log.debug "Parser call: #{response.content_type.inspect} #{path.include?('/-/')} " \
+        Occi::Api::Log.debug "Parser call: #{response.content_type.inspect} #{path.include?('/-/')} " \
                         "#{entity_type} #{response.headers.inspect}"
         collection = Occi::Parser.parse(
           response.content_type, response.body,
           path.include?('/-/'), entity_type, response.headers
         )
 
-        Occi::Log.debug "Parsed collection: empty? #{collection.empty?}"
+        Occi::Api::Log.debug "Parsed collection: empty? #{collection.empty?}"
         collection
       end
 

data/lib/occi/api/log.rb

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

data/lib/occi/api/version.rb

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

data/occi-api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'occi-core', '~> 4.2.7'
+  gem.add_dependency 'occi-core', '~> 4.2.9'
   gem.add_dependency 'httparty'
   gem.add_dependency 'json'
 

data/spec/occi/api/client/client_http_spec.rb

@@ -14,7 +14,7 @@ module Occi
            :endpoint => 'https://localhost:3300',
            :auth => { :type  => "none" },
            :log => { :out   => "/dev/null",
-                     :level => Occi::Log::DEBUG },
+                     :level => Occi::Api::Log::DEBUG },
            :auto_connect => true,
            :media_type => "text/plain,text/occi"
           })
@@ -293,7 +293,7 @@ module Occi
           #  :endpoint => 'https://localhost:3300',
           #  :auth => { :type  => "none" },
           #  :log => { :out   => "/dev/null",
-          #            :level => Occi::Log::DEBUG },
+          #            :level => Occi::Api::Log::DEBUG },
           #  :auto_connect => true,
           #  :media_type => "application/occi+json"
           #})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.14
+  version: 4.2.0.beta.15
 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-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 4.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 4.2.9
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,7 @@ files:
 - lib/occi/api/dsl/main_methods.rb
 - lib/occi/api/dsl/mixin_methods.rb
 - lib/occi/api/dsl/type_methods.rb
+- lib/occi/api/log.rb
 - lib/occi/api/version.rb
 - occi-api.gemspec
 - spec/cassettes/Occi_Api_Client_ClientHttp/using_media_type_text_plain/describes_compute_resources.yml