occi-api 4.2.0.beta.10 → 4.2.0.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f0513db8dfc7aa5d65286eb15f5ed55b2b11e12
-  data.tar.gz: fc0bda8b7788f06845283330b61872f7195ba782
+  metadata.gz: d0454d6d2434cf832d9a771a26366f8741c9fc4f
+  data.tar.gz: 2128a013520395a20fd0883ef3d782d140a35cae
 SHA512:
-  metadata.gz: ef1f7ab2ce8323302ac056e7999e5562f32edb0c217b44521390d1273e3b374d4e2afb991e4efa60d1ac2ef3aafd928246f9d2ac451bfaf4ac474cf38b5e6493
-  data.tar.gz: 117dcd2ae31afd5ada3e9665219087710658929c21cf3813aa0af1604e23189529b65c04c929f0f23a8f6559d84517eae0131421a12676d563aa57e7fb0ced98
+  metadata.gz: 28dff1463abcd17a1905414c8ca320c1fb54c3f771071412160c631143204458964a32f22b8faec2d8f5e71b1d5df44c612152cf40d23841e1a21200e7de2915
+  data.tar.gz: b91888dfabd1c46378a1cd72689f12269f028ddfac91fac069f983c8747e8c9ff519fb02688ea1799362ad844823dfcc6b68709af592dea9dedda413e3d76b9c

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

@@ -50,7 +50,7 @@ module Occi::Api::Client
 
         if tis.length > 1
           raise Occi::Api::Client::Errors::AmbiguousNameError,
-                "Category type #{type.inspect} is ambiguous, use a type identifier!"
+                "Action type #{type.inspect} is ambiguous, use a type identifier!"
         end
 
         tis.first

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

@@ -13,7 +13,7 @@ module Occi::Api::Client
     def initialize(options = {})
       # define defaults and convert options to Hashie::Mash if necessary
       defaults = Hashie::Mash.new({
-        :endpoint => "http://localhost:3300/",
+        :endpoint => "http://localhost:3000/",
         :auth => {:type => "none"},
         :log => {:out => STDERR, :level => Occi::Log::WARN, :logger => nil},
         :auto_connect => true,

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

@@ -15,7 +15,8 @@ module Occi::Api::Client
     #       'Accept' => 'application/occi+json,text/plain;q=0.8,text/occi;q=0.2'
     DEFAULT_HEADERS = {
       'Accept'     => 'text/plain,text/occi;q=0.2',
-      'User-Agent' => "rOCCI HTTPClient #{Occi::Api::VERSION}"
+      'User-Agent' => "rOCCI-core/#{Occi::VERSION} rOCCI-api/#{Occi::Api::VERSION} OCCI/1.1 " \
+                      "#{RUBY_ENGINE}-#{RUBY_PLATFORM}/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
     }
     headers DEFAULT_HEADERS
 
@@ -24,7 +25,7 @@ module Occi::Api::Client
     #
     # @example
     #    options = {
-    #      :endpoint => "http://localhost:3300/",
+    #      :endpoint => "http://localhost:3000/",
     #      :timeout => 15
     #      :auth => {:type => "none"},
     #      :log => {:out => STDERR, :level => Occi::Log::WARN, :logger => nil},
@@ -40,7 +41,7 @@ module Occi::Api::Client
       super options
 
       self.class.base_uri @endpoint.to_s
-      self.class.timeout @options[:timeout].to_i unless @options[:timeout].blank?
+      self.class.default_timeout @options[:timeout].to_i unless @options[:timeout].blank?
 
       # get model information from the endpoint
       # and create Occi::Model instance
@@ -68,6 +69,9 @@ module Occi::Api::Client
         :headers => headers
       )
 
+      response_msg = response_message(response)
+      raise "HTTP GET failed! #{response_msg}" unless response.code == 200
+
       # TODO: remove the gsub OCCI-OS hack as soon as they stop using 'uri:'
       response.body.gsub(/\# uri:\/(compute|storage|network)\/[\n]?/, '').split("\n").compact
     end

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.2.0.beta.10" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.2.0.beta.12" 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.0'
+  gem.add_dependency 'occi-core', '~> 4.2.5'
   gem.add_dependency 'httparty'
   gem.add_dependency 'json'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta.10
+  version: 4.2.0.beta.12
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement