deltacloud-client 0.1.0 → 0.1.1

data/Rakefile

@@ -25,15 +25,9 @@ task 'documentation' do
   load 'lib/documentation.rb'
 end
 
-@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
+spec = Gem::Specification.load('deltacloud-client.gemspec')
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_tar = true
 end
 
 if Gem.available?('rspec')

data/bin/deltacloudc

@@ -124,6 +124,7 @@ 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)
   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]))
     exit(0)
   end

data/lib/base_object.rb

@@ -172,7 +172,7 @@ module DeltaCloud
           base_method_handler(m, args)
         rescue NoHandlerForMethod
           case m[:type]
-            when :action_link then do_action(m)
+            when :action_link then do_action(m, args)
             else raise NoHandlerForMethod
           end
         end
@@ -180,14 +180,19 @@ module DeltaCloud
 
       private
 
-      def do_action(m)
-        @client.request(:"#{m[:method]}", m[:href], {}, {})
+      def do_action(m, args)
+        args = args.first || {}
+        method = m[:method].to_sym
+        @client.request(method,
+                        m[:href],
+                        method == :get ? args : {},
+                        method == :get ? {} : args)
         action_trigger(m[:rel])
       end
 
     end
 
-    class StateFullObject < ActionObject
+    class StatefulObject < ActionObject
       attr_reader :state
 
       def initialize(opts={}, &block)
@@ -258,25 +263,28 @@ module DeltaCloud
     end
 
     def self.add_class(name, parent=:base)
-      parent_class = case parent
-        when :base then 'BaseObject'
-        when :action then 'ActionObject'
-        when :state then 'StateFullObject'
-      end
+      parent = parent.to_s
+      parent_class = "#{parent.classify}Object"
       @defined_classes ||= []
-      if @defined_classes.include?(name)
-        DeltaCloud::API.class_eval("#{name.classify}")
-      else
-        DeltaCloud::API.class_eval("class #{name.classify} < DeltaCloud::#{parent_class}; end")
-        DeltaCloud::API.const_get("#{name.classify}")
+      class_name = "#{parent.classify}::#{name.classify}"
+      unless @defined_classes.include?(class_name)
+        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 :state if ((response/'//actions').length == 1) and ((response/'//state').length == 1)
+      return :stateful if ((response/'//actions').length == 1) and ((response/'//state').length == 1)
       return :base
     end
 
+    class API
+      class Action; end
+      class Base; end
+      class Stateful; end
+    end
 end

data/lib/deltacloud.rb

@@ -34,8 +34,9 @@ module DeltaCloud
   # @param [String, password] API password
   # @param [String, user_name] API URL (eg. http://localhost:3001/api)
   # @return [DeltaCloud::API]
-  def self.new(user_name, password, api_url, &block)
-    API.new(user_name, password, api_url, &block)
+  def self.new(user_name, password, api_url, opts={}, &block)
+    opts ||= {}
+    API.new(user_name, password, api_url, opts, &block)
   end
 
   # Check given credentials if their are valid against
@@ -62,11 +63,13 @@ module DeltaCloud
   end
 
   class API
-    attr_reader   :api_uri, :driver_name, :api_version, :features, :entry_points
+    attr_reader :api_uri, :driver_name, :api_version, :features, :entry_points
+    attr_reader :api_driver, :api_provider
 
     def initialize(user_name, password, api_url, opts={}, &block)
       opts[:version] = true
-      @username, @password = user_name, password
+      @api_driver, @api_provider = opts[:driver], opts[:provider]
+      @username, @password = opts[:username] || user_name, opts[:password] || password
       @api_uri = URI.parse(api_url)
       @features, @entry_points = {}, {}
       @verbose = opts[:verbose] || false
@@ -90,7 +93,7 @@ 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|
 
@@ -99,13 +102,13 @@ module DeltaCloud
               base_object_collection(model, response)
             end
           end
-          
+
           define_method :"#{model.to_s.singularize}" do |*args|
             request(:get, "#{entry_points[model]}/#{args[0]}") do |response|
               base_object(model, response)
             end
           end
-          
+
           define_method :"fetch_#{model.to_s.singularize}" do |url|
             id = url.grep(/\/#{model}\/(.*)$/)
             self.send(model.to_s.singularize.to_sym, $1)
@@ -129,7 +132,7 @@ module DeltaCloud
 
     # Convert XML response to defined Ruby Class
     def xml_to_class(base_object, item)
-      
+
       return nil unless item
 
       params = {
@@ -166,11 +169,17 @@ module DeltaCloud
           end && next
         end
 
+        if attribute.name == 'mount'
+          obj.add_link!("instance", (attribute/"./instance/@id").first)
+          obj.add_text!("device", (attribute/"./device/@name").first.value)
+          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
-        
+
         # Anything else is treaten as text object
         obj.add_text!(attribute.name, attribute.text.convert)
       end
@@ -185,15 +194,15 @@ module DeltaCloud
         api_xml = Nokogiri::XML(response)
         @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']
           @entry_points.store(rel, href)
-          
+
           entry_point.css("feature").each do |feature|
             @features[rel] ||= []
             @features[rel] << feature['name'].to_sym
-            
+
           end
         end
       end
@@ -235,6 +244,25 @@ module DeltaCloud
       raise NoMethodError
     end
 
+    def use_driver(driver, opts={})
+      if opts[:driver]
+        @api_driver = driver 
+        @driver_name = driver
+        discover_entry_points
+      end
+      @username = opts[:username] if opts[:username]
+      @password = opts[:password] if opts[:password]
+      @api_provider = opts[:provider] if opts[:provider]
+      return self
+    end
+
+    def extended_headers
+      headers = {}
+      headers["X-Deltacloud-Driver"] = @api_driver.to_s if @api_driver
+      headers["X-Deltacloud-Provider"] = @api_provider.to_s if @api_provider
+      headers
+    end
+
     # Basic request method
     #
     def request(*args, &block)
@@ -247,9 +275,9 @@ module DeltaCloud
       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) do |response, request, block|
+        RestClient.send(:post, conf[:path], 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?
@@ -258,7 +286,7 @@ module DeltaCloud
           end
         end
       else
-        RestClient.send(conf[:method], conf[:path], default_headers) do |response, request, block|
+        RestClient.send(conf[:method], conf[:path], 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|

data/specs/instances_spec.rb

@@ -34,9 +34,9 @@ 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::Image )
+          instance.image.should be_a( DeltaCloud::API::Base::Image )
           instance.hardware_profile.should_not be_nil
-          instance.hardware_profile.should be_a( DeltaCloud::API::HardwareProfile )
+          instance.hardware_profile.should be_a( DeltaCloud::API::Base::HardwareProfile )
           instance.state.should_not be_nil
           instance.state.should be_a( String )
           instance.public_addresses.should_not be_nil

data/specs/storage_volume_spec.rb

@@ -44,7 +44,6 @@ describe "storage volumes" do
       storage_volume = client.storage_volume( 'vol3' )
       storage_volume.id.should eql( 'vol3' )
       storage_volume.uri.should eql( API_URL + '/storage_volumes/vol3' )
-      storage_volume.state.should eql( 'IN-USE' )
       storage_volume.capacity.should eql( 1.0 )
       storage_volume.device.should eql( '/dev/sda1' )
       storage_volume.instance.should_not be_nil
@@ -61,7 +60,6 @@ describe "storage volumes" do
       storage_volume.should_not be_nil
       storage_volume.id.should eql( 'vol3' )
       storage_volume.uri.should eql( API_URL + '/storage_volumes/vol3' )
-      storage_volume.state.should eql( 'IN-USE' )
       storage_volume.capacity.should eql( 1.0 )
       storage_volume.device.should eql( '/dev/sda1' )
       storage_volume.instance.should_not be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-12-09 00:00:00 +01:00
 default_executable: deltacloudc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 1
-        - 4
-        - 2
-        version: 1.4.2
+        - 6
+        - 1
+        version: 1.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 1
         segments: 
         - 1
         - 4
-        - 1
-        version: 1.4.1
+        - 3
+        version: 1.4.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -81,8 +81,8 @@ files:
 - lib/hwp_properties.rb
 - lib/instance_state.rb
 - lib/string.rb
-- lib/deltacloud.rb
 - lib/base_object.rb
+- lib/deltacloud.rb
 - init.rb
 - bin/deltacloudc
 - COPYING
@@ -103,9 +103,11 @@ files:
 - specs/initialization_spec.rb
 - specs/instance_states_spec.rb
 - specs/realms_spec.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
@@ -118,8 +120,6 @@ files:
 - specs/data/instances/inst1.yml
 - specs/data/instances/inst2.yml
 - specs/data/instances/inst0.yml
-- specs/hardware_profiles_spec.rb
-- specs/instances_spec.rb
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []
@@ -172,9 +172,11 @@ test_files:
 - specs/initialization_spec.rb
 - specs/instance_states_spec.rb
 - specs/realms_spec.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
@@ -187,5 +189,3 @@ test_files:
 - specs/data/instances/inst1.yml
 - specs/data/instances/inst2.yml
 - specs/data/instances/inst0.yml
-- specs/hardware_profiles_spec.rb
-- specs/instances_spec.rb