bbrowning-deltacloud-client 0.0.6.1 → 0.0.9.4

data/bin/deltacloudc

@@ -20,8 +20,8 @@
 require 'rubygems'
 require 'optparse'
 require 'uri'
-require 'lib/deltacloud'
-require 'lib/plain_formatter'
+require 'deltacloud'
+require 'plain_formatter'
 
 include DeltaCloud::PlainFormatter
 
@@ -80,8 +80,7 @@ collections.delete(:instance_states)
 # with API documentation
 if options[:list] and options[:collection].nil?
   collections.each do |c|
-    doc = client.fetch_documentation(c.to_s)
-    puts sprintf("%-22s: %s", c.to_s[0, 22], doc[:description])
+    puts sprintf("%-22s", c.to_s[0, 22])
   end
   exit(0)
 end
@@ -89,9 +88,9 @@ 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]
-  doc = client.fetch_documentation(options[:collection])
-  doc[:operations].each do |c|
-    puts sprintf("%-20s: %s", c[:name][0, 20], c[:description])
+  doc = client.documentation(options[:collection])
+  doc.operations.each do |c|
+    puts sprintf("%-20s: %s", c.operation, c.description)
   end
   exit(0)
 end

data/lib/deltacloud.rb

@@ -16,7 +16,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'hpricot'
+require 'nokogiri'
 require 'rest_client'
 require 'base64'
 require 'logger'
@@ -116,7 +116,7 @@ module DeltaCloud
 
     def base_object_collection(c, model, response)
       collection = []
-      Hpricot::XML(response).search("#{model}/#{model.to_s.singularize}").each do |item|
+      Nokogiri::XML(response).xpath("#{model}/#{model.to_s.singularize}").each do |item|
         c.instance_eval do
           attr_accessor :id
           attr_accessor :uri
@@ -129,7 +129,7 @@ module DeltaCloud
     # Add default attributes [id and href] to class
     def base_object(c, model, response)
       obj = nil
-      Hpricot::XML(response).search("#{model.to_s.singularize}").each do |item|
+      Nokogiri::XML(response).xpath("#{model.to_s.singularize}").each do |item|
         c.instance_eval do
           attr_accessor :id
           attr_accessor :uri
@@ -155,7 +155,7 @@ module DeltaCloud
       logger << "[DC] Creating class #{obj.class.name}\n"
       obj.instance_eval do
         # Declare methods for all attributes in object
-        item.search('./*').each do |attribute|
+        item.xpath('./*').each do |attribute|
           # If attribute is a link to another object then
           # create a method which request this object from API
           if api.entry_points.keys.include?(:"#{attribute.name}s")
@@ -174,7 +174,7 @@ module DeltaCloud
                 # to dynamicaly create .stop!, .start! methods
                 when "actions":
                   actions = []
-                  attribute.search('link').each do |link|
+                  attribute.xpath('link').each do |link|
                     actions << [link['rel'], link[:href]]
                     define_method :"#{link['rel'].sanitize}!" do
                       client.request(:"#{link['method']}", link['href'], {}, {})
@@ -191,18 +191,19 @@ module DeltaCloud
                   end
                 # Property attribute is handled differently
                 when "property":
-                  define_method :"#{attribute['name'].sanitize}" do
-                    if attribute['value'] =~ /^(\d+)$/
-                      DeltaCloud::HWP::FloatProperty.new(attribute, attribute['name'])
-                    else
-                      DeltaCloud::HWP::Property.new(attribute, attribute['name'])
-                    end
+                  attr_accessor :"#{attribute['name'].sanitize}"
+                  if attribute['value'] =~ /^(\d+)$/
+                    obj.send(:"#{attribute['name'].sanitize}=",
+                      DeltaCloud::HWP::FloatProperty.new(attribute, attribute['name']))
+                  else
+                    obj.send(:"#{attribute['name'].sanitize}=",
+                      DeltaCloud::HWP::Property.new(attribute, attribute['name']))
                   end
                 # Public and private addresses are returned as Array
                 when "public_addresses", "private_addresses":
                   attr_accessor :"#{attribute.name.sanitize}"
                   obj.send(:"#{attribute.name.sanitize}=",
-                    attribute.search('address').collect { |address| address.text })
+                    attribute.xpath('address').collect { |address| address.text })
                 # Value for other attributes are just returned using
                 # method with same name as attribute (eg. .owner_id, .state)
                 else
@@ -221,16 +222,16 @@ module DeltaCloud
     def discover_entry_points
       return if discovered?
       request(:get, @api_uri.to_s) do |response|
-        api_xml = Hpricot::XML(response)
-        @driver_name = api_xml.search('/api').first['driver']
-        @api_version = api_xml.search('/api').first['version']
+        api_xml = Nokogiri::XML(response)
+        @driver_name = api_xml.xpath('/api').first['driver']
+        @api_version = api_xml.xpath('/api').first['version']
         logger << "[API] Version #{@api_version}\n"
         logger << "[API] Driver #{@driver_name}\n"
-        api_xml.search("api > link").each do |entry_point|
+        api_xml.css("api > link").each do |entry_point|
           rel, href = entry_point['rel'].to_sym, entry_point['href']
           @entry_points.store(rel, href)
           logger << "[API] Entry point '#{rel}' added\n"
-          entry_point.search("feature").each do |feature|
+          entry_point.css("feature").each do |feature|
             @features[rel] ||= []
             @features[rel] << feature['name'].to_sym
             logger << "[API] Feature #{feature['name']} added to #{rel}\n"
@@ -239,6 +240,17 @@ module DeltaCloud
       end
       declare_entry_points_methods(@entry_points)
     end
+    
+    def create_instance_credential(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?
+      end
+      return instance_credential
+    end
 
     # Create a new instance, using image +image_id+. Possible optiosn are
     #
@@ -254,11 +266,13 @@ module DeltaCloud
       name = opts[:name]
       realm_id = opts[:realm]
       user_data = opts[:user_data]
+      key_name = opts[:key_name]
 
       params = opts.dup
       ( 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
 
       if opts[:hardware_profile].is_a?(String)
         params[:hwp_id] = opts[:hardware_profile]
@@ -315,16 +329,16 @@ module DeltaCloud
 
     # Check if specified collection have wanted feature
     def feature?(collection, name)
-      @feature.has_key?(collection) && @feature[collection].include?(name)
+      @features.has_key?(collection) && @features[collection].include?(name)
     end
 
     # List available instance states and transitions between them
     def instance_states
       states = []
       request(:get, entry_points[:instance_states]) do |response|
-        Hpricot::XML(response).search('states/state').each do |state_el|
+        Nokogiri::XML(response).xpath('states/state').each do |state_el|
           state = DeltaCloud::InstanceState::State.new(state_el['name'])
-          state_el.search('transition').each do |transition_el|
+          state_el.xpath('transition').each do |transition_el|
             state.transitions << DeltaCloud::InstanceState::Transition.new(
               transition_el['to'],
               transition_el['action']
@@ -349,9 +363,10 @@ module DeltaCloud
     def documentation(collection, operation=nil)
       data = {}
       request(:get, "/docs/#{collection}") do |body|
-        document = Hpricot::XML(body)
+        document = Nokogiri::XML(body)
         if operation
-          data[:description] = document.search('/docs/collection/operations/operation[@name = "'+operation+'"]/description').first
+          data[:operation] = operation
+          data[:description] = document.xpath('/docs/collection/operations/operation[@name = "'+operation+'"]/description').first.text.strip
           return false unless data[:description]
           data[:params] = []
           (document/"/docs/collection/operations/operation[@name='#{operation}']/parameter").each do |param|
@@ -363,9 +378,11 @@ module DeltaCloud
           end
         else
           data[:description] = (document/'/docs/collection/description').text
+          data[:collection] = collection
+          data[:operations] = (document/"/docs/collection/operations/operation").collect{ |o| o['name'] }
         end
       end
-      return Documentation.new(data)
+      return Documentation.new(self, data)
     end
 
     private
@@ -384,15 +401,23 @@ module DeltaCloud
   end
 
   class Documentation
-    attr_reader :description
-    attr_reader :params
 
-    def initialize(opts={})
-      @description = opts[:description]
+    attr_reader :api, :description, :params, :collection_operations
+    attr_reader :collection, :operation
+
+    def initialize(api, opts={})
+      @description, @api = opts[:description], api
       @params = parse_parameters(opts[:params]) if opts[:params]
+      @collection_operations = opts[:operations] if opts[:operations]
+      @collection = opts[:collection]
+      @operation = opts[:operation]
       self
     end
 
+    def operations
+      @collection_operations.collect { |o| api.documentation(@collection, o) }
+    end
+
     class OperationParameter
       attr_reader :name
       attr_reader :type
@@ -466,12 +491,12 @@ module DeltaCloud
             self.class.instance_eval do
               attr_reader :range
             end
-            @range = { :from => xml.search('range').first['first'], :to => xml.search('range').first['last'] }
+            @range = { :from => xml.xpath('range').first['first'], :to => xml.xpath('range').first['last'] }
           when 'enum':
             self.class.instance_eval do
               attr_reader :options
             end
-            @options = xml.search('enum/entry').collect { |e| e['value'] }
+            @options = xml.xpath('enum/entry').collect { |e| e['value'] }
         end
       end
 

data/lib/documentation.rb

@@ -12,7 +12,8 @@ end
 @dc.entry_points.keys.each do |ep|
   @dc.send(ep)
 end
-class_list = @dc.classes
+
+class_list = DeltaCloud::classes.collect { |c| DeltaCloud::module_eval("::DeltaCloud::API::#{c}")}
 
 def read_method_description(c, method)
   if method =~ /es$/
@@ -57,13 +58,13 @@ class_list.each do |c|
   @dc.entry_points.keys.each do |ep|
     out << "# Return #{ep.to_s.classify} object with given id\n"
     out << "# "
-    out << "# *#{@dc.documentation(ep.to_s).description}*"
+    out << "# #{@dc.documentation(ep.to_s).description.split("\n").join("\n# ")}"
     out << "# @return [#{ep.to_s.classify}]"
     out << "def #{ep.to_s.gsub(/s$/, '')}"
     out << "end"
     out << "# Return collection of #{ep.to_s.classify} objects"
     out << "# "
-    out << "# *#{@dc.documentation(ep.to_s).description}*"
+    out << "# #{@dc.documentation(ep.to_s).description.split("\n").join("\n# ")}"
     @dc.documentation(ep.to_s, 'index').params.each do |p|
       out << p.to_comment
     end

data/lib/plain_formatter.rb

@@ -77,7 +77,7 @@ module DeltaCloud
     end
 
     def format(obj)
-      object_name = obj.class.name.classify.gsub(/^DeltaCloud::/, '')
+      object_name = obj.class.name.classify.gsub(/^DeltaCloud::API::/, '')
       format_class = DeltaCloud::PlainFormatter::FormatObject.const_get(object_name)
       format_class.new(obj).format
     end

data/specs/hardware_profiles_spec.rb

@@ -37,9 +37,7 @@ 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)
-        prop_check(hwp.storage, Float)
-        prop_check(hwp.memory, Float)
+        prop_check(hwp.architecture, String)  if hwp.architecture
       end
     end
   end
@@ -61,6 +59,14 @@ describe "hardware_profiles" do
     end
   end
 
+  it "should allow fetching different hardware_profiles" do
+    client = DeltaCloud.new( API_NAME, API_PASSWORD, API_URL )
+    hwp1 = client.hardware_profile( 'm1-small' )
+    hwp2 = client.hardware_profile( 'm1-xlarge' )
+    hwp1.storage.value.should_not eql(hwp2.storage.value)
+    hwp1.memory.value.should_not eql(hwp2.memory.value)
+  end
+
   it "should allow fetching a hardware_profile by URI" do
     DeltaCloud.new( API_NAME, API_PASSWORD, API_URL ) do |client|
       hwp = client.fetch_hardware_profile( API_URL + '/hardware_profiles/m1-small' )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bbrowning-deltacloud-client
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 99
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  - 1
-  version: 0.0.6.1
+  - 9
+  - 4
+  version: 0.0.9.4
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -04:00
+date: 2010-08-23 00:00:00 -04:00
 default_executable: deltacloudc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,19 +36,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 62196439
         segments: 
+        - 1
+        - 5
         - 0
-        - 8
+        - beta
         - 2
-        version: 0.8.2
+        version: 1.5.0.beta.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -77,34 +79,34 @@ extra_rdoc_files:
 - COPYING
 files: 
 - Rakefile
+- lib/deltacloud.rb
 - lib/documentation.rb
 - lib/plain_formatter.rb
-- lib/deltacloud.rb
 - init.rb
 - bin/deltacloudc
 - COPYING
-- specs/shared/resources.rb
-- specs/realms_spec.rb
-- specs/images_spec.rb
-- specs/storage_snapshot_spec.rb
-- specs/spec_helper.rb
-- specs/instance_states_spec.rb
-- specs/hardware_profiles_spec.rb
-- specs/storage_volume_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/instances/inst2.yml
-- specs/fixtures/instances/inst0.yml
-- 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/fixtures/images/img2.yml
-- specs/fixtures/images/img1.yml
-- specs/fixtures/images/img3.yml
-- specs/instances_spec.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/instances_spec.rb
+- specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/spec_helper.rb
+- specs/storage_snapshot_spec.rb
+- specs/storage_volume_spec.rb
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []
@@ -140,25 +142,25 @@ signing_key:
 specification_version: 3
 summary: Deltacloud REST Client
 test_files: 
-- specs/shared/resources.rb
-- specs/realms_spec.rb
-- specs/images_spec.rb
-- specs/storage_snapshot_spec.rb
-- specs/spec_helper.rb
-- specs/instance_states_spec.rb
-- specs/hardware_profiles_spec.rb
-- specs/storage_volume_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/instances/inst2.yml
-- specs/fixtures/instances/inst0.yml
-- 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/fixtures/images/img2.yml
-- specs/fixtures/images/img1.yml
-- specs/fixtures/images/img3.yml
-- specs/instances_spec.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/instances_spec.rb
+- specs/realms_spec.rb
+- specs/shared/resources.rb
+- specs/spec_helper.rb
+- specs/storage_snapshot_spec.rb
+- specs/storage_volume_spec.rb