occi-api 4.2.6 → 4.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33443d89ab0c83183170cd0876da0c9af576c64
-  data.tar.gz: 9da580054d01f0c6e007ceabc1b9266e0673324d
+  metadata.gz: 7ab882ff01d442af84f9ac23fc4b4da41091f5d6
+  data.tar.gz: 6ded8b446e879ad73334b2b42e868c04a9009f3f
 SHA512:
-  metadata.gz: a039a1a18bcc7e42736f158b4259f7dd14a976ebdf56b137e19454abbc5b469bf01d05cb0b4bafa717d82e3838950305cd28ce018a5f6bbc9d42e095731f1e76
-  data.tar.gz: 573576b99c9d4ddca4e1b0d5a6e1d1dc4b96e20f04f9550ee9e391290a346792e5102df995aac2434edbc7a0e4af9251ceacaa68a403fe2ab6a015a825bbbdd5
+  metadata.gz: 3a11d6fb175e27d18a240c8303671f8847de44026883cf3dfd60fae017103c2cd9d5b0587bf0d550f710b9370f6419ac56bd155e21ad1071c98e12e68ebff881
+  data.tar.gz: 74b2e556f12c701a92a00074b85f4a96a201a45f64691037573642deb281898342f6a02c1f50a826c13f3c851a959415029af922a7cdb67691cb3a8c09d7ad8b

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
   - ruby-head
   - jruby-19mode
   - jruby-head
@@ -26,9 +26,9 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: oraclejdk7
-    - rvm: 2.1.1
+    - rvm: 2.1
       jdk: openjdk7
-    - rvm: 2.1.1
+    - rvm: 2.1
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: openjdk7
@@ -42,3 +42,4 @@ branches:
     - 4.0.x
     - 4.1.x
     - 4.2.x
+    - 4.3.x

data/README.md

@@ -1,10 +1,10 @@
 rOCCI-api - A Ruby OCCI Framework
 =================================
 
-[![Build Status](https://secure.travis-ci.org/gwdg/rOCCI-api.png)](http://travis-ci.org/gwdg/rOCCI-api)
-[![Dependency Status](https://gemnasium.com/gwdg/rOCCI-api.png)](https://gemnasium.com/gwdg/rOCCI-api)
+[![Build Status](https://secure.travis-ci.org/EGI-FCTF/rOCCI-api.png)](http://travis-ci.org/EGI-FCTF/rOCCI-api)
+[![Dependency Status](https://gemnasium.com/EGI-FCTF/rOCCI-api.png)](https://gemnasium.com/EGI-FCTF/rOCCI-api)
 [![Gem Version](https://fury-badge.herokuapp.com/rb/occi-api.png)](https://badge.fury.io/rb/occi-api)
-[![Code Climate](https://codeclimate.com/github/gwdg/rOCCI-api.png)](https://codeclimate.com/github/gwdg/rOCCI-api)
+[![Code Climate](https://codeclimate.com/github/EGI-FCTF/rOCCI-api.png)](https://codeclimate.com/github/EGI-FCTF/rOCCI-api)
 
 Requirements
 ------------
@@ -12,7 +12,6 @@ Requirements
 ### Ruby
 * Ruby 1.9.3 is required
 * RubyGems have to be installed
-* Rake has to be installed (e.g., `gem install rake`)
 
 ### Examples
 #### For distros based on Debian:
@@ -44,12 +43,10 @@ Installation
 
 To install the most recent stable version
 
-    gem install rake
     gem install occi-api
 
 To install the most recent beta version
 
-    gem install rake
     gem install occi-api --pre
 
 ### From source (dev)
@@ -60,7 +57,7 @@ To install the most recent beta version
 
 To build and install the bleeding edge version from master
 
-    git clone git://github.com/gwdg/rOCCI-api.git
+    git clone git://github.com/EGI-FCTF/rOCCI-api.git
     cd rOCCI-api
     gem install bundler
     bundle install
@@ -87,213 +84,18 @@ ruby -v
 
 Usage
 -----
-### Auth
-
-For Basic auth use
-
-    auth = Hashie::Mash.new
-    auth.type = 'basic'
-    auth.username = 'user'
-    auth.password = 'mypass'
- 
-For Digest auth use
-
-    auth = Hashie::Mash.new
-    auth.type = 'digest'
-    auth.username = 'user'
-    auth.password = 'mypass'
-
-For X.509 auth use
- 
-    auth = Hashie::Mash.new
-    auth.type = 'x509'
-    auth.user_cert = '/Path/To/My/usercert.pem'
-    auth.user_cert_password = 'MyPassword'
-    auth.ca_path = '/Path/To/root-certificates'
-
-### DSL
-In your scripts, you can use the OCCI client DSL.
-
-To include the DSL definitions in a script use
-
-    extend Occi::Api::Dsl
-
-To include the DSL definitions in a class use
-
-    include Occi::Api::Dsl
-
-To connect to an OCCI endpoint/server (e.g. running on http://localhost:3300/ )
-
-    # defaults
-    options = {
-      :endpoint => "http://localhost:3300/",
-      :auth => {:type => "none"},
-      :log => {:out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil},
-      :auto_connect => "value", auto_connect => true,
-      :media_type => nil
-    }
-
-    connect(:http, options ||= {})
-
-To get the list of available resource, mixin, entity or link types use
-
-    resource_types
-    mixin_types
-    entity_types
-    link_types
-
-To get compute, storage or network descriptions use
-
-    describe "compute"
-    describe "storage"
-    describe "network"
-
-To get the location of compute, storage or network resources use
-
-    list "compute"
-    list "storage"
-    list "network"
-
-To get the identifiers of specific mixins in specific mixin types use
-
-    mixin "my_template", "os_tpl"
-    mixin "small", "resource_tpl"
-
-To get the identifiers of specific mixins with unknown types use
-
-    mixin "medium"
-
-To get mixin descriptions use
-
-    mixin "medium", nil, true
-    mixin "my_template", "os_tpl", true
-
-To get a list of names of all / OS templates / Resource templates mixins use
-
-    mixins
-    mixins "os_tpl"
-    mixins "resource_tpl"
-
-To create a new compute resource use
-
-    os = mixin 'my_os', 'os_tpl'
-    size = mixin 'large', 'resource_tpl'
-    cmpt = resource "compute"
-    cmpt.mixins << os << size
-    cmpt.title = "My VM"
-    create cmpt
-
-To get a description of a specific resource use
-
-    describe "/compute/<OCCI_ID>"
-    describe "/storage/<OCCI_ID>"
-    describe "/network/<OCCI_ID>"
-
-To delete a specific resource use
-
-    delete "/compute/<OCCI_ID>"
-    delete "/storage/<OCCI_ID>"
-    delete "/network/<OCCI_ID>"
-
-### API
-If you need low level access to parts of the OCCI client or need to use more than one instance
-at a time, you should use the OCCI client API directly.
-
-To connect to an OCCI endpoint/server (e.g. running on http://localhost:3300/ )
-
-    # defaults
-    options = {
-      :endpoint => "http://localhost:3300/",
-      :auth => {:type => "none"},
-      :log => {:out => STDERR, :level => Occi::Api::Log::WARN, :logger => nil},
-      :auto_connect => "value", auto_connect => true,
-      :media_type => nil
-    }
-
-    client = Occi::Api::Client::ClientHttp.new(options ||= {})
-
-All available categories are automatically registered to the OCCI model during client initialization. You can get them via
-
-    client.model
-
-To get the list of available resource, mixin, entity or link types use
-
-    client.get_resource_types
-    client.get_mixin_types
-    client.get_entity_types
-    client.get_link_types
-
-To get compute, storage or network descriptions use
-
-    client.describe "compute"
-    client.describe "storage"
-    client.describe "network"
-
-To get the location of compute, storage or network resources use
-
-    client.list "compute"
-    client.list "storage"
-    client.list "network"
-
-To get the identifiers of specific mixins in specific mixin types use
-
-    client.find_mixin "my_template", "os_tpl"
-    client.find_mixin "small", "resource_tpl"
-
-To get the identifiers of specific mixins with unknown types use
-
-    client.find_mixin "medium"
-
-To get mixin descriptions use
-
-    client.find_mixin "medium", nil, true
-    client.find_mixin "my_template", "os_tpl", true
-
-To get a list of names of all / OS templates / Resource templates mixins use
-
-    client.get_mixins
-    client.get_mixins "os_tpl"
-    client.get_mixins "resource_tpl"
-
-To create a new compute resource use
-
-    os = client.find_mixin 'my_os', 'os_tpl'
-    size = client.find_mixin 'large', 'resource_tpl'
-    cmpt = client.get_resource "compute"
-    cmpt.mixins << os << size
-    cmpt.title = "My VM"
-    client.create cmpt
-
-To get a description of a specific resource use
-
-    client.describe "/compute/<OCCI_ID>"
-    client.describe "/storage/<OCCI_ID>"
-    client.describe "/network/<OCCI_ID>"
-
-To delete a specific resource use
-
-    client.delete "/compute/<OCCI_ID>"
-    client.delete "/storage/<OCCI_ID>"
-    client.delete "/network/<OCCI_ID>"
-
-### Logging
-
-The OCCI gem includes its own logging mechanism using a message queue. By default, no one is listening to that queue.
-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::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::Api::Log e.g.
-
-    Occi::Api::Log.info("Test message")
+Detailed documentation is available in our [Wiki](https://github.com/EGI-FCTF/rOCCI-api/wiki).
 
 Changelog
 ---------
 
+### Version 4.3
+* Updated dependencies
+* Powered by rOCCI-core 4.3.x
+
+### Version 4.2
+* Updated dependencies
+
 ### Version 4.1
 * Dropped Ruby 1.8.x support
 * Dropped jRuby 1.6.x support
@@ -362,7 +164,7 @@ Development
 
 Checkout latest version from GIT:
 
-    git clone git://github.com/gwdg/rOCCI-api.git
+    git clone git://github.com/EGI-FCTF/rOCCI-api.git
 
 Change to rOCCI-api folder
 
@@ -374,11 +176,11 @@ Install dependencies for deployment
 
 ### Code Documentation
 
-[Code Documentation for rOCCI-api by YARD](http://rubydoc.info/github/gwdg/rOCCI-api/)
+[Code Documentation for rOCCI-api by YARD](http://rubydoc.info/github/EGI-FCTF/rOCCI-api/)
 
 ### Continuous integration
 
-[Continuous integration for rOCCI-api by Travis-CI](http://travis-ci.org/gwdg/rOCCI-api/)
+[Continuous integration for rOCCI-api by Travis-CI](http://travis-ci.org/EGI-FCTF/rOCCI-api/)
 
 ### Contribute
 

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

@@ -1,79 +1,9 @@
-require 'openssl'
-
-if defined? JRUBY_VERSION
-  require 'java'
-end
-
 module Occi::Api::Client
 
   class AuthnUtils
 
     CERT_REGEXP = /\n?(-----BEGIN CERTIFICATE-----\n.+?\n-----END CERTIFICATE-----)\n/m
 
-    # Reads credentials from a PKCS#12 compliant file. Returns
-    # X.509 certificate and decrypted private key in PEM
-    # formatted string.
-    #
-    # @example
-    #    AuthnUtils.extract_pem_from_pkcs12 "~/.globus/usercert.p12", "123456"
-    #      # => #<String>
-    #
-    # @param path_to_p12_file [String] Path to a PKCS#12 file with credentials
-    # @param p12_password [String] Password needed to unlock the PKCS#12 file
-    # @return [String] Decrypted credentials in a PEM formatted string
-    def self.extract_pem_from_pkcs12(path_to_p12_file, p12_password)
-      # decode certificate and its private key
-      if defined? JRUBY_VERSION
-        extract_pem_from_pkcs12_java(path_to_p12_file, p12_password)
-      else
-        extract_pem_from_pkcs12_c(path_to_p12_file, p12_password)
-      end
-    end
-
-    def self.extract_pem_from_pkcs12_java(path_to_p12_file, p12_password)
-      # Java-based Ruby, read PKCS12 manually
-      # using KeyStore
-      keystore = Java::JavaSecurity::KeyStore.getInstance("PKCS12")
-      p12_input_stream = Java::JavaIo::FileInputStream.new(path_to_p12_file)
-      pass_char_array = Java::JavaLang::String.new(p12_password).to_char_array
-
-      # load and unlock PKCS#12 store
-      keystore.load p12_input_stream, pass_char_array
-
-      # read the first certificate and PK
-      cert = keystore.getCertificate("1")
-      pk = keystore.getKey("1", pass_char_array)
-
-      pem_from_pkcs12 = ""
-
-      pem_from_pkcs12 << "-----BEGIN CERTIFICATE-----\n"
-      pem_from_pkcs12 << Java::JavaxXmlBind::DatatypeConverter.printBase64Binary(cert.getEncoded())
-      pem_from_pkcs12 << "\n-----END CERTIFICATE-----"
-
-      pem_from_pkcs12 << "\n"
-
-      pem_from_pkcs12 << "-----BEGIN PRIVATE KEY-----\n"
-      pem_from_pkcs12 << Java::JavaxXmlBind::DatatypeConverter.printBase64Binary(pk.getEncoded())
-      pem_from_pkcs12 << "\n-----END PRIVATE KEY-----"
-
-      pem_from_pkcs12
-    end
-
-    def self.extract_pem_from_pkcs12_c(path_to_p12_file, p12_password)
-      # C-based Ruby, use OpenSSL::PKCS12
-      pem_from_pkcs12 = ""
-
-      pkcs12 = OpenSSL::PKCS12.new(
-        File.open(path_to_p12_file, 'rb'),
-        p12_password
-      )
-
-      # store cert and private key in a single PEM formatted string
-      pem_from_pkcs12 << pkcs12.certificate.to_pem << pkcs12.key.to_pem
-
-      pem_from_pkcs12
-    end
-
     # Reads X.509 certificates from a file to an array.
     #
     # @example
@@ -83,7 +13,8 @@ module Occi::Api::Client
     # @param ca_file [String] Path to a PEM file containing certificates
     # @return [Array<String>] An array of read certificates
     def self.certs_to_file_ary(ca_file)
-      # TODO: read and separate multiple certificates
+      raise ArgumentError, "PKCS12 file #{ca_file.inspect} " \
+                           "is not supported in VOMS mode!" if /\A(.)+\.p12\z/ =~ ca_file
       certs_str = File.open(ca_file).read
 
       certs_ary = certs_str.scan(CERT_REGEXP)

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

@@ -33,8 +33,7 @@ module Occi::Api::Client
       #
       # @return [Array<String>] list of available entity types in a human-readable format
       def get_entity_types
-        collection = @model.get(Occi::Core::Entity.kind.type_identifier)
-        collection.kinds.to_a.collect { |kind| kind.term }
+        get_types(Occi::Core::Entity.kind)
       end
 
       # Retrieves all available entity type identifiers.
@@ -59,19 +58,7 @@ module Occi::Api::Client
       # @param type [String] short entity type
       # @return [String, nil] entity type identifier for the given entity type
       def get_entity_type_identifier(type)
-        return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))
-
-        collection = @model.get(Occi::Core::Entity.kind.type_identifier)
-        e_kinds = collection.kinds.to_a.select { |e| e.term == type }
-        tis = e_kinds.collect { |e| e.type_identifier }
-        tis.uniq!
-
-        if tis.length > 1
-          raise Occi::Api::Client::Errors::AmbiguousNameError,
-                "Entity type #{type.inspect} is ambiguous, use a type identifier!"
-        end
-
-        tis.first
+        get_type_identifier(type, Occi::Core::Entity.kind)
       end
 
       # Retrieves all available resource types.
@@ -81,8 +68,7 @@ module Occi::Api::Client
       #
       # @return [Array<String>] list of available resource types in a human-readable format
       def get_resource_types
-        collection = @model.get(Occi::Core::Resource.kind.type_identifier)
-        collection.kinds.to_a.collect { |kind| kind.term }
+        get_types(Occi::Core::Resource.kind)
       end
 
       # Retrieves all available resource type identifiers.
@@ -107,19 +93,7 @@ module Occi::Api::Client
       # @param type [String] short resource type
       # @return [String, nil] resource type identifier for the given resource type
       def get_resource_type_identifier(type)
-        return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))
-
-        collection = @model.get(Occi::Core::Resource.kind.type_identifier)
-        r_kinds = collection.kinds.to_a.select { |r| r.term == type }
-        tis = r_kinds.collect { |r| r.type_identifier }
-        tis.uniq!
-
-        if tis.length > 1
-          raise Occi::Api::Client::Errors::AmbiguousNameError,
-                "Resource type #{type.inspect} is ambiguous, use a type identifier!"
-        end
-
-        tis.first
+        get_type_identifier(type, Occi::Core::Resource.kind)
       end
 
       # Retrieves all available link types.
@@ -129,8 +103,7 @@ module Occi::Api::Client
       #
       # @return [Array<String>] list of available link types in a human-readable format
       def get_link_types
-        collection = @model.get(Occi::Core::Link.kind.type_identifier)
-        collection.kinds.to_a.collect { |kind| kind.term }
+        get_types(Occi::Core::Link.kind)
       end
 
       # Retrieves all available link type identifiers.
@@ -154,22 +127,34 @@ module Occi::Api::Client
       # @param type [String] short link type
       # @return [String, nil] link type identifier for the given link type
       def get_link_type_identifier(type)
+        get_type_identifier(type, Occi::Core::Link.kind)
+      end
+
+      private
+
+      def get_type_identifier(type, related_to)
         return type if (type =~ URI::ABS_URI) || (type && type.start_with?('/'))
 
-        collection = @model.get(Occi::Core::Link.kind.type_identifier)
-        l_kinds = collection.kinds.to_a.select { |r| r.term == type }
-        tis = l_kinds.collect { |r| r.type_identifier }
+        collection = @model.get(related_to.type_identifier)
+        e_kinds = collection.kinds.to_a.select { |e| e.term == type }
+        tis = e_kinds.collect { |e| e.type_identifier }
         tis.uniq!
 
         if tis.length > 1
           raise Occi::Api::Client::Errors::AmbiguousNameError,
-                "Link type #{type.inspect} is ambiguous, use a type identifier!"
+                "#{related_to.type_identifier.split('#').capitalize} type " \
+                "#{type.inspect} is ambiguous, use a type identifier!"
         end
 
         tis.first
       end
 
+      def get_types(related_to)
+        collection = @model.get(related_to.type_identifier)
+        collection ? collection.kinds.to_a.collect { |kind| kind.term } : []
+      end
+
     end
 
   end
-end
+end

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

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'persistent_httparty'
 
 # load all parts of the ClientHttp
 Dir[File.join(File.dirname(__FILE__), 'http', '*.rb')].each { |file| require file.gsub('.rb', '') }
@@ -10,6 +11,9 @@ module Occi::Api::Client
     # HTTParty for raw HTTP requests
     include HTTParty
 
+    # Take advantage of persistent HTTP connections
+    persistent_connection_adapter
+
     # TODO: change default Accept to JSON as soon as it is properly
     #       implemented in OpenStack's OCCI-OS
     #       'Accept' => 'application/occi+json,text/plain;q=0.8,text/occi;q=0.2'

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

@@ -14,16 +14,12 @@ module Occi::Api::Client
           raise ArgumentError, "Missing required option 'user_cert' for x509 auth!" unless @options[:user_cert]
           raise ArgumentError, "The file specified in 'user_cert' does not exist!" unless File.exists? @options[:user_cert]
 
-          # handle PKCS#12 credentials before passing them
-          # to httparty
+          # handle credentials, separate PKCS12 from PEM
+          cert_content = File.open(@options[:user_cert], 'rb').read
           if /\A(.)+\.p12\z/ =~ @options[:user_cert]
-            pem_cert = ::Occi::Api::Client::AuthnUtils.extract_pem_from_pkcs12(@options[:user_cert], @options[:user_cert_password])
-            @env_ref.class.pem pem_cert, ''
+            @env_ref.class.pkcs12 cert_content, @options[:user_cert_password]
           else
-            # httparty will handle ordinary PEM formatted credentials
-            # TODO: Issue #49, check PEM credentials in jRuby
-            pem_cert = File.open(@options[:user_cert], 'rb').read
-            @env_ref.class.pem pem_cert, @options[:user_cert_password]
+            @env_ref.class.pem cert_content, @options[:user_cert_password]
           end
 
           @env_ref.class.ssl_ca_path @options[:ca_path] if @options[:ca_path]

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

@@ -28,18 +28,7 @@ module Occi::Api::Client
         end
 
         response = self.class.get(path, :headers => headers)
-        response_msg = response_message response
-
-        unless response.code == 200
-          if response.headers["x-request-id"]
-            message = "HTTP GET with ID[#{response.headers["x-request-id"].inspect}] failed! " \
-                      "#{response_msg} : #{response.body.inspect}"
-          else
-            message = "HTTP GET failed! #{response_msg} : #{response.body.inspect}"
-          end
-
-          raise message
-        end
+        report_failure(response)
 
         get_process_response(path, response)
       end
@@ -64,18 +53,7 @@ module Occi::Api::Client
         raise ArgumentError, "Collection is a required argument!" if collection.blank?
 
         response = send_coll_request(path, collection)
-        response_msg = response_message(response)
-
-        unless response.code.between?(200, 201)
-          if response.headers["x-request-id"]
-            message = "HTTP POST with ID[#{response.headers["x-request-id"].inspect}] failed! " \
-                      "#{response_msg} : #{response.body.inspect}"
-          else
-            message = "HTTP POST failed! #{response_msg} : #{response.body.inspect}"
-          end
-
-          raise message
-        end
+        report_failure(response)
 
         collection.send(:standalone_action_instance?) ? post_action(response) : post_create(response)
       end
@@ -93,20 +71,9 @@ module Occi::Api::Client
         raise ArgumentError, "Collection is a required argument!" if collection.blank?
 
         response = send_coll_request(path, collection, :put)
-        response_msg = response_message(response)
-
-        if response.code.between? 200, 201
-          Occi::Parser.parse(response.content_type, response.body)
-        else
-          if response.headers["x-request-id"]
-            message = "HTTP PUT with ID[#{response.headers["x-request-id"].inspect}] failed! " \
-                      "#{response_msg} : #{response.body.inspect}"
-          else
-            message = "HTTP PUT failed! #{response_msg} : #{response.body.inspect}"
-          end
+        report_failure(response)
 
-          raise message
-        end
+        Occi::Parser.parse(response.content_type, response.body)
       end
 
       # Performs DELETE requests and returns True on success.
@@ -119,20 +86,7 @@ module Occi::Api::Client
       # @return [Boolean] status
       def del(path, filter=nil)
         raise ArgumentError, "Path is a required argument!" if path.blank?
-
-        response = self.class.delete(path)
-        response_msg = response_message(response)
-
-        unless response.code == 200
-          if response.headers["x-request-id"]
-            message = "HTTP DELETE with ID[#{response.headers["x-request-id"].inspect}] failed! " \
-                      "#{response_msg} : #{response.body.inspect}"
-          else
-            message = "HTTP DELETE failed! #{response_msg} : #{response.body.inspect}"
-          end
-
-          raise message
-        end
+        report_failure(self.class.delete(path))
 
         true
       end
@@ -218,6 +172,26 @@ module Occi::Api::Client
         end
       end
 
+      def report_failure(response)
+        # Is there something to report?
+        return if response.code.between? 200, 202
+
+        # get a human-readable response message
+        response_msg = response_message(response)
+
+        # include a Request ID if it is available
+        if response.headers["x-request-id"]
+          message = "HTTP #{response.request.http_method.upcase} with " \
+                    "ID[#{response.headers["x-request-id"].inspect}] failed! " \
+                    "#{response_msg} : #{response.body.inspect}"
+        else
+          message = "HTTP #{response.request.http_method.upcase} failed! " \
+                    "#{response_msg} : #{response.body.inspect}"
+        end
+
+        raise message
+      end
+
     end
 
   end

data/lib/occi/api/version.rb

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

data/occi-api.gemspec

@@ -8,19 +8,20 @@ Gem::Specification.new do |gem|
   gem.name          = "occi-api"
   gem.version       = Occi::Api::VERSION
   gem.authors       = ["Florian Feldhaus","Piotr Kasprzak", "Boris Parak"]
-  gem.email         = ["florian.feldhaus@gwdg.de", "piotr.kasprzak@gwdg.de", "xparak@mail.muni.cz"]
+  gem.email         = ['florian.feldhaus@gmail.com', 'piotr.kasprzak@gwdg.de', 'parak@cesnet.cz']
   gem.description   = %q{This gem provides ready-to-use client classes to simplify the integration of OCCI into your application}
-  gem.summary       = %q{OCCI development library providing a high-level API}
-  gem.homepage      = 'https://github.com/gwdg/rOCCI-api'
+  gem.summary       = %q{OCCI development library providing a high-level client API}
+  gem.homepage      = 'https://github.com/EGI-FCTF/rOCCI-api'
   gem.license       = 'Apache License, Version 2.0'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency 'occi-core', '~> 4.2.16'
-  gem.add_dependency 'httparty'
-  gem.add_dependency 'json'
+  gem.add_dependency 'occi-core', '~> 4.3', '>= 4.3.0'
+  gem.add_dependency 'httparty', '~> 0.13', '>= 0.13.1'
+  gem.add_dependency 'json', '~> 1.8', '>= 1.8.1'
+  gem.add_dependency 'persistent_httparty', '~> 0.1', '>= 0.1.2'
 
-  gem.required_ruby_version     = ">= 1.9.3"
+  gem.required_ruby_version = '>= 1.9.3'
 end

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

@@ -7,45 +7,11 @@ module Occi
 
       describe AuthnUtils do
 
-        it "can handle PKCS#12 user credentials" do
-          path = File.expand_path("..", __FILE__)
-
-          pem_cert_pk = AuthnUtils.extract_pem_from_pkcs12(
-            path + "/rocci-cred.p12",
-            "passworD123"
-          )
-
-          pem_cert_ok = File.open(path + "/rocci-cred-cert.pem", "rb").read
-
-          if defined? JRUBY_VERSION
-            # PK is in PKCS#8 when running jRuby
-            pem_pk_ok = File.open(path + "/rocci-cred-key-jruby.pem", "rb").read
-          else
-            # PK is raw RSA key when running cRuby
-            pem_pk_ok = File.open(path + "/rocci-cred-key.pem", "rb").read
-          end
-
-          pem_cert_pk_ok = ""
-          pem_cert_pk_ok << pem_cert_ok << pem_pk_ok
-
-
-          # remove line wrapping
-          pem_cert_pk.delete! "\n"
-          pem_cert_pk_ok.delete! "\n"
-
-          # remove trailing new lines
-          pem_cert_pk.chomp!
-          pem_cert_pk_ok.chomp!
-
-          pem_cert_pk.should eq pem_cert_pk_ok
-        end
-
         it "can read CA certificates from a file" do
           path = File.expand_path("..", __FILE__)
 
-          ca_certs = AuthnUtils.certs_to_file_ary(path + "/rocci-cred-cert.pem")
-
-          ca_certs.should =~ [File.open(path + "/rocci-cred-cert.pem", "rb").read.chomp("\n")]
+          ca_certs = AuthnUtils.certs_to_file_ary("#{path}/rocci-cred-cert.pem")
+          ca_certs.should =~ [File.open("#{path}/rocci-cred-cert.pem", "rb").read.chomp("\n")]
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.3.0.beta.1
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,64 +10,102 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.16
+        version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.16
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: persistent_httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.2
 description: This gem provides ready-to-use client classes to simplify the integration
   of OCCI into your application
 email:
-- florian.feldhaus@gwdg.de
+- florian.feldhaus@gmail.com
 - piotr.kasprzak@gwdg.de
-- xparak@mail.muni.cz
+- parak@cesnet.cz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - AUTHORS
 - Gemfile
 - LICENSE
@@ -193,13 +231,10 @@ files:
 - spec/occi/api/client/http/httparty_fix_spec.rb
 - spec/occi/api/client/http/net_http_fix_spec.rb
 - spec/occi/api/client/rocci-cred-cert.pem
-- spec/occi/api/client/rocci-cred-key-jruby.pem
-- spec/occi/api/client/rocci-cred-key.pem
-- spec/occi/api/client/rocci-cred.p12
 - spec/occi/api/dsl_spec.rb
 - spec/occi/helpers/helpers_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/gwdg/rOCCI-api
+homepage: https://github.com/EGI-FCTF/rOCCI-api
 licenses:
 - Apache License, Version 2.0
 metadata: {}
@@ -209,18 +244,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: OCCI development library providing a high-level API
+summary: OCCI development library providing a high-level client API
 test_files: []

data/spec/occi/api/client/rocci-cred-key-jruby.pem

@@ -1,3 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDcjeRWvUe+p+bOTgl0JtUWpHCDrSoV5DQD59Rinol+1+471JDF6wloBrmo7nCyLtOpDUDUcRZIp9UKCZZLqx0FhmUySFCjU7wBtU1+IOhbEVH97+pff/2x9920C9uyV/06Vr7Ch8G8fYOZCplrmmWs5wj88mUSQBtSYMOZNQxkX18tj3oKgvLhAlRYoIAYJgkhFUsXegMUc7NRa9Kpt2ag2C7eKs9VMZuI9XF+e6xPK6lUPFV8lWzfKtrhiUkmEMbzb0A3CQLZNw8IPXYjNm4daoeZSZkLY9P6KlIXJnBZX1DfJ1WdpS19GUVlU7EmRqwccOeT7FkS3MAR8nK35nOVAgMBAAECggEAS3pTlkuYberP1fJm0dUoP2NvDeEI8gzysBN6X3WZ4ErNQLRyBwl0YqFKkEFpV9Empkfe09UPpzWodpLpWGPqvqVLpHWTAxH42SzOpEdmvSOkR57/Okd27pzAxoj4WoQ6KOjex3vmFTdu/cTe1DA2c4FtVgMuC5zcvMhYp+m7n+1Q5Y/MFWgatMh5Oo20q34CzLNkJ1w0sZfKd8+yhFZc6PJRqp4obJTWALL5EJNxLxw8vzXfnn8y69VZWIqMHHE6QqgZGj6T9aXhDKpjgao6n0zXQu7GrGSz+KxefqEAEV8YyZMeCkFEBMmOS/huWotlzhj8ALtq7vm7JMgIkTDz0QKBgQDu7ezX3UC3JskQOoXKPuwUAdkoL1C7O6k/A8meHzrSvPTnPzdmO7Zj8nZOG58O5cFAh6jT+2k0xa/TrvWUgdD7Xiaw7pWk/MBAEqdReYaAHl6Q440fkvWS4Qn/VP0ZAXwHmqO3zdHRlHE8HsKzqPIjOaU2stNwvgqS2QZs5MOybwKBgQDsT+GfJlESE/MRZ04VZTn6HQSy4NocRPJ+t7ddFYxoETBGDtAg4lvSNhpl9aTY625iGASFVec3A8pSPIgOO4q7yX0FyEtkNHhgKnbGVZzLyBTiHv+eMDVFGauWV7HTUjxiasalSLAtUKVC+AzsSdrDT2HhEt7KK5W/erkw3ZLsOwKBgBJqHfXpJIK5J4frqsISpWlJVy5Er0ku6PVlWlWofIUfcRSdh6yGb6E2X63XbSPdy04o5ncoCky567o54s2GT8//yqWaTchAfqSxi1m5LweSz6EFGKxVTD38wCOArl0OAzwmy/VvlHs9oJiMml70Z20VlUko8SjgTLpSpa8g1oBbAoGBAOP33+m/diAhfLDCXvKG99pQWjMSdXcmEGWsZ8j1u8C9LDu5mJDQrdHp/ad0xPW6kX8yOlJC384T6v9Qg9RvHlQweVq1sf1WHPZwoKqO9rckKvlE/EWnrgweSoi7ysHZKIWtCjtzFvpwPS2QzC66xL77+qm9oY2ZZFoXU0ZPyqf3AoGATw1FWCPsdyC8iA4D9UlWvK5JskLxlNr0OZGgjo1rc+n+oopgn/GxxyMHhwaUZpftA1ab1G58xGnlcjCkhr2ZK/7XNhb7SfLKxTjB2BAehaq2YyzwCpsKUI7oLi0wTt7mD51qh3B1fMSTkfBZg/prwq6nIaDBwXL1xsd/BPfMCYw=
------END PRIVATE KEY-----

data/spec/occi/api/client/rocci-cred-key.pem

@@ -1,3 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA3I3kVr1Hvqfmzk4JdCbVFqRwg60qFeQ0A+fUYp6JftfuO9SQxesJaAa5qO5wsi7TqQ1A1HEWSKfVCgmWS6sdBYZlMkhQo1O8AbVNfiDoWxFR/e/qX3/9sffdtAvbslf9Ola+wofBvH2DmQqZa5plrOcI/PJlEkAbUmDDmTUMZF9fLY96CoLy4QJUWKCAGCYJIRVLF3oDFHOzUWvSqbdmoNgu3irPVTGbiPVxfnusTyupVDxVfJVs3yra4YlJJhDG829ANwkC2TcPCD12IzZuHWqHmUmZC2PT+ipSFyZwWV9Q3ydVnaUtfRlFZVOxJkasHHDnk+xZEtzAEfJyt+ZzlQIDAQABAoIBAEt6U5ZLmG3qz9XyZtHVKD9jbw3hCPIM8rATel91meBKzUC0cgcJdGKhSpBBaVfRJqZH3tPVD6c1qHaS6Vhj6r6lS6R1kwMR+NkszqRHZr0jpEee/zpHdu6cwMaI+FqEOijo3sd75hU3bv3E3tQwNnOBbVYDLguc3LzIWKfpu5/tUOWPzBVoGrTIeTqNtKt+AsyzZCdcNLGXynfPsoRWXOjyUaqeKGyU1gCy+RCTcS8cPL81355/MuvVWViKjBxxOkKoGRo+k/Wl4QyqY4GqOp9M10Luxqxks/isXn6hABFfGMmTHgpBRATJjkv4blqLZc4Y/AC7au75uyTICJEw89ECgYEA7u3s191AtybJEDqFyj7sFAHZKC9QuzupPwPJnh860rz05z83Zju2Y/J2ThufDuXBQIeo0/tpNMWv0671lIHQ+14msO6VpPzAQBKnUXmGgB5ekOONH5L1kuEJ/1T9GQF8B5qjt83R0ZRxPB7Cs6jyIzmlNrLTcL4KktkGbOTDsm8CgYEA7E/hnyZREhPzEWdOFWU5+h0EsuDaHETyfre3XRWMaBEwRg7QIOJb0jYaZfWk2OtuYhgEhVXnNwPKUjyIDjuKu8l9BchLZDR4YCp2xlWcy8gU4h7/njA1RRmrllex01I8YmrGpUiwLVClQvgM7Enaw09h4RLeyiuVv3q5MN2S7DsCgYASah316SSCuSeH66rCEqVpSVcuRK9JLuj1ZVpVqHyFH3EUnYeshm+hNl+t120j3ctOKOZ3KApMueu6OeLNhk/P/8qlmk3IQH6ksYtZuS8Hks+hBRisVUw9/MAjgK5dDgM8Jsv1b5R7PaCYjJpe9GdtFZVJKPEo4Ey6UqWvINaAWwKBgQDj99/pv3YgIXywwl7yhvfaUFozEnV3JhBlrGfI9bvAvSw7uZiQ0K3R6f2ndMT1upF/MjpSQt/OE+r/UIPUbx5UMHlatbH9Vhz2cKCqjva3JCr5RPxFp64MHkqIu8rB2SiFrQo7cxb6cD0tkMwuusS++/qpvaGNmWRaF1NGT8qn9wKBgE8NRVgj7HcgvIgOA/VJVryuSbJC8ZTa9DmRoI6Na3Pp/qKKYJ/xsccjB4cGlGaX7QNWm9RufMRp5XIwpIa9mSv+1zYW+0nyysU4wdgQHoWqtmMs8AqbClCO6C4tME7e5g+daodwdXzEk5HwWYP6a8KupyGgwcFy9cbHfwT3zAmM
------END RSA PRIVATE KEY-----