deltacloud-client 0.3.1 → 0.4.0

data/NOTICE

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

data/Rakefile

@@ -16,7 +16,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 
 load 'deltacloud-client.gemspec'
@@ -28,11 +28,19 @@ end
 
 
 spec = Gem::Specification.load('deltacloud-client.gemspec')
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
-if Gem.available?('rspec')
+def available?(name)
+  Gem::Specification.find_by_name(name)
+rescue Gem::LoadError
+  false
+rescue
+  Gem.available?(name)
+end
+
+if available?('rspec')
   require 'spec/rake/spectask'
   desc "Run all examples"
   Spec::Rake::SpecTask.new('spec') do |t|

data/bin/deltacloudc

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009  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
@@ -61,6 +59,7 @@ 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( '-r', '--bucket-location NAME', 'Bucket location') {|name| options[:bucket_location] = name }
   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 }
@@ -179,7 +178,7 @@ if options[:collection] and options[:operation]
     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 '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])
@@ -217,7 +216,7 @@ if options[:collection] and options[:operation]
   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])
+        bucket = client.create_bucket('id'=>options[:id], 'bucket_location'=>options[:bucket_location])
         puts format(bucket)
     elsif options[:operation].eql?('destroy')
         invalid_usage("Please specify the bucket you wish to destroy with -i") unless options[:id]

data/lib/base_object.rb

@@ -1,6 +1,3 @@
-#
-# Copyright (C) 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
@@ -79,6 +76,35 @@ module DeltaCloud
         }
       end
 
+      def add_authentication!(auth_type, values=[])
+        value = { :key => (values/'login/keyname').text.strip } if auth_type == 'key'
+        if auth_type == 'password'
+          value = {
+            :username => (values/'login/username').text.strip,
+            :username => (values/'login/password').text.strip
+          }
+        end
+        @objects << {
+          :type => :collection,
+          :method_name => 'authentication',
+          :values => value
+        }
+      end
+      
+
+      # This method define collection of text elements inside REST model
+      # XML syntax: <addresses>
+      #               <address>127.0.0.1</address>
+      #               <address>127.0.0.2</address>
+      #             </addresses>
+      def add_addresses!(collection_name, values=[])
+        @objects << {
+          :type => :collection,
+          :method_name => collection_name.sanitize,
+          :values => values.collect { |v| { :address => v.text.strip, :type => v[:type] }}
+        }
+      end
+
       # This method define collection of text elements inside REST model
       # XML syntax: <addresses>
       #               <address>127.0.0.1</address>
@@ -149,7 +175,7 @@ module DeltaCloud
         @actions = []
       end
 
-      # This trigger is called right after action. 
+      # This trigger is called right after action.
       # This method does nothing inside ActionObject
       # but it can be redifined and used in meta-programming
       def action_trigger(action)
@@ -314,14 +340,14 @@ module DeltaCloud
         DeltaCloud::API.class_eval("class #{class_name} < DeltaCloud::#{parent_class}; end")
         @defined_classes << class_name
       end
-      
+
       DeltaCloud::API.const_get(parent.classify).const_get(name.classify)
     end
 
     def self.guess_model_type(response)
       response = Nokogiri::XML(response.to_s)
-      return :action if ((response/'//actions').length == 1) and ((response/'//state').length == 0)
-      return :stateful if ((response/'//actions').length == 1) and ((response/'//state').length == 1)
+      return :action if ((response/'//actions').length >= 1) and ((response/'//state').length == 0)
+      return :stateful if ((response/'//actions').length >= 1) and ((response/'//state').length >= 1)
       return :base
     end
 

data/lib/client_bucket_methods.rb

@@ -1,8 +1,23 @@
+# 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 ClientBucketMethods
 
   def create_bucket(params)
     obj = nil
-    request(:post, "#{api_uri.to_s}/buckets", {:name => params['id'] }) do |response|
+    request(:post, "#{api_uri.to_s}/buckets", {:name => params['id'],:location=>params['bucket_location'] }) do |response|
       handle_backend_error(response) if response.code!=201
       obj = base_object(:bucket, response)
     end
@@ -51,4 +66,4 @@ module ClientBucketMethods
     end
   end
 
-end
+end

data/lib/deltacloud.rb

@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2009  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
@@ -213,7 +210,7 @@ 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_run_action!(item['id'], link) && next) if link[:rel] == 'run'
             obj.add_action_link!(item['id'], link)
           end && next
         end
@@ -225,7 +222,7 @@ module DeltaCloud
         end
 
         #deal with blob metadata
-        if(attribute.name == 'user_metadata')
+        if (attribute.name == 'user_metadata')
           meta = {}
           attribute.children.select {|x| x.name=="entry" }.each  do |element|
             value = element.content.gsub!(/(\n) +/,'')
@@ -234,6 +231,14 @@ module DeltaCloud
           obj.add_collection!(attribute.name, meta.inspect) && next
         end
 
+        if (['public_addresses', 'private_addresses'].include? attribute.name)
+          obj.add_addresses!(attribute.name, (attribute/'*')) && next
+        end
+
+        if ('authentication'.include? attribute.name)
+          obj.add_authentication!(attribute[:type], (attribute/'*')) && 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

data/lib/documentation.rb

@@ -1,6 +1,3 @@
-#
-# Copyright (C) 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

data/lib/hwp_properties.rb

@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2009  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

data/lib/instance_state.rb

@@ -1,5 +1,3 @@
-# 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

data/lib/plain_formatter.rb

@@ -1,5 +1,3 @@
-# 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
@@ -65,8 +63,8 @@ module DeltaCloud
             @obj.name ? @obj.name[0,15] : 'unknown',
             @obj.image.name ? @obj.image.name[0,15] : 'unknown',
             @obj.state ? @obj.state.to_s[0,10] : 'unknown',
-            @obj.public_addresses.join(',')[0,32],
-            @obj.private_addresses.join(',')[0,32]
+            @obj.public_addresses.collect { |a| a[:address] }.join(',')[0,32],
+            @obj.private_addresses.collect { |a| a[:address] }.join(',')[0,32]
           )
         end
       end
@@ -100,7 +98,7 @@ module DeltaCloud
           @obj.id,
           @obj.name,
           @obj.size ? @obj.size : "0",
-          @obj.blob_list ? @obj.blob_list : ""
+          @obj.instance_variables.include?("@blob_list") ? @obj.blob_list : ""
           )
         end
       end

data/lib/string.rb

@@ -1,6 +1,3 @@
-#
-# Copyright (C) 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

data/specs/buckets_spec.rb

@@ -0,0 +1,147 @@
+#
+# 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 "buckets" do
+
+  it_should_behave_like "all resources"
+
+  it "should allow retrieval of all buckets" do
+    [API_URL, API_URL_REDIRECT].each do |entry_point|
+      DeltaCloud.new( API_NAME, API_PASSWORD, entry_point ) do |client|
+        buckets = client.buckets
+        buckets.should_not be_empty
+        buckets.each do |bucket|
+          bucket.uri.should_not be_nil
+          bucket.uri.should be_a( String )
+          bucket.name.should_not be_nil
+          bucket.name.should be_a(String)
+        end
+      end
+    end
+  end
+
+  it "should allow retrieval of a named bucket" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      bucket = client.bucket("bucket1")
+      bucket.should_not be_nil
+      bucket.uri.should eql(API_URL + "/buckets/bucket1")
+      bucket.size.should eql(3.0)
+      bucket.name.should_not be_nil
+      bucket.name.should be_a(String)
+      blob_list = bucket.blob_list.split(", ")
+      blob_list.size.should eql(bucket.size.to_i)
+    end
+  end
+
+end
+
+describe "Operations on buckets" do
+
+  it "should allow creation of a new bucket" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      new_bucket = client.create_bucket({'id' => "my_new_bucket"})
+      new_bucket.should_not be_nil
+      new_bucket.uri.should eql(API_URL + "/buckets/my_new_bucket")
+      new_bucket.name.should_not be_nil
+      new_bucket.name.should be_a(String)
+      new_bucket.name.should eql("my_new_bucket")
+    end
+  end
+
+  it "should allow deletion of an existing bucket" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      new_bucket = client.bucket("my_new_bucket")
+      new_bucket.should_not be_nil
+      new_bucket.name.should eql("my_new_bucket")
+      lambda{
+              client.destroy_bucket({'id' => "my_new_bucket"})
+            }.should_not raise_error
+    end
+  end
+
+  it "should throw error if you delete a non existing bucket" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      lambda{
+              client.destroy_bucket({'id' => "i_dont_exist"})
+            }.should raise_error
+    end
+  end
+
+end
+
+describe "Blobs" do
+
+  it "should allow retrieval of a bucket's blobs" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      bucket = client.bucket("bucket1")
+      bucket.should_not be_nil
+      blob_list = bucket.blob_list.split(", ")
+      blob_list.size.should eql(bucket.size.to_i)
+      blob_list.each do |b_id|
+        blob = client.blob({"bucket" => bucket.name, :id => b_id})
+        blob.bucket.should_not be_nil
+        blob.bucket.should be_a(String)
+        blob.bucket.should eql(bucket.name)
+        blob.content_length.should_not be_nil
+        blob.content_length.should be_a(Float)
+        blob.content_length.should >= 0
+        blob_data = client.blob_data({"bucket" => bucket.name, :id => b_id})
+        blob_data.size.to_f.should == blob.content_length
+        blob.last_modified.should_not be_nil
+      end
+    end
+  end
+
+end
+
+describe "Operations on blobs" do
+
+  it "should successfully create a new blob" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      blob_data = File.new("./blob_data_file", "w+")
+
+      blob_data.write("this is some blob data \n")
+      blob_data.rewind
+      some_new_blob = client.create_blob({:id => "some_new_blob",
+                          'bucket' => "bucket1",
+                          'file_path' => blob_data.path})
+      some_new_blob.should_not be_nil
+      some_new_blob.content_length.should_not be_nil
+      some_new_blob.content_length.should eql(24.0)
+      File.delete(blob_data.path)
+    end
+  end
+
+  it "should allow deletion of an existing blob" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      lambda{
+              client.destroy_blob({:id=>"some_new_blob", 'bucket'=>"bucket1"})
+            }.should_not raise_error
+    end
+  end
+
+  it "should throw error if you delete a non existing blob" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      lambda{
+              client.destroy_blob({:id=>"no_such_blob", 'bucket'=>"bucket1"})
+            }.should raise_error
+    end
+  end
+end

data/specs/content_spec.rb

@@ -0,0 +1,155 @@
+#
+# 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'
+
+def client
+  RestClient::Resource.new(API_URL)
+end
+
+def headers(header)
+  encoded_credentials = ["#{API_NAME}:#{API_PASSWORD}"].pack("m0").gsub(/\n/,'')
+  { :authorization => "Basic " + encoded_credentials }.merge(header)
+end
+
+describe "return JSON" do
+
+  it 'should return JSON when using application/json, */*' do
+    header_hash = {
+      'Accept' => "application/json, */*"
+    }
+    client.get(header_hash) do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^application\/json/
+    end
+  end
+
+  it 'should return JSON when using just application/json' do
+    header_hash = {
+      'Accept' => "application/json"
+    }
+    client.get(header_hash) do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^application\/json/
+    end
+  end
+
+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|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^application\/xml/
+    end
+  end
+
+  it "raise 406 error on wrong accept" do
+    client['hardware_profiles'].get('Accept' => 'image/png;q=1') do |response, request, &block|
+      response.code.should == 406
+    end
+  end
+
+  it "wants HTML using format parameter and accept set to XML" do
+    client['?format=html'].get('Accept' => 'application/xml') do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^text\/html/
+    end
+  end
+
+#  FIXME: This return 406 for some reason on GIT sinatra
+#  it "wants a PNG image" do 
+#    client['instance_states'].get('Accept' => 'image/png') do |response, request, &block|
+#      response.code.should == 200
+#      response.headers[:content_type].should =~ /^image\/png/
+#    end
+#  end
+
+  it "doesn't have accept header" do
+    client.get('Accept' => '') do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^application\/xml/
+    end
+  end
+
+  it "can handle unknown formats" do
+    client.get('Accept' => 'format/unknown') do |response, request, &block|
+      response.code.should == 406
+    end
+  end
+
+  it "wants explicitly XML" do
+    client.get('Accept' => 'application/xml') do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^application\/xml/
+    end
+  end
+
+  it "Internet Explorer" do
+    header_hash = {
+      'Accept' => "image/gif, image/jpeg, image/pjpeg, image/pjpeg, application/x-shockwave-flash, application/x-ms-application, application/x-ms-xbap, application/vnd.ms-xpsdocument, application/xaml+xml, */*",
+      'User-agent' => "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)"
+    }
+    client.get(header_hash) do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^text\/html/
+    end
+  end
+
+  it "Mozilla Firefox" do
+    client.get('Accept' => "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8") do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^text\/html/
+    end
+  end
+
+  it "Chrome" do
+    header_hash = { 
+      'Accept' => "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
+      'User-agent' => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.790.0 Safari/535.1"
+    }
+    client.get(header_hash) do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^text\/html/
+    end
+  end
+
+  it "Safari" do
+    header_hash = { 
+      'Accept' => "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5",
+      'User-agent' => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; da-dk) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
+    }
+    client.get(header_hash) do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^text\/html/
+    end
+  end
+
+  it "Opera" do
+    header_hash = { 
+      'Accept' => "text/html, application/xml;q=0.9, application/xhtml+xml, image/png, image/jpeg, image/gif, image/x-xbitmap, */*;q=0.1",
+      'User-agent' => "Opera/9.80 (X11; Linux i686; U; ru) Presto/2.8.131 Version/11.11"
+    }
+    client.get(header_hash) do |response, request, &block|
+      response.code.should == 200
+      response.headers[:content_type].should =~ /^text\/html/
+    end
+  end
+
+end

data/specs/hardware_profiles_spec.rb

@@ -38,8 +38,8 @@ describe "hardware_profiles" do
         hardware_profiles.each do |hwp|
           hwp.uri.should_not be_nil
           hwp.uri.should be_a(String)
-          prop_check(hwp.architecture, String)  if hwp.architecture
-        end
+          prop_check(hwp.architecture, String) unless hwp.name.eql?("opaque")
+       end
       end
     end
   end

data/specs/initialization_spec.rb

@@ -35,6 +35,8 @@ describe "initializing the client" do
         client.entry_points[:instances].should         eql( "#{API_URL}/instances" )
         client.entry_points[:storage_volumes].should   eql( "#{API_URL}/storage_volumes" )
         client.entry_points[:storage_snapshots].should eql( "#{API_URL}/storage_snapshots" )
+        client.entry_points[:buckets].should           eql( "#{API_URL}/buckets")
+        client.entry_points[:keys].should              eql( "#{API_URL}/keys")
       end
     end
   end

data/specs/instances_spec.rb

@@ -34,7 +34,7 @@ describe "instances" do
           instance.owner_id.should_not be_nil
           instance.owner_id.should be_a( String )
           instance.image.should_not be_nil
-          instance.image.should be_a( DeltaCloud::API::Base::Image )
+          instance.image.to_s.should match(/DeltaCloud::API::.*::Image/)
           instance.hardware_profile.should_not be_nil
           instance.hardware_profile.should be_a( DeltaCloud::API::Base::HardwareProfile )
           instance.state.should_not be_nil
@@ -70,7 +70,9 @@ describe "instances" do
       instance.uri.should_not be_nil
       instance.uri.should be_a( String )
       instance.owner_id.should eql( "mockuser" )
-      instance.public_addresses.first.should eql( "img1.inst0.public.com" )
+      instance.public_addresses.first.class.should eql(Hash)
+      instance.public_addresses.first[:type].should eql('hostname')
+      instance.public_addresses.first[:address].should eql('img1.inst0.public.com')
       instance.image.should_not be_nil
       instance.image.uri.should eql( API_URL + "/images/img1" )
       instance.hardware_profile.should_not be_nil
@@ -185,9 +187,11 @@ describe "instances" do
       DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
         instance = client.instance( 'inst1' )
         instance.should_not be_nil
+        unless instance.state.eql?("RUNNING")
+          instance.start!
+        end
         instance.state.should eql( "RUNNING" )
-        instance.start!
-        instance.state.should eql( "RUNNING" )
+        lambda{instance.start!}.should raise_error
       end
     end
 

data/specs/keys_spec.rb

@@ -0,0 +1,97 @@
+#
+# 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'
+
+def check_key(the_key, key_name = "")
+  the_key.should_not be_nil
+  the_key.id.should be_a(String)
+  the_key.id.should eql(key_name)
+  the_key.actions.should_not be_nil
+  the_key.actions.size.should eql(1)
+  the_key.actions.first[0].should eql("destroy")
+  the_key.actions.first[1].should eql("#{API_URL}/keys/#{key_name}")
+  the_key.fingerprint.should_not be_nil
+  the_key.fingerprint.should be_a(String)
+  the_key.pem.should_not be_nil
+  the_key.pem.first.should be_a(String)
+end
+
+def create_key_if_necessary(client, key_name)
+  the_key = client.key(key_name)
+  unless the_key
+    client.create_key()
+  end
+end
+
+
+describe "keys" do
+
+  it_should_behave_like "all resources"
+
+  it "should allow retrieval of all keys" do
+    [API_URL, API_URL_REDIRECT].each do |entry_point|
+      DeltaCloud.new( API_NAME, API_PASSWORD, entry_point ) do |client|
+        lambda{
+              client.keys
+              }.should_not raise_error
+      end
+    end
+  end
+end
+
+describe "operations on keys" do
+
+  it "should allow successful creation of a new key" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      new_key = client.create_key({:name => "my_new_key"})
+      check_key(new_key, "my_new_key")
+    end
+  end
+
+  it "should allow retrieval of an existing named key" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      key_name = "my_new_key"
+      create_key_if_necessary(client, key_name)
+      the_key = client.key(key_name)
+      check_key(the_key, key_name)
+    end
+  end
+
+  it "should raise error if you create a key with the same name as an existing key" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      name = "my_new_key"
+      create_key_if_necessary(client, name)
+      lambda{
+              client.create_key({:name => name})
+            }.should raise_error
+    end
+  end
+
+  it "should allow successful destruction of an existing key" do
+    DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
+      name = "my_new_key"
+      create_key_if_necessary(client, name)
+      the_key = client.key(name)
+      lambda{
+              the_key.destroy!
+            }.should_not raise_error
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-client
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 +02:00
-default_executable: deltacloudc
+date: 2011-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -80,52 +79,53 @@ files:
 - Rakefile
 - lib/base_object.rb
 - lib/client_bucket_methods.rb
-- lib/deltacloud.rb
-- lib/documentation.rb
-- lib/hwp_properties.rb
 - lib/instance_state.rb
+- lib/deltacloud.rb
 - lib/plain_formatter.rb
+- lib/hwp_properties.rb
 - lib/string.rb
-- init.rb
+- lib/documentation.rb
 - bin/deltacloudc
-- LICENSE
-- NOTICE
-- DISCLAIMER
-- specs/data/images/img1.yml
-- specs/data/images/img2.yml
-- specs/data/images/img3.yml
+- specs/images_spec.rb
+- specs/initialization_spec.rb
+- specs/hardware_profiles_spec.rb
+- specs/instance_states_spec.rb
+- specs/instances_spec.rb
+- specs/data/storage_snapshots/snap3.yml
+- specs/data/storage_snapshots/snap1.yml
+- specs/data/storage_snapshots/snap2.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/images/img3.yml
+- specs/data/images/img2.yml
+- specs/data/images/img1.yml
 - specs/data/storage_volumes/vol3.yml
-- specs/fixtures/images/img1.yml
-- specs/fixtures/images/img2.yml
-- specs/fixtures/images/img3.yml
+- specs/data/storage_volumes/vol2.yml
+- specs/data/storage_volumes/vol1.yml
+- specs/keys_spec.rb
+- specs/content_spec.rb
+- specs/buckets_spec.rb
+- specs/fixtures/storage_snapshots/snap3.yml
+- specs/fixtures/storage_snapshots/snap1.yml
+- specs/fixtures/storage_snapshots/snap2.yml
 - specs/fixtures/instances/inst0.yml
 - specs/fixtures/instances/inst1.yml
 - specs/fixtures/instances/inst2.yml
-- 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/images/img3.yml
+- specs/fixtures/images/img2.yml
+- specs/fixtures/images/img1.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/fixtures/storage_volumes/vol2.yml
+- specs/fixtures/storage_volumes/vol1.yml
 - specs/shared/resources.rb
-- specs/spec_helper.rb
-- specs/storage_snapshot_spec.rb
 - specs/storage_volume_spec.rb
-has_rdoc: true
+- specs/realms_spec.rb
+- specs/storage_snapshot_spec.rb
+- specs/spec_helper.rb
+- LICENSE
+- NOTICE
+- DISCLAIMER
 homepage: http://www.deltacloud.org
 licenses: []
 
@@ -155,42 +155,45 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST Client
 test_files: 
-- specs/data/images/img1.yml
-- specs/data/images/img2.yml
-- specs/data/images/img3.yml
+- specs/images_spec.rb
+- specs/initialization_spec.rb
+- specs/hardware_profiles_spec.rb
+- specs/instance_states_spec.rb
+- specs/instances_spec.rb
+- specs/data/storage_snapshots/snap3.yml
+- specs/data/storage_snapshots/snap1.yml
+- specs/data/storage_snapshots/snap2.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/images/img3.yml
+- specs/data/images/img2.yml
+- specs/data/images/img1.yml
 - specs/data/storage_volumes/vol3.yml
-- specs/fixtures/images/img1.yml
-- specs/fixtures/images/img2.yml
-- specs/fixtures/images/img3.yml
+- specs/data/storage_volumes/vol2.yml
+- specs/data/storage_volumes/vol1.yml
+- specs/keys_spec.rb
+- specs/content_spec.rb
+- specs/buckets_spec.rb
+- specs/fixtures/storage_snapshots/snap3.yml
+- specs/fixtures/storage_snapshots/snap1.yml
+- specs/fixtures/storage_snapshots/snap2.yml
 - specs/fixtures/instances/inst0.yml
 - specs/fixtures/instances/inst1.yml
 - specs/fixtures/instances/inst2.yml
-- 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/images/img3.yml
+- specs/fixtures/images/img2.yml
+- specs/fixtures/images/img1.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/fixtures/storage_volumes/vol2.yml
+- specs/fixtures/storage_volumes/vol1.yml
 - specs/shared/resources.rb
-- specs/spec_helper.rb
-- specs/storage_snapshot_spec.rb
 - specs/storage_volume_spec.rb
+- specs/realms_spec.rb
+- specs/storage_snapshot_spec.rb
+- specs/spec_helper.rb

data/init.rb

@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009  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 'deltacloud'