bbrowning-deltacloud-client 0.0.9.4 → 0.0.9.7

data/Rakefile

@@ -25,8 +25,15 @@ task 'documentation' do
   load 'lib/documentation.rb'
 end
 
-Rake::GemPackageTask.new(@spec) do |pkg|
-  pkg.need_tar = true
+@specs = ['ruby', 'java'].inject({}) do |hash, spec_platform|
+  $platform = spec_platform
+  hash.update(spec_platform => Gem::Specification.load('deltacloud-client.gemspec'))
+end
+
+@specs.values.each do |spec|
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_tar = true
+  end
 end
 
 if Gem.available?('rspec')
@@ -47,3 +54,8 @@ desc "Clean Fixtures"
 task 'fixtures:clean' do
   FileUtils.rm_rf( File.dirname( __FILE__ ) + '/specs/data' )
 end
+
+begin
+  require 'ci/reporter/rake/rspec'
+rescue LoadError
+end

data/lib/deltacloud.rb

@@ -33,6 +33,22 @@ module DeltaCloud
     API.new(user_name, password, api_url, &block)
   end
 
+  # Check given credentials if their are valid against
+  # backend cloud provider
+  #
+  # @param [String, user_name] API user name
+  # @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)
+    result = false
+    api.request(:get, '', :force_auth => '1') do |response|
+      result = true if response.code.eql?(200)
+    end
+    return result
+  end
+
   # Return a API driver for specified URL
   #
   # @param [String, url] API URL (eg. http://localhost:3001/api)
@@ -178,7 +194,12 @@ module DeltaCloud
                     actions << [link['rel'], link[:href]]
                     define_method :"#{link['rel'].sanitize}!" do
                       client.request(:"#{link['method']}", link['href'], {}, {})
-                      client.send(:"#{item.name}", item['id'])
+                      @current_state = client.send(:"#{item.name}", item['id']).state
+                      obj.instance_eval do |o|
+                        def state
+                          @current_state
+                        end
+                      end
                     end
                   end
                   define_method :actions do
@@ -240,16 +261,16 @@ module DeltaCloud
       end
       declare_entry_points_methods(@entry_points)
     end
-    
-    def create_instance_credential(opts={}, &block)
+
+    def create_key(opts={}, &block)
       params = { :name => opts[:name] }
-      instance_credential = nil
-      request(:post, entry_points[:instance_credentials], {}, params) do |response|
-        c = DeltaCloud.define_class("InstanceCredential")
-        instance_credential = base_object(c, :instance_credential, response)
-        yield instance_credential if block_given?
+      key = nil
+      request(:post, entry_points[:keys], {}, params) do |response|
+        c = DeltaCloud.define_class("Key")
+        key = base_object(c, :key, response)
+        yield key if block_given?
       end
-      return instance_credential
+      return key
     end
 
     # Create a new instance, using image +image_id+. Possible optiosn are
@@ -267,17 +288,18 @@ module DeltaCloud
       realm_id = opts[:realm]
       user_data = opts[:user_data]
       key_name = opts[:key_name]
+      security_group = opts[:security_group]
 
-      params = opts.dup
+      params = {}
       ( params[:realm_id] = realm_id ) if realm_id
       ( params[:name] = name ) if name
       ( params[:user_data] = user_data ) if user_data
-      ( params[:keyname] = user_data ) if key_name
+      ( params[:keyname] = key_name ) if key_name
+      ( params[:security_group] = security_group) if security_group
 
       if opts[:hardware_profile].is_a?(String)
         params[:hwp_id] = opts[:hardware_profile]
       elsif opts[:hardware_profile].is_a?(Hash)
-        params.delete(:hardware_profile)
         opts[:hardware_profile].each do |k,v|
           params[:"hwp_#{k}"] = v
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bbrowning-deltacloud-client
 version: !ruby/object:Gem::Version 
-  hash: 99
+  hash: 101
   prerelease: false
   segments: 
   - 0
   - 0
   - 9
-  - 4
-  version: 0.0.9.4
+  - 7
+  version: 0.0.9.7
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2010-10-04 00:00:00 -04:00
 default_executable: deltacloudc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,14 +43,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196439
+        hash: 5
         segments: 
         - 1
-        - 5
-        - 0
-        - beta
-        - 2
-        version: 1.5.0.beta.2
+        - 4
+        - 1
+        version: 1.4.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -84,7 +82,6 @@ files:
 - lib/plain_formatter.rb
 - init.rb
 - bin/deltacloudc
-- COPYING
 - specs/fixtures/images/img1.yml
 - specs/fixtures/images/img2.yml
 - specs/fixtures/images/img3.yml
@@ -107,6 +104,7 @@ files:
 - specs/spec_helper.rb
 - specs/storage_snapshot_spec.rb
 - specs/storage_volume_spec.rb
+- COPYING
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []