deltacloud-client 0.1.1 → 0.3.0

data/DISCLAIMER

@@ -0,0 +1,8 @@
+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.

data/NOTICE

@@ -0,0 +1,8 @@
+Apache Deltacloud
+Copyright 2010 The Apache Software Foundation
+
+This product includes software developed at The Apache Software Foundation
+(http://www.apache.org/).
+
+This product includes software developed by Red Hat,
+Inc. (http://www.redhat.com/)

data/Rakefile

@@ -17,6 +17,7 @@
 # under the License.
 
 require 'rake/gempackagetask'
+require 'rake/testtask'
 
 load 'deltacloud-client.gemspec'
 
@@ -25,6 +26,7 @@ task 'documentation' do
   load 'lib/documentation.rb'
 end
 
+
 spec = Gem::Specification.load('deltacloud-client.gemspec')
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true
@@ -44,6 +46,14 @@ task 'fixtures' do
   FileUtils.cp_r( File.dirname( __FILE__ ) + '/specs/fixtures', File.dirname( __FILE__ ) + '/specs/data' )
 end
 
+namespace :test do
+  Rake::TestTask.new(:cmd) do |t|
+    t.libs << "tests"
+    t.test_files = FileList['tests/cmd.rb']
+    t.verbose = true
+  end
+end
+
 desc "Clean Fixtures"
 task 'fixtures:clean' do
   FileUtils.rm_rf( File.dirname( __FILE__ ) + '/specs/data' )

data/bin/deltacloudc

@@ -38,31 +38,66 @@ deltacloudc collection operation [options]
 URL format:
 API_URL=http://[user]:[password]@[api_url][port][/uri]
 
+Examples:
+
+ 1. To list collections for deltacloud api on port 3333 of server deltacloud.foo
+
+        deltacloudc -l -u http://user:password@deltacloud.foo:3333/api
+
+ 2. To list the operations for the 'images' collection:
+
+        deltacloudc images -l -u http://user:password@deltacloud.foo:3333/api
+
+ 3. To list all images (i.e. call the 'index' operation of 'images'):
+
+        deltacloudc images index -u http://user:password@deltacloud.foo:3333/api
+
+ 4. To get the details of image '5':
+
+        deltacloudc images show -i 5 -u http://user:password@deltacloud.foo:3333/api
+
 Options:
 BANNER
   opts.on( '-i', '--id ID', 'ID for operation') { |id| options[:id] = id }
   opts.on( '-d', '--image-id ID', 'Image ID') { |id| options[:image_id] = id }
+  opts.on( '-b', '--bucket-id ID', 'Bucket ID') {|id| options[:bucket_id] = id }
   opts.on( '-a', '--arch ARCH', 'Architecture (x86, x86_64)') { |id| options[:architecture] = id }
   opts.on( '-p', '--hardware-profile HARDWARE_PROFILE', 'Hardware Profile') { |id| options[:hwp_id] = id }
   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( '-l', '--list', 'List collections/operations') { |id| options[:list] = true }
-  opts.on( '-h', '--help', 'Display this screen' ) { puts opts ; exit }
+  opts.on( '-h', '--help', 'Display this screen' ) { puts @optparse; Kernel.exit! }
   opts.on( '-v', '--version', 'Display API version' ) { options[:version]=true }
   opts.on( '-V', '--verbose', 'Print verbose messages' ) { options[:verbose]=true }
+  opts.on( '-f', '--file-path PATH', 'local path for new blob data') {|path| options[:file_path]=path }
+  opts.on( '-m', '--blob-metadata k1=v1, k2=v2', 'Comma seperated k=v pairs for blob metadata (for create operation)') do |meta|
+                    blob_meta = {}
+                    meta.gsub!(/ /,"")
+                    meta.scan(/(\w+)=(\w+)/).map {|k,v| blob_meta[k] = v }
+                    options[:blob_metadata] = blob_meta
+                end
 end
 
 def invalid_usage(error_msg='')
-  puts "ERROR: #{error_msg}"
+  puts "\n ERROR: #{error_msg} \n\n"
+  puts @optparse
   exit(1)
 end
 
-@optparse.parse!
+begin
+    @optparse.parse!
+rescue Exception => e
+    invalid_usage(e.message)
+end
 
 # First try to get API_URL from environment
 options[:api_url] = ENV['API_URL'] if options[:api_url].nil?
 
+if(options[:api_url].nil?)
+    invalid_usage("You must supply the url to the deltacloud api; either use '-u' flag or set the 'API_URL' environment variable")
+end
+
 url = URI.parse(options[:api_url])
 api_url = "http://#{url.host}#{url.port ? ":#{url.port}" : ''}#{url.path}"
 
@@ -75,6 +110,8 @@ collections = client.entry_points.keys
 
 # Exclude collection which don't have methods in client library yet
 collections.delete(:instance_states)
+#add blob collection if buckets is present
+collections << :blob if collections.include?(:buckets)
 
 # If list parameter passed print out available collection
 # with API documentation
@@ -88,6 +125,14 @@ end
 # If collection parameter is present and user requested list
 # print all operation defined for collection with API documentation
 if options[:list] and options[:collection]
+  #deal with blobs again - bypass 'normal' docs procedure
+  if options[:collection] =~ /blob/i
+    puts "create \t\t: Create a new blob in a specified bucket (POST /api/buckets/:bucket)"
+    puts "destroy \t: Delete a specified blob in a specified bucket (DELETE /api/buckets/:bucket/:blob)"
+    puts "show \t\t: Get details of a specified blob in a specified bucket (GET /api/buckets/:bucket/:blob)"
+    puts "data \t\t: Get the contents of a specified blob - the blob data content itself"
+    exit(0)
+  end
   doc = client.documentation(options[:collection])
   doc.operations.each do |c|
     puts sprintf("%-20s: %s", c.operation, c.description)
@@ -104,6 +149,8 @@ end
 # Do same if 'index' operation is set
 if options[:collection] and ( options[:operation].nil? or options[:operation].eql?('index') )
   invalid_usage("Unknown collection: #{options[:collection]}") unless collections.include?(options[:collection].to_sym)
+#cannot list blobs - can only show a specific blob
+  invalid_usage("You must specify a particular blob with -i and a particular bucket with -b") if options[:collection] =~ (/blob/i)
   params = {}
   params.merge!(:architecture => options[:architecture]) if options[:architecture]
   params.merge!(:id => options[:id]) if options[:id]
@@ -123,6 +170,27 @@ if options[:collection] and options[:operation]
 
   # If collection is set and requested operation is 'show' just 'singularize'
   # collection name and print item with specified id (-i parameter)
+  #Blobs are a special case so deal with first -
+  if options[:collection] =~ (/blob/i)
+    invalid_usage("Please specify the bucket for this blob using the -b option") unless options[:bucket_id]
+    invalid_usage("Missing blob ID, please specify with -i option") unless options[:id]
+    params = {}
+    params.merge!(:id => options[:id], 'bucket' => options[:bucket_id])
+    params.merge!('metadata'=>options[:blob_metadata]) unless options[:blob_metadata].nil?
+    case options[:operation]
+        when 'show' then puts format(client.send( options[:collection], params))
+        when 'data' then puts (client.blob_data(params))
+        when 'create' then
+            invalid_usage("Specify the location of the new blob data (full local path) using -f option") unless options[:file_path]
+            params.merge!('file_path'=>options[:file_path])
+            blob = client.create_blob(params)
+            puts format(blob)
+        when 'destroy' then client.destroy_blob(params)
+        else invalid_usage("Please specify a valid operation for the blob collection - try -l to see available operations")
+    end
+    exit(0)
+  end
+
   if options[:operation].eql?('show')
     invalid_usage("Missing ID, must be provided with --id") unless options[:id]
     puts format(client.send(options[:collection].gsub(/s$/, ''), options[:id]))
@@ -145,6 +213,21 @@ if options[:collection] and options[:operation]
     exit(0)
   end
 
+  #Create and Destroy a bucket - require the bucket id:
+  if options[:collection].eql?('buckets')
+    if options[:operation].eql?('create')
+        invalid_usage("Please specify an id for the new bucket with -i") unless options[:id]
+        bucket = client.create_bucket('id'=>options[:id])
+        puts format(bucket)
+    elsif options[:operation].eql?('destroy')
+        invalid_usage("Please specify the bucket you wish to destroy with -i") unless options[:id]
+        client.destroy_bucket('id'=>options[:id])
+    else
+        invalid_usage("Please specify a valid operation on buckets - use -l to see valid operations")
+    end
+    exit(0)
+  end
+
   # All other operations above collections is done there:
   if options[:collection].eql?('instances')
     instance = client.instance(options[:id])

data/lib/base_object.rb

@@ -100,6 +100,7 @@ module DeltaCloud
           when :text then return m[:value]
           when :property then return m[:property]
           when :collection then return m[:values]
+          when :list then return m[:value].join(", ")
           else raise NoHandlerForMethod
         end
       end
@@ -108,7 +109,6 @@ module DeltaCloud
         # First of all search throught array for method name
         m = search_for_method(method_name)
         if m.nil?
-          warn "[WARNING] Method unsupported by API: '#{self.class}.#{method_name}(#{args.inspect})'"
           return nil
         else
           # Call appropriate handler for method
@@ -116,6 +116,23 @@ module DeltaCloud
         end
       end
 
+      # This method adds blobs to the blob_list property
+      # of a bucket
+      def add_blob!(blob_name)
+        if @blob_list.nil?
+          @blob_list = [blob_name]
+          @objects << {
+            :type => :list,
+            :method_name => "blob_list",
+            :value => @blob_list
+          }
+        else
+          @blob_list << blob_name
+          current = search_for_method('blob_list')
+          current[:value] = @blob_list
+        end
+      end
+
       private
 
       def search_for_method(name)
@@ -225,12 +242,21 @@ module DeltaCloud
       end
 
       def action_trigger(action)
-        # Refresh object state after action
+        # Refresh object state after action unless the object was destroyed
+        return if action.to_s == "destroy"
         @new_state_object = @client.send(self.base_name, self.id)
         @state = @new_state_object.state
         self.update_actions!
       end
 
+      def add_run_action!(id, link)
+        @objects << {
+          :method_name => 'run',
+          :type => :run,
+          :url => link,
+        }
+      end
+
       alias :action_method_handler :method_handler
 
       def method_handler(m, args=[])
@@ -239,6 +265,7 @@ module DeltaCloud
         rescue NoHandlerForMethod
           case m[:type]
             when :state then evaluate_state(m[:state], @state)
+            when :run then run_command(m[:url][:href], args)
             else raise NoHandlerForMethod
           end
         end
@@ -246,6 +273,22 @@ module DeltaCloud
 
 #      private
 
+      def run_command(instance_url, args)
+        credentials = args[1]
+        params = {
+          :cmd => args[0],
+          :private_key => credentials[:pem] ? File.read(credentials[:pem]) : nil,
+        }
+        params.merge!({
+          :username => credentials[:username],
+          :password => credentials[:password]
+        }) if credentials[:username] and credentials[:password]
+        @client.request(:post, instance_url, {}, params) do |response|
+          output = Nokogiri::XML(response)
+          (output/'/instance/output').first.text
+        end
+      end
+
       def evaluate_state(method_state, current_state)
         method_state.eql?(current_state)
       end

data/lib/client_bucket_methods.rb

@@ -0,0 +1,54 @@
+module ClientBucketMethods
+
+  def create_bucket(params)
+    obj = nil
+    request(:post, "#{api_uri.to_s}/buckets", {:name => params['id'] }) do |response|
+      handle_backend_error(response) if response.code!=201
+      obj = base_object(:bucket, response)
+    end
+  end
+
+  def destroy_bucket(params)
+    #actually response here is 204 - no content - so nothing returned to client?
+    request(:delete, "#{api_uri.to_s}/buckets/#{params['id']}") do |response|
+      handle_backend_error(response) if response.code!=204
+      response
+    end
+  end
+
+  def create_blob(params)
+    blob = nil
+    resource = RestClient::Resource.new("#{api_uri.to_s}/buckets/#{params['bucket']}", :open_timeout => 10, :timeout => 45)
+    headers = default_headers.merge(extended_headers)
+    unless params['metadata'].nil?
+      metadata_headers = {}
+      params['metadata'].each   do |k,v|
+        metadata_headers["X-Deltacloud-Blobmeta-#{k}"] = v
+      end
+      headers = headers.merge(metadata_headers)
+    end
+    resource.send(:post, {:blob_data => File.new(params['file_path'], 'rb'), :blob_id => params[:id]}, headers) do |response, request, block|
+      handle_backend_error(response) if response.code.eql?(500)
+      blob = base_object(:blob, response)
+      yield blob if block_given?
+    end
+    return blob
+  end
+
+  def destroy_blob(params)
+    request(:delete, "#{api_uri.to_s}/buckets/#{params['bucket']}/#{params[:id]}") do |response|
+      handle_backend_error(response) if response.code!=204
+      response
+    end
+  end
+
+  #RestClient doesn't do streaming 'get' yet - we already opened a pull request on this see
+  #https://github.com/archiloque/rest-client/issues/closed#issue/62 - apparently its going to
+  #be in the next version - unknown when. For now get full response. FIXME
+  def blob_data(params)
+    request(:get, "#{api_uri.to_s}/buckets/#{params['bucket']}/#{params[:id]}/content") do |response|
+      response
+    end
+  end
+
+end

data/lib/deltacloud.rb

@@ -20,11 +20,11 @@ require 'nokogiri'
 require 'rest_client'
 require 'base64'
 require 'logger'
-
 require 'hwp_properties'
 require 'instance_state'
 require 'documentation'
 require 'base_object'
+require 'client_bucket_methods'
 
 module DeltaCloud
 
@@ -32,11 +32,15 @@ module DeltaCloud
   #
   # @param [String, user_name] API user name
   # @param [String, password] API password
-  # @param [String, user_name] API URL (eg. http://localhost:3001/api)
+  # @param [String, url] API URL (eg. http://localhost:3001/api)
   # @return [DeltaCloud::API]
-  def self.new(user_name, password, api_url, opts={}, &block)
-    opts ||= {}
-    API.new(user_name, password, api_url, opts, &block)
+  #def self.new(user_name, password, api_url, opts={}, &block)
+  #  opts ||= {}
+  #  API.new(user_name, password, api_url, opts, &block)
+  #end
+
+  def self.new(user_name, password, api_url, &block)
+    API.new(user_name, password, api_url, &block)
   end
 
   # Check given credentials if their are valid against
@@ -46,8 +50,8 @@ module DeltaCloud
   # @param [String, password] API password
   # @param [String, user_name] API URL (eg. http://localhost:3001/api)
   # @return [true|false]
-  def self.valid_credentials?(user_name, password, api_url)
-    api=API.new(user_name, password, api_url)
+  def self.valid_credentials?(user_name, password, api_url, opts={})
+    api=API.new(user_name, password, api_url, opts)
     result = false
     api.request(:get, '', :force_auth => '1') do |response|
       result = true if response.code.eql?(200)
@@ -74,9 +78,44 @@ module DeltaCloud
       @features, @entry_points = {}, {}
       @verbose = opts[:verbose] || false
       discover_entry_points
+      if entry_points.include?(:buckets)
+        extend(ClientBucketMethods)
+      end
       yield self if block_given?
     end
 
+    # This method can be used to switch back-end cloud
+    # for API instance using HTTP headers.
+    # Options must include:
+    # {
+    #   :driver => 'rhevm|ec2|gogrid|...',
+    #   :username => 'API key for backend',
+    #   :password => 'API secret key for backend',
+    # }
+    # Optionally you can pass also :provider option to change
+    # provider entry-point
+    #
+    # Example usage:
+    # client = Deltacloud::new('url', 'username', 'password')
+    # ...
+    # client.with_config(:driver => 'ec2', :username => '', :password => '') do |ec2|
+    #   ec2.realms
+    # end
+    #
+    # Note: After this block finish client instance will be set back to default
+    # state
+    #
+    # @param [Hash, opts] New provider configuration
+    def with_config(opts, &block)
+      api_instance = self.dup
+      api_instance.use_driver(opts[:driver],
+                             :username => opts[:username],
+                             :password => opts[:password],
+                             :provider => opts[:provider])
+      yield api_instance if block_given?
+      api_instance
+    end
+
     def connect(&block)
       yield self
     end
@@ -93,7 +132,6 @@ module DeltaCloud
     # Define methods based on 'rel' attribute in entry point
     # Two methods are declared: 'images' and 'image'
     def declare_entry_points_methods(entry_points)
-
       API.instance_eval do
         entry_points.keys.select {|k| [:instance_states].include?(k)==false }.each do |model|
 
@@ -114,8 +152,20 @@ module DeltaCloud
             self.send(model.to_s.singularize.to_sym, $1)
           end
 
+      end
+
+      #define methods for blobs:
+      if(entry_points.include?(:buckets))
+        define_method :"blob" do |*args|
+            bucket = args[0]["bucket"]
+            blob = args[0][:id]
+            request(:get, "#{entry_points[:buckets]}/#{bucket}/#{blob}") do |response|
+              base_object("blob", response)
+            end
         end
       end
+
+      end
     end
 
     def base_object_collection(model, response)
@@ -144,13 +194,11 @@ module DeltaCloud
       params.merge!({ :initial_state => (item/'state').text.sanitize }) if (item/'state').length > 0
 
       obj = base_object.new(params)
-
       # Traverse across XML document and deal with elements
       item.xpath('./*').each do |attribute|
-
         # Do a link for elements which are links to other REST models
         if self.entry_points.keys.include?(:"#{attribute.name}s")
-          obj.add_link!(attribute.name, attribute['id']) && next
+          obj.add_link!(attribute.name, attribute['id']) && next unless (attribute.name == 'bucket' && item.name == 'blob')
         end
 
         # Do a HWP property for hardware profile properties
@@ -165,25 +213,40 @@ module DeltaCloud
         # If there are actions, add they to ActionObject/StateFullObject
         if attribute.name == 'actions'
           (attribute/'link').each do |link|
+            (obj.add_run_action!(item['id'], link) && next) if link[:rel] == 'run' 
             obj.add_action_link!(item['id'], link)
           end && next
         end
 
         if attribute.name == 'mount'
-          obj.add_link!("instance", (attribute/"./instance/@id").first)
+          obj.add_link!("instance", (attribute/"./instance/@id").first.value)
           obj.add_text!("device", (attribute/"./device/@name").first.value)
           next
         end
 
+        #deal with blob metadata
+        if(attribute.name == 'user_metadata')
+          meta = {}
+          attribute.children.select {|x| x.name=="entry" }.each  do |element|
+            value = element.content.gsub!(/(\n) +/,'')
+            meta[element['key']] = value
+          end
+          obj.add_collection!(attribute.name, meta.inspect) && next
+        end
+
         # Deal with collections like public-addresses, private-addresses
         if (attribute/'./*').length > 0
           obj.add_collection!(attribute.name, (attribute/'*').collect { |value| value.text }) && next
         end
 
+        #deal with blobs for buckets
+        if(attribute.name == 'blob')
+          obj.add_blob!(attribute.attributes['id'].value) && next
+        end
+
         # Anything else is treaten as text object
         obj.add_text!(attribute.name, attribute.text.convert)
       end
-
       return obj
     end
 
@@ -237,6 +300,9 @@ 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
           yield obj if block_given?
         end
         return obj
@@ -245,7 +311,7 @@ module DeltaCloud
     end
 
     def use_driver(driver, opts={})
-      if opts[:driver]
+      if driver
         @api_driver = driver 
         @driver_name = driver
         discover_entry_points
@@ -256,6 +322,11 @@ module DeltaCloud
       return self
     end
 
+    def use_config!(opts={})
+      @api_uri = URI.parse(opts[:url]) if opts[:url]
+      use_driver(opts[:driver], opts)
+    end
+
     def extended_headers
       headers = {}
       headers["X-Deltacloud-Driver"] = @api_driver.to_s if @api_driver
@@ -270,14 +341,17 @@ module DeltaCloud
         :method => (args[0] || 'get').to_sym,
         :path => (args[1]=~/^http/) ? args[1] : "#{api_uri.to_s}#{args[1]}",
         :query_args => args[2] || {},
-        :form_data => args[3] || {}
+        :form_data => args[3] || {},
+        :timeout => args[4] || 45,
+        :open_timeout => args[5] || 10
       }
       if conf[:query_args] != {}
         conf[:path] += '?' + URI.escape(conf[:query_args].collect{ |key, value| "#{key}=#{value}" }.join('&')).to_s
       end
 
       if conf[:method].eql?(:post)
-        RestClient.send(:post, conf[:path], conf[:form_data], default_headers.merge(extended_headers)) do |response, request, block|
+        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 response.code.eql?(500)
           if response.respond_to?('body')
             yield response.body if block_given?
@@ -286,7 +360,8 @@ module DeltaCloud
           end
         end
       else
-        RestClient.send(conf[:method], conf[:path], default_headers.merge(extended_headers)) do |response, request, block|
+        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 response.code.eql?(500)
           if conf[:method].eql?(:get) and [301, 302, 307].include? response.code
             response.follow_redirection(request) do |response, request, block|
@@ -309,7 +384,7 @@ module DeltaCloud
 
     # Re-raise backend errors as on exception in client with message from
     # backend
-    class BackendError < Exception
+    class BackendError < StandardError
       def initialize(opts={})
         @message = opts[:message]
       end

data/lib/instance_state.rb

@@ -1,3 +1,20 @@
+# Copyright (C) 2009, 2010  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.
+
 module DeltaCloud
   module InstanceState
 

data/lib/plain_formatter.rb

@@ -1,3 +1,20 @@
+# Copyright (C) 2009, 2010  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.
+
 module DeltaCloud
   module PlainFormatter
     module FormatObject
@@ -33,8 +50,11 @@ module DeltaCloud
 
       class HardwareProfile < Base
         def format
+          architecture = @obj.architecture ? @obj.architecture.value[0,6] : 'opaque'
+          memory = @obj.memory ? @obj.memory.value.to_s[0,10] : 'opaque'
+          storage = @obj.storage ? @obj.storage.value.to_s[0,10] : 'opaque'
           sprintf("%-15s | %-6s | %10s | %10s ", @obj.id[0, 15],
-            @obj.architecture.value[0,6], @obj.memory.value.to_s[0,10], @obj.storage.value.to_s[0,10])
+           architecture , memory, storage)
         end
       end
 
@@ -74,10 +94,42 @@ module DeltaCloud
         end
       end
 
+      class Bucket < Base
+        def format
+          sprintf("%-s | %-s | %-s | %-s",
+          @obj.id,
+          @obj.name,
+          @obj.size ? @obj.size : "0",
+          @obj.blob_list ? @obj.blob_list : ""
+          )
+        end
+      end
+
+      class Blob < Base
+        def format
+          sprintf("%-s | %-s | %-d | %-s | %-s | %-s " ,
+          @obj.id,
+          @obj.bucket,
+          @obj.content_length,
+          @obj.content_type,
+          @obj.last_modified,
+          @obj.user_metadata
+          )
+        end
+      end
+
+      class Driver < Base
+        def format
+          sprintf("%-15s | %-15s | %-s",
+                  @obj.id,
+                  @obj.name,
+                  @obj.url)
+        end
+      end
     end
 
     def format(obj)
-      object_name = obj.class.name.classify.gsub(/^DeltaCloud::API::/, '')
+      object_name = obj.class.name.classify.gsub(/^DeltaCloud::API::(\w+)::/, '')
       format_class = DeltaCloud::PlainFormatter::FormatObject.const_get(object_name)
       format_class.new(obj).format
     end

data/specs/data/storage_volumes/vol1.yml

@@ -2,5 +2,6 @@
 :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

@@ -3,4 +3,5 @@
 :state: AVAILABLE
 :capacity: 1
 :device:
+:realm_id: us
 :instance_id:

data/specs/data/storage_volumes/vol3.yml

@@ -2,5 +2,6 @@
 :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/fixtures/storage_volumes/vol1.yml

@@ -2,5 +2,6 @@
 :created: Thu Jul 30 14:35:11 UTC 2009
 :state: AVAILABLE
 :capacity: 1
+:realm_id: us
 :device:
 :instance_id:

data/specs/fixtures/storage_volumes/vol2.yml

@@ -3,4 +3,5 @@
 :state: AVAILABLE
 :capacity: 1
 :device:
+:realm_id: us
 :instance_id:

data/specs/fixtures/storage_volumes/vol3.yml

@@ -2,5 +2,6 @@
 :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/instances_spec.rb

@@ -190,5 +190,17 @@ describe "instances" do
         instance.state.should eql( "RUNNING" )
       end
     end
+
+    it "should not throw exception when destroying an instance" do
+      DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+        instance = client.create_instance( 'img1',
+                                           :name=>'TestDestroyInstance',
+                                           :hardware_profile => 'm1-xlarge' )
+        instance.stop!
+        lambda {
+          instance.destroy!
+        }.should_not raise_error
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-client
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2011-05-05 00:00:00 +02:00
 default_executable: deltacloudc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,53 +73,58 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- COPYING
+- LICENSE
+- NOTICE
+- DISCLAIMER
 files: 
 - Rakefile
-- lib/plain_formatter.rb
+- lib/base_object.rb
+- lib/client_bucket_methods.rb
+- lib/deltacloud.rb
 - lib/documentation.rb
 - lib/hwp_properties.rb
 - lib/instance_state.rb
+- lib/plain_formatter.rb
 - lib/string.rb
-- lib/base_object.rb
-- lib/deltacloud.rb
 - init.rb
 - bin/deltacloudc
-- COPYING
-- specs/fixtures/storage_volumes/vol1.yml
-- specs/fixtures/storage_volumes/vol3.yml
-- specs/fixtures/storage_volumes/vol2.yml
-- specs/fixtures/storage_snapshots/snap3.yml
-- specs/fixtures/storage_snapshots/snap1.yml
-- specs/fixtures/storage_snapshots/snap2.yml
+- LICENSE
+- NOTICE
+- DISCLAIMER
+- 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/fixtures/images/img1.yml
 - specs/fixtures/images/img2.yml
 - specs/fixtures/images/img3.yml
-- specs/fixtures/images/img1.yml
+- specs/fixtures/instances/inst0.yml
 - specs/fixtures/instances/inst1.yml
 - specs/fixtures/instances/inst2.yml
-- specs/fixtures/instances/inst0.yml
-- specs/shared/resources.rb
+- specs/fixtures/storage_snapshots/snap1.yml
+- specs/fixtures/storage_snapshots/snap2.yml
+- 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/instances_spec.rb
 - specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/spec_helper.rb
 - specs/storage_snapshot_spec.rb
-- specs/hardware_profiles_spec.rb
 - specs/storage_volume_spec.rb
-- specs/spec_helper.rb
-- specs/instances_spec.rb
-- specs/data/storage_volumes/vol1.yml
-- specs/data/storage_volumes/vol3.yml
-- specs/data/storage_volumes/vol2.yml
-- specs/data/storage_snapshots/snap3.yml
-- specs/data/storage_snapshots/snap1.yml
-- specs/data/storage_snapshots/snap2.yml
-- specs/data/images/img2.yml
-- specs/data/images/img3.yml
-- specs/data/images/img1.yml
-- specs/data/instances/inst1.yml
-- specs/data/instances/inst2.yml
-- specs/data/instances/inst0.yml
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []
@@ -150,42 +155,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST Client
 test_files: 
-- specs/fixtures/storage_volumes/vol1.yml
-- specs/fixtures/storage_volumes/vol3.yml
-- specs/fixtures/storage_volumes/vol2.yml
-- specs/fixtures/storage_snapshots/snap3.yml
-- specs/fixtures/storage_snapshots/snap1.yml
-- specs/fixtures/storage_snapshots/snap2.yml
+- 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/fixtures/images/img1.yml
 - specs/fixtures/images/img2.yml
 - specs/fixtures/images/img3.yml
-- specs/fixtures/images/img1.yml
+- specs/fixtures/instances/inst0.yml
 - specs/fixtures/instances/inst1.yml
 - specs/fixtures/instances/inst2.yml
-- specs/fixtures/instances/inst0.yml
-- specs/shared/resources.rb
+- specs/fixtures/storage_snapshots/snap1.yml
+- specs/fixtures/storage_snapshots/snap2.yml
+- 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/instances_spec.rb
 - specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/spec_helper.rb
 - specs/storage_snapshot_spec.rb
-- specs/hardware_profiles_spec.rb
 - specs/storage_volume_spec.rb
-- specs/spec_helper.rb
-- specs/instances_spec.rb
-- specs/data/storage_volumes/vol1.yml
-- specs/data/storage_volumes/vol3.yml
-- specs/data/storage_volumes/vol2.yml
-- specs/data/storage_snapshots/snap3.yml
-- specs/data/storage_snapshots/snap1.yml
-- specs/data/storage_snapshots/snap2.yml
-- specs/data/images/img2.yml
-- specs/data/images/img3.yml
-- specs/data/images/img1.yml
-- specs/data/instances/inst1.yml
-- specs/data/instances/inst2.yml
-- specs/data/instances/inst0.yml