ovirt 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c172b4852f86b14fada5740c2478131f2f6010
-  data.tar.gz: fb70dcc4727590b98ecc2fd05783b4d99bd5b2f1
+  metadata.gz: f4692aaa3e0f3118a4d794df4b468de40d22c9cc
+  data.tar.gz: 1a4443cbe30a58e4ff163bf43cad68d642a9ca15
 SHA512:
-  metadata.gz: 9d36b7310b5e70778be4a65460067c9ee0511a04919a67399f7901876b79641ee5ad878d3c2c428333fd1e65e9207273416dcb47e886b506bbb8a4deb62b3613
-  data.tar.gz: 9c2adee211422bcc3bf0d8650334792d7dc47bf4b5b11385b67c07a80ffb1217dfb6917ac5dc41fa373cc87ee98f388e594541187fdabc969098a46bce4ecd96
+  metadata.gz: ebc8be1e7aa00ab6ad93f5bdfd196c12709fcdf2882a6645c8e3b0d360e8c9c5dcbda806e7e01d7e10325e3ac86954c3232ac4b70f3b7afe6067387afc634f3b
+  data.tar.gz: d89c8c9f6ea61b805ba7534fa1bbd1c25da11b069c87a780211c05e712ae9355cec71e94c2c565e34cdc87537e5aa7860fe998eccf4c512584fb8bba4babb3b7

data/lib/ovirt/base.rb

@@ -168,20 +168,20 @@ module Ovirt
     end
 
     def self.href_to_guid(href)
-      href.split("/").last
+      href = href.to_s.split("/").last
+      href.guid? ? href : raise(ArgumentError, "href must contain a valid guid")
     end
+    private_class_method :href_to_guid
 
     def self.object_to_id(object)
       case object
       when Ovirt::Base
-        object = object[:id]
+        object[:id]
       when String
-        raise ArgumentError, "object must be a valid guid" unless object.guid?
-        object = href_to_guid(object)
+        href_to_guid(object)
       else
         raise ArgumentError, "object must be a valid guid or an Ovirt Object"
       end
-      object
     end
 
     def self.api_endpoint

data/lib/ovirt/inventory.rb

@@ -26,11 +26,13 @@ module Ovirt
       standard_collection("domains")
     end
 
-    def events(since = nil)
-      if since.nil?
-        standard_collection("events")
+    def events(options = {})
+      if options[:since]
+        standard_collection("events?from=#{options[:since]}", "event")
+      elsif options[:max]
+        standard_collection("events;max=#{options[:max]}", "event", false, "time", :desc)
       else
-        standard_collection("events?from=#{since}", "event")
+        standard_collection("events")
       end
     end
 
@@ -94,8 +96,8 @@ module Ovirt
 
     private
 
-    def standard_collection(uri_suffix, element_name = nil, paginate=false, sort_by=:name)
-      @service.standard_collection(uri_suffix, element_name, paginate, sort_by)
+    def standard_collection(uri_suffix, element_name = nil, paginate = false, sort_by = :name, direction = :asc)
+      @service.standard_collection(uri_suffix, element_name, paginate, sort_by, direction)
     end
 
     # TODO: Remove this key/method translation and just use the method name as

data/lib/ovirt/service.rb

@@ -102,9 +102,9 @@ module Ovirt
       xml_to_object(klass, doc.root)
     end
 
-    def standard_collection(uri_suffix, element_name = nil, paginate=false, sort_by=:name)
+    def standard_collection(uri_suffix, element_name = nil, paginate = false, sort_by = :name, direction = :asc)
       if paginate
-        doc = paginate_resource_get(uri_suffix, sort_by)
+        doc = paginate_resource_get(uri_suffix, sort_by, direction)
       else
         xml = resource_get(uri_suffix)
         doc = Nokogiri::XML(xml)
@@ -241,11 +241,10 @@ module Ovirt
     end
 
     def base_uri
-      if port.blank?
-        "#{scheme}://#{server}"
-      else
-        "#{scheme}://#{server}:#{port}"
-      end
+      require 'uri'
+      uri = URI::Generic.build(:scheme => scheme.to_s, :port => port)
+      uri.hostname = server
+      uri.to_s
     end
 
     def resource_options

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/ovirt.rb

@@ -12,7 +12,6 @@ require 'ovirt/data_center'
 require 'ovirt/disk'
 require 'ovirt/domain'
 require 'ovirt/event'
-require 'ovirt/event_monitor'
 require 'ovirt/file'
 require 'ovirt/group'
 require 'ovirt/host'

data/spec/base_spec.rb

@@ -9,4 +9,11 @@ describe Ovirt::Base do
     Ovirt::StorageDomain.api_endpoint.should == "storagedomains"
     Ovirt::DataCenter.api_endpoint.should    == "datacenters"
   end
+
+  it ".href_to_guid" do
+    guid = "1c92b67c-9d10-4f48-85bd-28ba2fd6d9b3"
+    expect(Ovirt::Base.send(:href_to_guid, "/api/clusters/#{guid}")).to eq(guid)
+    expect(Ovirt::Base.send(:href_to_guid, guid)).to                    eq(guid)
+    expect { Ovirt::Base.send(:href_to_guid, 12345) }.to                raise_error(ArgumentError)
+  end
 end

data/spec/service_spec.rb

@@ -27,4 +27,39 @@ EOX
       expect { @service.resource_post('uri', 'data') }.to raise_error(Ovirt::Error, error_detail)
     end
   end
+
+  context "#base_uri" do
+    let(:defaults) { {:username => nil, :password => nil}}
+    subject { described_class.new(defaults.merge(@options)).send(:base_uri) }
+
+    it "ipv4" do
+      @options = {:server => "127.0.0.1"}
+      subject.should == "https://127.0.0.1:443"
+    end
+
+    it "ipv6" do
+      @options = {:server => "::1"}
+      subject.should == "https://[::1]:443"
+    end
+
+    it "hostname" do
+      @options = {:server => "nobody.com"}
+      subject.should == "https://nobody.com:443"
+    end
+
+    it "port 4443" do
+      @options = {:server => "nobody.com", :port => 4443}
+      subject.should == "https://nobody.com:4443"
+    end
+
+    it "blank port" do
+      @options = {:server => "nobody.com", :port => ""}
+      subject.should == "https://nobody.com"
+    end
+
+    it "nil port uses defaults" do
+      @options = {:server => "nobody.com", :port => nil}
+      subject.should == "https://nobody.com:443"
+    end
+  end
 end

metadata

@@ -1,153 +1,160 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Frey
 - Brandon Dunne
 - Keenan Brock
+- Joe Rafaniello
+- Greg Blomquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: more_core_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.2
 description: Ovirt provides a simple Object Oriented interface to the REST API of
   oVirt and RHEV-M servers.
 email:
-- jfrey@redhat.com
+- fryguy9@gmail.com
 - bdunne@redhat.com
 - keenan@thebrocks.net
+- jrafanie@redhat.com
+- gblomqui@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
+- LICENSE.txt
+- README.md
 - lib/ovirt.rb
 - lib/ovirt/api.rb
 - lib/ovirt/base.rb
@@ -157,7 +164,6 @@ files:
 - lib/ovirt/disk.rb
 - lib/ovirt/domain.rb
 - lib/ovirt/event.rb
-- lib/ovirt/event_monitor.rb
 - lib/ovirt/exception.rb
 - lib/ovirt/file.rb
 - lib/ovirt/group.rb
@@ -180,15 +186,12 @@ files:
 - lib/ovirt/version.rb
 - lib/ovirt/vm.rb
 - lib/ovirt/vmpool.rb
-- README.md
-- LICENSE.txt
 - spec/base_spec.rb
 - spec/event_spec.rb
 - spec/service_spec.rb
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/vm_spec.rb
-- .rspec
 homepage: http://github.com/ManageIQ/ovirt
 licenses:
 - Apache
@@ -199,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ovirt provides a simple Object Oriented interface to the REST API of oVirt
@@ -221,4 +224,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/vm_spec.rb
-- .rspec
+- ".rspec"
+has_rdoc: 

data/lib/ovirt/event_monitor.rb

@@ -1,36 +0,0 @@
-module Ovirt
-  class EventMonitor
-    def initialize(options={})
-      @options = options
-    end
-
-    def inventory
-      @inventory ||= Inventory.new(@options)
-    end
-
-    def start
-      trap(:TERM) { $rhevm_log.info "EventMonitor#start: ignoring SIGTERM" }
-      @since          = nil
-      @inventory      = nil
-      @monitor_events = true
-    end
-
-    def stop
-      @monitor_events = false
-    end
-
-    def each_batch
-      while @monitor_events do
-        events = inventory.events(@since).sort_by { |e| e[:id].to_i }
-        @since = events.last[:id].to_i unless events.empty?
-        yield events
-      end
-    end
-
-    def each
-      each_batch do |events|
-        events.each { |e| yield e }
-      end
-    end
-  end
-end