deltacloud-client 0.5.0 → 1.0.0

data/NOTICE

@@ -1,5 +1,5 @@
 Apache Deltacloud
-Copyright 2010, 2011 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
 
 This product includes software developed at The Apache Software Foundation
 (http://www.apache.org/).

data/Rakefile

@@ -49,6 +49,13 @@ if available?('rspec')
   end
 end
 
+desc "Reinstall gem"
+task :reinstall do
+  puts %x{gem uninstall deltacloud-client --all -I -x}
+  puts %x{gem build deltacloud-client.gemspec}
+  puts %x{gem install deltacloud-client-*.gem --local}
+end
+
 desc "Setup Fixtures"
 task 'fixtures' do
   FileUtils.rm_rf( File.dirname( __FILE__ ) + '/specs/data' )

data/bin/deltacloudc

@@ -65,6 +65,8 @@ BANNER
   opts.on( '-n', '--name NAME', 'Name (for instance eg.)') { |name| options[:name] = name }
   opts.on( '-s', '--state STATE', 'Instance state (RUNNING, STOPPED)') { |state| options[:state] = state }
   opts.on( '-u', '--url URL', 'API url ($API_URL variable)') { |url| options[:api_url] = url }
+  opts.on( '-U', '--user USER', 'API username ($API_USERNAME variable)') { |u| options[:api_user] = u }
+  opts.on( '-P', '--password PASSWORD', 'API password ($API_PASSWORD variable)') { |p| options[:api_password] = p }
   opts.on( '-l', '--list', 'List collections/operations') { |id| options[:list] = true }
   opts.on( '-h', '--help', 'Display this screen' ) { puts @optparse; Kernel.exit! }
   opts.on( '-v', '--version', 'Display API version' ) { options[:version]=true }
@@ -104,7 +106,7 @@ options[:collection] = ARGV[0]
 options[:operation] = ARGV[1]
 
 # Connect to Deltacloud API and fetch all entry points
-client = DeltaCloud.new(url.user || ENV['API_USER'], url.password || ENV['API_PASSWORD'], api_url)
+client = DeltaCloud.new(options[:api_user] || ENV['API_USER'], options[:api_password] || ENV['API_PASSWORD'], api_url)
 collections = client.entry_points.keys
 
 # Exclude collection which don't have methods in client library yet

data/lib/base_object.rb

@@ -151,7 +151,7 @@ module DeltaCloud
             return providers.any? { |p| p.keys.include? args.first.to_sym }
           end
           if method_name == :"valid_provider_url?"
-            return providers.map { |p| !p.find { |k, v| v.find { |u| u[:url] == args.first } }.nil? }
+            return providers.any? { |p| !p.find { |k, v| v.find { |u| u[:url] == args.first } }.nil? }
           end
           super
         else

data/lib/deltacloud.rb

@@ -21,6 +21,7 @@ require 'hwp_properties'
 require 'instance_state'
 require 'documentation'
 require 'base_object'
+require 'errors'
 require 'client_bucket_methods'
 
 module DeltaCloud
@@ -264,9 +265,13 @@ module DeltaCloud
     def discover_entry_points
       return if discovered?
       request(:get, @api_uri.to_s) do |response|
+        if response.code == 301
+          @api_uri = response.headers[:location]
+          return discover_entry_points
+        end
         api_xml = Nokogiri::XML(response)
-        @driver_name = api_xml.xpath('/api').first['driver']
-        @api_version = api_xml.xpath('/api').first['version']
+        @driver_name = api_xml.xpath('/api').first[:driver]
+        @api_version = api_xml.xpath('/api').first[:version]
 
         api_xml.css("api > link").each do |entry_point|
           rel, href = entry_point['rel'].to_sym, entry_point['href']
@@ -314,9 +319,7 @@ module DeltaCloud
 
         request(:post, entry_points[:"#{$1}s"], {}, params) do |response|
           obj = base_object(:"#{$1}", response)
-          # All create calls must respond 201 HTTP code
-          # to indicate that resource was created.
-          handle_backend_error(response) if response.code!=201
+          response_error(response) unless response_successful?(response.code)
           yield obj if block_given?
         end
         return obj
@@ -349,6 +352,28 @@ module DeltaCloud
       headers
     end
 
+    def response_successful?(code)
+      return true if code.to_s =~ /^2(\d{2})$/
+      return true if code.to_s =~ /^3(\d{2})$/
+      return false
+    end
+
+    def response_error(response)
+      xml = Nokogiri::XML(response.to_s)
+      if (xml/'message').empty? and response.code.to_s =~ /4(\d{2})/
+        DeltaCloud::HTTPError.client_error(response.code)
+      else
+        opts = {
+          :driver => (xml/'backend').first[:driver],
+          :provider => (xml/'backend').first[:provider],
+          :params => (xml/'request/param').inject({}) { |r,p| r[:"#{p[:name]}"] = p.text; r }
+        }
+        backtrace = (xml/'backtrace').empty? ? nil : (xml/'backtrace').first.text.split("\n")[1..10].map { |l| l.strip }
+        DeltaCloud::HTTPError.server_error(xml.root[:status] || response.code,
+                                           (xml/'message').first.text, opts, backtrace)
+      end
+    end
+
     # Basic request method
     #
     def request(*args, &block)
@@ -367,55 +392,18 @@ module DeltaCloud
       if conf[:method].eql?(:post)
         resource = RestClient::Resource.new(conf[:path], :open_timeout => conf[:open_timeout], :timeout => conf[:timeout])
         resource.send(:post, conf[:form_data], default_headers.merge(extended_headers)) do |response, request, block|
-          handle_backend_error(response) if [500, 502, 501, 401].include? response.code
-          if response.respond_to?('body')
-            yield response.body if block_given?
-          else
-            yield response.to_s if block_given?
-          end
+          response_error(response) unless response_successful? response.code
+          yield response.to_s if block_given?
         end
       else
         resource = RestClient::Resource.new(conf[:path], :open_timeout => conf[:open_timeout], :timeout => conf[:timeout])
         resource.send(conf[:method], default_headers.merge(extended_headers)) do |response, request, block|
-          handle_backend_error(response) if [500, 502, 501, 401].include? response.code
-          if conf[:method].eql?(:get) and [301, 302, 307].include? response.code
-            response.follow_redirection(request) do |response, request, block|
-              if response.respond_to?('body')
-                yield response.body if block_given?
-              else
-                yield response.to_s if block_given?
-              end
-            end
-          else
-            if response.respond_to?('body')
-              yield response.body if block_given?
-            else
-              yield response.to_s if block_given?
-            end
-          end
+          response_error(response) unless response_successful? response.code
+          yield response.to_s if block_given?
         end
       end
     end
 
-    # Re-raise backend errors as on exception in client with message from
-    # backend
-    class BackendError < StandardError
-
-      def initialize(opts={})
-        opts[:message] = "Not authorized / Invalid credentials" if opts[:code] == 401
-        super("#{opts[:code]} : #{opts[:message]}")
-        set_backtrace(opts[:backtrace].split("\n").map { |l| l.strip }[0..10]) if opts[:backtrace]
-      end
-
-    end
-
-    def handle_backend_error(response)
-      response_xml = Nokogiri::XML(response)
-      backtrace = (response_xml/'error/backtrace').empty? ? nil : (response_xml/'error/backtrace').text
-      raise BackendError.new(:message => (response_xml/'error/message').text,
-                             :code => response.code,
-                             :backtrace => backtrace)
-    end
 
     # Check if specified collection have wanted feature
     def feature?(collection, name)

data/lib/errors.rb

@@ -0,0 +1,140 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module DeltaCloud
+  module HTTPError
+
+    class ClientError < StandardError
+
+      attr_reader :params, :driver, :provider
+
+      def initialize(code, message, opts={}, backtrace=nil)
+        @params, @driver, @provider = opts[:params], opts[:driver], opts[:provider]
+        if code.to_s =~ /^5(\d{2})/
+          message += "\nParameters: #{@params.inspect}\n"
+          message += "Driver: #{@driver}@#{@provider}"
+        end
+        super("#{code}\n\n#{self.class.superclass}: #{message}\n\n")
+        # If server provided us the backtrace, then replace client backtrace
+        # with the server one.
+        set_backtrace(backtrace) unless backtrace.nil?
+      end
+    end
+
+    class ServerError < ClientError; end
+    class UknownError < ClientError; end
+
+    # For sake of consistent documentation we need to create
+    # this exceptions manually, instead of using some meta-programming.
+    # Client will really appreciate this it will try to catch some
+    # specific exception.
+
+    # Client errors (4xx)
+    class BadRequest < ClientError; end
+    class Unauthorized < ClientError; end
+    class Forbidden < ClientError; end
+    class NotFound < ClientError; end
+    class MethodNotAllowed < ClientError; end
+    class NotAcceptable < ClientError; end
+    class RequestTimeout < ClientError; end
+    class Gone < ClientError; end
+    class ExpectationFailed < ClientError; end
+    class UnsupportedMediaType < ClientError; end
+
+    # Server errors (5xx)
+    class DeltacloudError < ServerError; end
+    class ProviderError < ServerError; end
+    class ProviderTimeout < ServerError; end
+    class ServiceUnavailable < ServerError; end
+    class NotImplemented < ServerError; end
+
+    class ExceptionHandler
+
+      attr_reader :http_status_code, :message, :trace
+
+      def initialize(status_code, message=nil, opts={}, backtrace=nil, &block)
+        @http_status_code = status_code.to_i
+        @trace = backtrace
+        @message = message || client_error_messages[status_code] || 'No error message received'
+        @options = opts
+        instance_eval(&block) if block_given?
+      end
+
+      def on(code, exception_class)
+        if code == @http_status_code
+          raise exception_class.new(code, @message, @options, @trace)
+        end
+      end
+
+      private
+
+      def client_error_messages
+        {
+          400 => 'The request could not be understood by the server due to malformed syntax.',
+          401 => 'Authentication required for this request or invalid credentials provided.',
+          403 => 'Requested operation is not allowed for this resource.',
+          404 => 'Not Found',
+          405 => 'Method not allowed for this resource.',
+          406 => 'Requested media type is not supported by server.',
+          408 => 'The client did not produce a request within the time that the server was prepared to wait.',
+          410 => 'The resource is no longer available'
+        }
+      end
+
+    end
+
+    def self.parse_response_error(response)
+    
+    end
+
+    def self.client_error(code)
+      ExceptionHandler.new(code) do
+        # Client errors
+        on 400, BadRequest
+        on 401, Unauthorized
+        on 403, Forbidden
+        on 404, NotFound
+        on 405, MethodNotAllowed
+        on 406, NotAcceptable
+        on 408, RequestTimeout
+        on 410, Gone
+      end
+    end
+
+    def self.server_error(code, message, opts={}, backtrace=nil)
+      ExceptionHandler.new(code, message, opts, backtrace) do
+        # Client errors
+        on 400, BadRequest
+        on 401, Unauthorized
+        on 403, Forbidden
+        on 404, NotFound
+        on 405, MethodNotAllowed
+        on 406, NotAcceptable
+        on 408, RequestTimeout
+        on 410, Gone
+        on 415, UnsupportedMediaType
+        on 417, ExpectationFailed
+        # Server errors
+        on 500, DeltacloudError
+        on 501, NotImplemented
+        on 502, ProviderError
+        on 503, ServiceUnavailable
+        on 504, ProviderTimeout
+      end
+      raise Deltacloud::HTTPError::UnknownError.new(code, message, opts, backtrace)
+    end
+
+  end
+end

data/lib/plain_formatter.rb

@@ -23,6 +23,15 @@ module DeltaCloud
         end
       end
 
+      class Key < Base
+        def format
+          sprintf("%-10s | %-60s",
+              @obj.id[0,10],
+              @obj.fingerprint
+          )
+        end
+      end
+
       class Image < Base
         def format
           sprintf("%-10s | %-20s | %-6s | %-20s | %15s",
@@ -59,9 +68,9 @@ module DeltaCloud
       class Instance < Base
         def format
           sprintf("%-15s | %-15s | %-15s | %10s | %32s | %32s",
-            @obj.id ? @obj.id[0,15] : '-',
-            @obj.name ? @obj.name[0,15] : 'unknown',
-            @obj.image.name ? @obj.image.name[0,15] : 'unknown',
+            @obj.id ? @obj.id.to_s[0,15] : '-',
+            @obj.name ? @obj.name.to_s[0,15] : 'unknown',
+            @obj.image.name ? @obj.image.name.to_s[0,15] : 'unknown',
             @obj.state ? @obj.state.to_s[0,10] : 'unknown',
             @obj.public_addresses.collect { |a| a[:address] }.join(',')[0,32],
             @obj.private_addresses.collect { |a| a[:address] }.join(',')[0,32]

data/specs/buckets_spec.rb

@@ -96,6 +96,7 @@ describe "Blobs" do
       blob_list.size.should eql(bucket.size.to_i)
       blob_list.each do |b_id|
         blob = client.blob({"bucket" => bucket.name, :id => b_id})
+        puts blob.inspect
         blob.bucket.should_not be_nil
         blob.bucket.should be_a(String)
         blob.bucket.should eql(bucket.name)

data/specs/content_spec.rb

@@ -31,7 +31,11 @@ describe "return JSON" do
 
   it 'should return JSON when using application/json, */*' do
     header_hash = {
-      'Accept' => "application/json, */*"
+      # FIXME: There is a bug in rack-accept that cause to respond with HTML
+      # to the configuration below.
+      #
+      # 'Accept' => "application/json, */*"
+      'Accept' => "application/json"
     }
     client.get(header_hash) do |response, request, &block|
       response.code.should == 200
@@ -54,7 +58,7 @@ end
 describe "return HTML in different browsers" do
 
   it "wants XML using format parameter" do
-    client['?format=xml'].get('Accept' => 'application/xhtml+xml') do |response, request, &block|
+    client.get(:params => { 'format' => 'xml' }, 'Accept' => 'application/xhtml+xml') do |response, request, &block|
       response.code.should == 200
       response.headers[:content_type].should =~ /^application\/xml/
     end
@@ -67,7 +71,7 @@ describe "return HTML in different browsers" do
   end
 
   it "wants HTML using format parameter and accept set to XML" do
-    client['?format=html'].get('Accept' => 'application/xml') do |response, request, &block|
+    client.get(:params => { 'format' => 'html'}, 'Accept' => 'application/xml') do |response, request, &block|
       response.code.should == 200
       response.headers[:content_type].should =~ /^text\/html/
     end

data/specs/data/images/img1.yml

@@ -0,0 +1,4 @@
+:description: Fedora 10
+:owner_id: fedoraproject
+:architecture: x86_64
+:id: img1

data/specs/data/images/img2.yml

@@ -0,0 +1,4 @@
+:description: Fedora 10
+:owner_id: fedoraproject
+:architecture: i386
+:id: img2

data/specs/data/images/img3.yml

@@ -0,0 +1,4 @@
+:description: JBoss
+:owner_id: mockuser
+:architecture: i386
+:id: img3

data/specs/data/instances/inst0.yml

@@ -0,0 +1,16 @@
+---
+:realm_id: us
+:public_addresses:
+- img1.inst0.public.com
+:state: RUNNING
+:name: "Mock Instance With Profile Change"
+:private_addresses:
+- img1.inst0.private.com
+:image_id: img1
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-large
+  memory: "12288"
+:owner_id: mockuser
+:actions:
+- :reboot
+- :stop

data/specs/data/instances/inst1.yml

@@ -0,0 +1,9 @@
+:name: MockUserInstance
+:state: RUNNING
+:image_id: img3
+:owner_id: mockuser
+:public_addresses: [ img3.inst1.public.com ]
+:private_addresses: [ img3.inst1.private.com ]
+:realm_id: us
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-small

data/specs/data/instances/inst2.yml

@@ -0,0 +1,9 @@
+:name: AnotherInstance
+:state: RUNNING
+:image_id: img1
+:owner_id: anotheruser
+:public_addresses: [ img1.inst2.public.com ]
+:private_addresses: [ img1.inst2.private.com ]
+:realm_id: us
+:instance_profile: !ruby/object:InstanceProfile
+  id: m1-large

data/specs/data/storage_snapshots/snap1.yml

@@ -0,0 +1,4 @@
+:owner_id: fedoraproject
+:created: Wed Jul 29 18:15:24 UTC 2009
+:state: COMPLETED
+:storage_volume_id: vol1

data/specs/data/storage_snapshots/snap2.yml

@@ -0,0 +1,4 @@
+:owner_id: mockuser
+:created: Wed Jul 29 18:15:24 UTC 2009
+:state: COMPLETED
+:storage_volume_id: vol2

data/specs/data/storage_snapshots/snap3.yml

@@ -0,0 +1,4 @@
+:owner_id: mockuser
+:created: Wed Jul 29 18:15:24 UTC 2009
+:state: COMPLETED
+:storage_volume_id: vol2

data/specs/data/storage_volumes/vol1.yml

@@ -0,0 +1,7 @@
+:owner_id: fedoraproject
+:created: Thu Jul 30 14:35:11 UTC 2009
+:state: AVAILABLE
+:capacity: 1
+:realm_id: us
+:device:
+:instance_id:

data/specs/data/storage_volumes/vol2.yml

@@ -0,0 +1,7 @@
+:owner_id: mockuser
+:created: Thu Jul 30 14:35:11 UTC 2009
+:state: AVAILABLE
+:capacity: 1
+:device:
+:realm_id: us
+:instance_id:

data/specs/data/storage_volumes/vol3.yml

@@ -0,0 +1,7 @@
+:owner_id: mockuser
+:created: Thu Jul 30 14:35:11 UTC 2009
+:state: IN-USE
+:capacity: 1
+:realm_id: us
+:device: /dev/sda1
+:instance_id: inst1

data/specs/errors_spec.rb

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2009-2011  Red Hat, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+require 'specs/spec_helper'
+
+describe "server error handler" do
+
+  it_should_behave_like "all resources"
+
+  it 'should capture HTTP 500 error as DeltacloudError' do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      expect { client.realm('500') }.should raise_error(DeltaCloud::HTTPError::DeltacloudError)
+    end
+  end
+
+  it 'should capture HTTP 502 error as ProviderError' do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      expect { client.realm('502') }.should raise_error(DeltaCloud::HTTPError::ProviderError)
+    end
+  end
+
+  it 'should capture HTTP 501 error as NotImplemented' do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      expect { client.realm('501') }.should raise_error(DeltaCloud::HTTPError::NotImplemented)
+    end
+  end
+
+  it 'should capture HTTP 504 error as ProviderTimeout' do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      expect { client.realm('504') }.should raise_error(DeltaCloud::HTTPError::ProviderTimeout)
+    end
+  end
+
+end
+
+describe "client error handler" do
+
+  it 'should capture HTTP 404 error as NotFound' do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      expect { client.realm('non-existing-realm') }.should raise_error(DeltaCloud::HTTPError::NotFound)
+    end
+  end
+
+end

data/specs/storage_snapshot_spec.rb

@@ -62,18 +62,20 @@ describe "storage snapshot" do
 
   it "should return nil for unknown storage volume by ID" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_snapshot = client.storage_snapshot( "bogus" )
-      storage_snapshot.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.storage_snapshot( "bogus" )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
   it "should return nil for unknown storage volume by URI" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_snapshot = client.fetch_storage_snapshot( API_URL + '/storage_snapshots/bogus' )
-      storage_snapshot.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.fetch_storage_snapshot( API_URL + '/storage_snapshots/bogus' )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
 end

data/specs/storage_volume_spec.rb

@@ -69,20 +69,22 @@ describe "storage volumes" do
     end
   end
 
-  it "should return nil for unknown storage volume by ID" do
+  it "should raise exception for unknown storage volume by ID" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_volume = client.storage_volume( 'bogus' )
-      storage_volume.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.storage_volume( 'bogus' )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
-  it "should return nil for unknown storage volume by URI" do
+  it "should raise exception for unknown storage volume by URI" do
     client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
-    client.connect do |client|
-      storage_volume = client.fetch_storage_volume( API_URL + '/storage_volumes/bogus' )
-      storage_volume.should be_nil
-    end
+    lambda {
+      client.connect do |client|
+        client.fetch_storage_volume( API_URL + '/storage_volumes/bogus' )
+      end
+    }.should raise_error(DeltaCloud::HTTPError::NotFound)
   end
 
 

metadata

@@ -1,175 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deltacloud-client
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
-- Red Hat, Inc.
+authors:
+- The Apache Software Foundation
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70208850754540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70208850754540
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70208850754060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70208850754060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70208850753600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70208850753600
 description: Deltacloud REST Client for API
-email: deltacloud-users@lists.fedorahosted.org
-executables: 
+email: dev@deltacloud.apache.org
+executables:
 - deltacloudc
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - NOTICE
-- DISCLAIMER
-files: 
+files:
 - Rakefile
-- lib/documentation.rb
-- lib/instance_state.rb
-- lib/deltacloud.rb
 - lib/base_object.rb
-- lib/string.rb
+- lib/client_bucket_methods.rb
+- lib/deltacloud.rb
+- lib/documentation.rb
+- lib/errors.rb
 - lib/hwp_properties.rb
+- lib/instance_state.rb
 - lib/plain_formatter.rb
-- lib/client_bucket_methods.rb
+- lib/string.rb
 - bin/deltacloudc
-- specs/keys_spec.rb
-- specs/images_spec.rb
-- specs/content_spec.rb
-- specs/initialization_spec.rb
+- LICENSE
+- NOTICE
 - specs/buckets_spec.rb
-- specs/fixtures/instances/inst2.yml
+- specs/content_spec.rb
+- specs/data/images/img1.yml
+- specs/data/images/img2.yml
+- specs/data/images/img3.yml
+- specs/data/instances/inst0.yml
+- specs/data/instances/inst1.yml
+- specs/data/instances/inst2.yml
+- specs/data/storage_snapshots/snap1.yml
+- specs/data/storage_snapshots/snap2.yml
+- specs/data/storage_snapshots/snap3.yml
+- specs/data/storage_volumes/vol1.yml
+- specs/data/storage_volumes/vol2.yml
+- specs/data/storage_volumes/vol3.yml
+- specs/errors_spec.rb
+- specs/fixtures/images/img1.yml
+- specs/fixtures/images/img2.yml
+- specs/fixtures/images/img3.yml
 - specs/fixtures/instances/inst0.yml
 - specs/fixtures/instances/inst1.yml
-- specs/fixtures/storage_volumes/vol2.yml
-- specs/fixtures/storage_volumes/vol1.yml
-- specs/fixtures/storage_volumes/vol3.yml
+- specs/fixtures/instances/inst2.yml
 - specs/fixtures/storage_snapshots/snap1.yml
-- specs/fixtures/storage_snapshots/snap3.yml
 - specs/fixtures/storage_snapshots/snap2.yml
-- specs/fixtures/images/img1.yml
-- specs/fixtures/images/img3.yml
-- specs/fixtures/images/img2.yml
-- specs/realms_spec.rb
-- specs/spec_helper.rb
-- specs/instances_spec.rb
-- specs/shared/resources.rb
+- specs/fixtures/storage_snapshots/snap3.yml
+- specs/fixtures/storage_volumes/vol1.yml
+- specs/fixtures/storage_volumes/vol2.yml
+- specs/fixtures/storage_volumes/vol3.yml
 - specs/hardware_profiles_spec.rb
+- specs/images_spec.rb
+- specs/initialization_spec.rb
 - specs/instance_states_spec.rb
-- specs/storage_volume_spec.rb
+- specs/instances_spec.rb
+- specs/keys_spec.rb
+- specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/spec_helper.rb
 - specs/storage_snapshot_spec.rb
-- LICENSE
-- NOTICE
-- DISCLAIMER
+- specs/storage_volume_spec.rb
 homepage: http://www.deltacloud.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST Client
-test_files: 
-- specs/keys_spec.rb
-- specs/images_spec.rb
-- specs/content_spec.rb
-- specs/initialization_spec.rb
+test_files:
 - specs/buckets_spec.rb
-- specs/fixtures/instances/inst2.yml
+- specs/content_spec.rb
+- specs/data/images/img1.yml
+- specs/data/images/img2.yml
+- specs/data/images/img3.yml
+- specs/data/instances/inst0.yml
+- specs/data/instances/inst1.yml
+- specs/data/instances/inst2.yml
+- specs/data/storage_snapshots/snap1.yml
+- specs/data/storage_snapshots/snap2.yml
+- specs/data/storage_snapshots/snap3.yml
+- specs/data/storage_volumes/vol1.yml
+- specs/data/storage_volumes/vol2.yml
+- specs/data/storage_volumes/vol3.yml
+- specs/errors_spec.rb
+- specs/fixtures/images/img1.yml
+- specs/fixtures/images/img2.yml
+- specs/fixtures/images/img3.yml
 - specs/fixtures/instances/inst0.yml
 - specs/fixtures/instances/inst1.yml
-- specs/fixtures/storage_volumes/vol2.yml
-- specs/fixtures/storage_volumes/vol1.yml
-- specs/fixtures/storage_volumes/vol3.yml
+- specs/fixtures/instances/inst2.yml
 - specs/fixtures/storage_snapshots/snap1.yml
-- specs/fixtures/storage_snapshots/snap3.yml
 - specs/fixtures/storage_snapshots/snap2.yml
-- specs/fixtures/images/img1.yml
-- specs/fixtures/images/img3.yml
-- specs/fixtures/images/img2.yml
-- specs/realms_spec.rb
-- specs/spec_helper.rb
-- specs/instances_spec.rb
-- specs/shared/resources.rb
+- specs/fixtures/storage_snapshots/snap3.yml
+- specs/fixtures/storage_volumes/vol1.yml
+- specs/fixtures/storage_volumes/vol2.yml
+- specs/fixtures/storage_volumes/vol3.yml
 - specs/hardware_profiles_spec.rb
+- specs/images_spec.rb
+- specs/initialization_spec.rb
 - specs/instance_states_spec.rb
-- specs/storage_volume_spec.rb
+- specs/instances_spec.rb
+- specs/keys_spec.rb
+- specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/spec_helper.rb
 - specs/storage_snapshot_spec.rb
+- specs/storage_volume_spec.rb

data/DISCLAIMER

@@ -1,8 +0,0 @@
-Apache Deltacloud is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Incubator PMC. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects.  While
-incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.