ovirt 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8e5086cc3efac6612e4e1631b5af6d14c6c5280
-  data.tar.gz: 25b06d7e055266368c2a3bf5ce9348a464459a9a
+  metadata.gz: 330b709a4d48c804372bb18010dc08b36c17f09e
+  data.tar.gz: ade6e0ffc14e1b355b8310fa82b812b96a5d6006
 SHA512:
-  metadata.gz: d0fd8d69ed5af1e4392a023307b4165baea65a35c009d6da188f01e072d1caf5c2e06d2cc8d9683b0879d7fc204a233e334171f999812a3eac047b9c1f8e1ed7
-  data.tar.gz: daad3060acc9154fb9271c9e24ca2e3202ba5b82d7075cc21809a9a0c45312050fabb95dbcd85ea775dc3c19e1a85ac195c384f9a2f593af214d55b13dbf20a2
+  metadata.gz: 2b172bcb7fbdf20875b56ac693a3acd65b83c2e1d0f8c9fdfe4bd5bcbaaacb87746890270f1d06e8b0dc2861c3fc7dfa4582e415e3872a488e3fd0ea3cf5c1c0
+  data.tar.gz: 6b4adbd7bad28b51b166bab493b4fa71c6a0b3821eef90f6eee5b741153d6c4b2e1f97275ea9dc68ef606720d850802439deb42c865a202bfdf9f65a60a8efbd

data/.rspec

@@ -1,3 +1,2 @@
 --color
---warnings
 --require spec_helper

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/ovirt.svg)](http://badge.fury.io/rb/ovirt)
 [![Build Status](https://travis-ci.org/ManageIQ/ovirt.svg)](https://travis-ci.org/ManageIQ/ovirt)
 [![Code Climate](https://codeclimate.com/github/ManageIQ/ovirt.svg)](https://codeclimate.com/github/ManageIQ/ovirt)
-[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/ovirt.svg)](https://coveralls.io/r/ManageIQ/ovirt)
+[![Coverage Status](https://coveralls.io/repos/ManageIQ/ovirt/badge.svg)](https://coveralls.io/github/ManageIQ/ovirt)
 [![Dependency Status](https://gemnasium.com/ManageIQ/ovirt.svg)](https://gemnasium.com/ManageIQ/ovirt)
 
 Ovirt provides a simple Object Oriented interface to the REST API of oVirt and RHEV-M servers.

data/lib/ovirt/api.rb

@@ -2,15 +2,15 @@ module Ovirt
   class Api < Base
     def self.parse_node_extended(node, hash)
       parse_first_node(node, :product_info, hash,
-                       :node         => [:name, :vendor])
+                       :node => [:name, :vendor])
 
       parse_first_node_with_hash(node, 'product_info/version', hash[:product_info][:version] = {},
-                       :attribute => [:major, :minor, :build, :revision])
+                                 :attribute => [:major, :minor, :build, :revision])
 
       hash[:summary] = {}
       [:vms, :hosts, :users, :storage_domains].each do |type|
         parse_first_node_with_hash(node, "summary/#{type}", hash[:summary][type] = {},
-                         :node_to_i => [:total, :active])
+                                   :node_to_i => [:total, :active])
       end
 
       hash[:special_objects] = {}
@@ -18,7 +18,6 @@ module Ovirt
         hash[:special_objects][link['rel'].to_sym] = link['href']
       end
 
-
       # There should not be any actions defined on the api
       hash.delete(:actions) if hash[:actions].empty?
     end

data/lib/ovirt/base.rb

@@ -1,7 +1,10 @@
 module Ovirt
   class Base
+    extend Logging
+    include Logging
+
     def self.create_from_xml(service, xml)
-      self.new(service, parse_xml(xml))
+      new(service, parse_xml(xml))
     end
 
     def self.xml_to_relationships(xml)
@@ -15,7 +18,7 @@ module Ovirt
     end
 
     def self.xml_to_actions(xml)
-      node = xml_to_nokogiri(xml)
+      node    = xml_to_nokogiri(xml)
       actions = {}
       node.xpath('actions/link').each do |link|
         actions[link['rel'].to_sym] = link['href']
@@ -36,29 +39,29 @@ module Ovirt
       raise "Cannot parse boolean for value: <#{what.inspect}>"
     end
 
-    def self.parse_first_text(node, hash, key, modifier=nil)
+    def self.parse_first_text(node, hash, key, modifier = nil)
       text_node = node.xpath(key.to_s).first
-      value = text_node.text unless text_node.nil?
-      self.set_value(value, hash, key, modifier)
+      value     = text_node.text unless text_node.nil?
+      set_value(value, hash, key, modifier)
     end
 
-    def self.parse_attribute(node, hash, key, modifier=nil)
+    def self.parse_attribute(node, hash, key, modifier = nil)
       value = node[key.to_s]
-      self.set_value(value, hash, key, modifier)
+      set_value(value, hash, key, modifier)
     end
 
     def self.set_value(value, hash, key, modifier)
       return if value.nil?
       hash[key] = case modifier
-      when :to_i    then value.to_i
-      when :to_f    then value.to_f
-      when :to_bool then self.parse_boolean(value)
-      else value
+                  when :to_i    then value.to_i
+                  when :to_f    then value.to_f
+                  when :to_bool then parse_boolean(value)
+                  else value
       end
     end
 
     def self.parse_first_node(node, path, hash, options)
-      self.parse_first_node_with_hash(node, path, nh = {}, options)
+      parse_first_node_with_hash(node, path, nh = {}, options)
       unless nh.empty?
         hash[path.to_sym] = hash[path.to_sym].nil? ? nh : hash[path.to_sym].merge(nh)
       end
@@ -68,12 +71,12 @@ module Ovirt
     def self.parse_first_node_with_hash(node, path, hash, options)
       xnode = node.xpath(path.to_s).first
       unless xnode.blank?
-        options[:attribute].to_a.each      {|key| self.parse_attribute( xnode, hash, key)}
-        options[:attribute_to_i].to_a.each {|key| self.parse_attribute( xnode, hash, key, :to_i)}
-        options[:attribute_to_f].to_a.each {|key| self.parse_attribute( xnode, hash, key, :to_f)}
-        options[:node].to_a.each           {|key| self.parse_first_text(xnode, hash, key)}
-        options[:node_to_i].to_a.each      {|key| self.parse_first_text(xnode, hash, key, :to_i)}
-        options[:node_to_bool].to_a.each   {|key| self.parse_first_text(xnode, hash, key, :to_bool)}
+        options[:attribute].to_a.each      { |key| parse_attribute(xnode, hash, key) }
+        options[:attribute_to_i].to_a.each { |key| parse_attribute(xnode, hash, key, :to_i) }
+        options[:attribute_to_f].to_a.each { |key| parse_attribute(xnode, hash, key, :to_f) }
+        options[:node].to_a.each           { |key| parse_first_text(xnode, hash, key) }
+        options[:node_to_i].to_a.each      { |key| parse_first_text(xnode, hash, key, :to_i) }
+        options[:node_to_bool].to_a.each   { |key| parse_first_text(xnode, hash, key, :to_bool) }
       end
     end
 
@@ -81,40 +84,40 @@ module Ovirt
       node.xpath(path.to_s).first.present?
     end
 
-    def self.top_level_objects=(keys)
-      @top_level_objects = keys
+    class << self
+      attr_writer :top_level_objects
     end
 
     def self.top_level_objects
       @top_level_objects ||= []
     end
 
-    def self.top_level_strings=(keys)
-      @top_level_strings = keys
+    class << self
+      attr_writer :top_level_strings
     end
 
     def self.top_level_strings
       @top_level_strings ||= []
     end
 
-    def self.top_level_integers=(keys)
-      @top_level_integers = keys
+    class << self
+      attr_writer :top_level_integers
     end
 
     def self.top_level_integers
       @top_level_integers ||= []
     end
 
-    def self.top_level_booleans=(keys)
-      @top_level_booleans = keys
+    class << self
+      attr_writer :top_level_booleans
     end
 
     def self.top_level_booleans
       @top_level_booleans ||= []
     end
 
-    def self.top_level_timestamps=(keys)
-      @top_level_timestamps = keys
+    class << self
+      attr_writer :top_level_timestamps
     end
 
     def self.top_level_timestamps
@@ -173,7 +176,7 @@ module Ovirt
     def self.href_from_creation_status_link(link)
       # "/api/vms/5024ab49-19b5-4176-9568-c004d1c9f256/creation_status/d0e45003-d490-4551-9911-05b3bec682dc"
       # => "/api/vms/5024ab49-19b5-4176-9568-c004d1c9f256"
-      link.split("/")[0,4].join("/")
+      link.split("/")[0, 4].join("/")
     end
 
     def self.href_to_guid(href)
@@ -208,16 +211,16 @@ module Ovirt
     def self.all_xml_objects(service)
       response = service.resource_get(api_endpoint)
       doc      = Nokogiri::XML(response)
-      objects  = doc.xpath("//#{element_names}/#{element_name}")
+      doc.xpath("//#{element_names}/#{element_name}")
     end
 
     def self.all(service)
-      all_xml_objects(service).collect { |xml| self.create_from_xml(service, xml) }
+      all_xml_objects(service).collect { |xml| create_from_xml(service, xml) }
     end
 
     def self.find_by_name(service, name)
       all_xml_objects(service).each do |xml|
-        obj = self.create_from_xml(service, xml)
+        obj = create_from_xml(service, xml)
         return obj if obj[:name] == name
       end
       nil
@@ -229,9 +232,9 @@ module Ovirt
 
     def self.find_by_href(service, href)
       response = service.resource_get(href)
-      doc = Nokogiri::XML(response)
-      xml = doc.xpath("//#{element_name}").first
-      self.create_from_xml(service, xml)
+      doc      = Nokogiri::XML(response)
+      xml      = doc.xpath("//#{element_name}").first
+      create_from_xml(service, xml)
     rescue RestClient::ResourceNotFound
       return nil
     end
@@ -241,7 +244,7 @@ module Ovirt
     def initialize(service, options = {})
       @service       = service
       @relationships = options.delete(:relationships) || {}
-      @operations    = options.delete(:actions)       || {}
+      @operations    = options.delete(:actions) || {}
       @attributes    = options
     end
 
@@ -252,23 +255,23 @@ module Ovirt
     end
 
     def reload
-      self.replace(self.class.find_by_href(@service, self[:href]))
+      replace(self.class.find_by_href(@service, self[:href]))
     end
 
     def method_missing(m, *args)
-      if @relationships.has_key?(m)
+      if @relationships.key?(m)
         relationship(m)
-      elsif @operations.has_key?(m)
+      elsif @operations.key?(m)
         operation(m, args)
-      elsif @attributes.has_key?(m)
+      elsif @attributes.key?(m)
         @attributes[m]
       else
         super
       end
     end
 
-    def operation(method, *args)
-      if @operations.has_key?(method.to_sym)
+    def operation(method, *_args)
+      if @operations.key?(method.to_sym)
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.action { yield xml if block_given? }
         end
@@ -281,7 +284,7 @@ module Ovirt
     end
 
     def relationship(rel)
-      if @relationships.has_key?(rel.to_sym)
+      if @relationships.key?(rel.to_sym)
         rel_str  = rel.to_s
         rel_str  = 'storage_domains' if rel_str == 'storagedomains'
         rel_str  = 'data_centers'    if rel_str == 'datacenters'
@@ -311,7 +314,7 @@ module Ovirt
       response = update(&block)
 
       obj = self.class.create_from_xml(@service, response)
-      self.replace(obj)
+      replace(obj)
     end
 
     def update

data/lib/ovirt/cluster.rb

@@ -16,7 +16,7 @@ module Ovirt
     end
 
     def find_network_by_name(network_name)
-      self.networks.detect { |n| n[:name] == network_name }
+      networks.detect { |n| n[:name] == network_name }
     end
   end
 end

data/lib/ovirt/data_center.rb

@@ -12,7 +12,7 @@ module Ovirt
 
       supported_versions_node       = node.xpath('supported_versions').first
       supported_versions            = {}
-      supported_versions[:versions] = supported_versions_node.xpath('version').collect { |version_node| { :major => version_node['major'].to_i, :minor => version_node['minor'].to_i } }
+      supported_versions[:versions] = supported_versions_node.xpath('version').collect { |version_node| {:major => version_node['major'].to_i, :minor => version_node['minor'].to_i} }
       hash[:supported_versions]     = supported_versions
     end
   end