ovirt 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1886f330149d0994b6de59583f62471a5efeed5e
-  data.tar.gz: dd5ed8130d545bc6a33219e007f80f2bee9cf428
+  metadata.gz: 5048f3089d3d263bbd87e8269ebf1b62aa07d71a
+  data.tar.gz: 678194cdf3266c45341f285a242c1c4736e1bc34
 SHA512:
-  metadata.gz: dd28d604f2b102b336fe528a3c6f41a3f2225b7c7eb9308554021b21f726871b486e7b34d0b83e7743823bdff278b326890612faed50abea4f556e999b94059c
-  data.tar.gz: 562e1d21bc674e8b57abdfde3f8aaa509da282e2dffc4707b3f7ad18be98541765c17e12685e8bead0b9ef1173dba386c47d174376f6bcc16918a37e44c23010
+  metadata.gz: e28b83730c169e9180e02ed1a8b920ad99bbbd5862980a320fa480495f0119b3060abfffa54db49c80eceac6d1d0053e71f9fee70f6c2532d8149a7e9acf9209
+  data.tar.gz: f0bd623f3e33d426d8580a7a57045ad834cb8445527f1ccd2f86ec43f5c3d2dc752cc0d2c12b512eb5d9d82d13580028d6dddaa42246e5bf29bc30ced614d78c

data/lib/ovirt/service.rb

@@ -197,10 +197,17 @@ module Ovirt
     def api_uri(path = nil)
       # Calculate the complete URI:
       uri = URI.join(base_uri, api_path).to_s
+
+      # The path passed to this method will have the "/api" prefix if it comes from the "ems_ref"
+      # attribute stored in the database, and will have the "/ovirt-engine/api" if it comes directly
+      # from the "href" attribute of the XML documents, for example when using the "relationships"
+      # method to fetch secondary objects related to the primary object. This means that to have
+      # a clean path we need to remove both "ovirt-engine" and "api".
       unless path.nil?
         parts = path.to_s.split('/')
-        parts.shift if parts.first == ''    # Remove leading slash
-        parts.shift if parts.first == 'api' # We already have /api in our URI
+        parts.shift if parts.first == ''
+        parts.shift if parts.first == 'ovirt-engine'
+        parts.shift if parts.first == 'api'
         uri += "/#{parts.join('/')}" unless parts.empty?
       end
       uri

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/ovirt.rb

@@ -1,4 +1,3 @@
-require 'active_support/all'
 require 'more_core_extensions/all'
 
 require 'ovirt/exception'

data/spec/service_spec.rb

@@ -206,6 +206,29 @@ EOX
     end
   end
 
+  context "#api_uri" do
+    BASE_URI = "https://nobody.com"
+    API_PATH = "/ovirt-engine/api"
+
+    before do
+      expect(service).to receive(:base_uri).and_return(BASE_URI)
+      expect(service).to receive(:api_path).and_return(API_PATH)
+    end   
+
+    it "removes slash" do
+      expect(service.api_uri("/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
+    end
+
+    it "removes /api" do
+      expect(service.api_uri("/api/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
+    end
+
+    it "removes /ovirt-engine/api" do
+      expect(service.api_uri("/ovirt-engine/api/vms/123")).to eq("#{BASE_URI}#{API_PATH}/vms/123")
+    end
+
+  end
+
   context "#version" do
     it "with :full_version" do
       allow(service).to receive(:product_info).and_return(:full_version => "3.4.5-0.3.el6ev", :version => {:major => "3", :minor => "4", :build => "0", :revision => "0"})

data/spec/vm_spec.rb

@@ -13,9 +13,9 @@ describe Ovirt::Vm do
         :interface         => "virtio",
         :format            => "raw",
         :image_id          => "a791ba77-8cc1-44de-9945-69f0a291cc47",
-        :size              => 10_737_418_240,
-        :provisioned_size  => 10_737_418_240,
-        :actual_size       => 1_316_855_808,
+        :size              => 10_737_418_240, # 10.gigabytes
+        :provisioned_size  => 10_737_418_240, # 10.gigabytes
+        :actual_size       => 1_316_855_808,  # 1255.megabytes
         :sparse            => true,
         :bootable          => true,
         :wipe_after_delete => true,
@@ -169,7 +169,7 @@ EOX
 
   context "#memory_reserve" do
     it "updates the memory policy guarantee" do
-      memory_reserve = 1.gigabyte
+      memory_reserve = 1_073_741_824 # 1.gigabyte
       expected_data  = <<-EOX.chomp
 <vm>
   <memory_policy>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Jason Frey
@@ -20,146 +20,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !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: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !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: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !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'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.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: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0.rc1
 description: Ovirt provides a simple Object Oriented interface to the REST API of
@@ -182,7 +182,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
+- .rspec
 - LICENSE.txt
 - README.md
 - lib/ovirt.rb
@@ -239,17 +239,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ovirt provides a simple Object Oriented interface to the REST API of oVirt
@@ -265,4 +265,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - spec/vm_spec.rb
-- ".rspec"
+- .rspec