fog-libvirt 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7115a1bb2c554de544d464049d48c6a15f2b39499a729180ab0e37bab55d3f3
-  data.tar.gz: c38e323849b149376f72edacd821788aa9df923d7bd4ca334dd0792a1ade5fab
+  metadata.gz: 478f04152afea3fd1b8ea8e6aa2d8a2bcdc83fc121f2e9cf61925c64a69c483b
+  data.tar.gz: 364dcd8e9c09434b872d06b2c0d8bfce4c2f9320a57ee8d0f954223628797814
 SHA512:
-  metadata.gz: dc0dd759cec37c6e89557dec04bc05a679150183474cf589509cf0a36d51a129bcfd521b0ecbb2682b8eb76ef1d2bd25f81bff8e3117ba35961fd8d8f2d1a285
-  data.tar.gz: f7f1661e4e48a4fdaa68475ca34eb6f35bd346981891ea7cdb49a4b05d236b2886bf125ffb51ec2538277d3b7fe7584f3338eea30e0c4011a4712290d7370533
+  metadata.gz: b65c110f9d40bc749f967da511d7c534852dd4004d39b410cc07125eac26a0ebbece4fbbe7a38de1026142d5fe6d4457abba0f472a2769ef900c31af1e98d939
+  data.tar.gz: 5e2508a3aeef1041963995a594b6c3788c9bda9638f5ff73f2a5fd2c12fbd1e18556c46a983b3ae6de07e96a08d3fd15c6b037fb1f2f845194587a69d844b360

data/fog-libvirt.gemspec

@@ -36,11 +36,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency("minitest-stub-const")
   s.add_development_dependency("pry")
   s.add_development_dependency("rake")
-  s.add_development_dependency("rubocop") if RUBY_VERSION > "2.0"
+  s.add_development_dependency("rubocop")
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("yard")
-  s.add_development_dependency("mocha", "~> 1.15.0")
+  s.add_development_dependency("mocha", ">= 1.15", "< 3")
 
   # Let's not ship dot files and gemfiles
   git_files = `git ls-files`.split("\n")

data/lib/fog/libvirt/models/compute/server.rb

@@ -92,7 +92,7 @@ module Fog
 
         def destroy(options={ :destroy_volumes => false, :flags => 0 })
           poweroff unless stopped?
-          if options[:flags].zero?
+          if options.fetch(:flags, 0).zero?
             service.vm_action(uuid, :undefine)
           else
             service.vm_action(uuid, :undefine, options[:flags])

data/lib/fog/libvirt/requests/compute/list_domains.rb

@@ -39,13 +39,9 @@ module Fog
         end
 
         def domain_volumes xml
-          vols_by_file = xml_elements(xml, "domain/devices/disk/source", "file")
-          vols_by_name = xml_elements(xml, "domain/devices/disk/source", "name")
-          vols = []
-          vols_by_file.zip(vols_by_name).each do |by_file,by_name|
-            vols.push(by_file.nil? ? by_name : by_file)
+          xml_elements(xml, "domain/devices/disk/source").map do |element|
+            element[:file] || element[:dev] || element[:name]
           end
-          vols
         end
 
         def boot_order xml

data/lib/fog/libvirt/requests/compute/list_pools.rb

@@ -1,24 +1,10 @@
 module Fog
   module Libvirt
     class Compute
-      class Real
-        def list_pools(filter = { })
-          data=[]
-          if filter.key?(:name)
-            data << find_pool_by_name(filter[:name], filter[:include_inactive])
-          elsif filter.key?(:uuid)
-            data << find_pool_by_uuid(filter[:uuid], filter[:include_inactive])
-          else
-            (client.list_storage_pools + client.list_defined_storage_pools).each do |name|
-              data << find_pool_by_name(name, filter[:include_inactive])
-            end
-          end
-          data.compact
-        end
-
+      module Shared
         private
 
-        private_class_method def self.pool_to_attributes(pool, include_inactive = nil)
+        def pool_to_attributes(pool, include_inactive = nil)
           return nil unless pool.active? || include_inactive
 
           states=[:inactive, :building, :running, :degrated, :inaccessible]
@@ -34,6 +20,26 @@ module Fog
             :state          => states[pool.info.state]
           }
         end
+      end
+
+      class Real
+        include Shared
+
+        def list_pools(filter = { })
+          data=[]
+          if filter.key?(:name)
+            data << find_pool_by_name(filter[:name], filter[:include_inactive])
+          elsif filter.key?(:uuid)
+            data << find_pool_by_uuid(filter[:uuid], filter[:include_inactive])
+          else
+            (client.list_storage_pools + client.list_defined_storage_pools).each do |name|
+              data << find_pool_by_name(name, filter[:include_inactive])
+            end
+          end
+          data.compact
+        end
+
+        private
 
         def find_pool_by_name name, include_inactive
           pool_to_attributes(client.lookup_storage_pool_by_name(name), include_inactive)
@@ -49,6 +55,8 @@ module Fog
       end
 
       class Mock
+        include Shared
+
         def list_pools(filter = { })
           pool1 = mock_pool 'pool1'
           pool2 = mock_pool 'pool1'

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/tests/libvirt/requests/compute/list_pools_tests.rb

@@ -59,11 +59,11 @@ Shindo.tests("Fog::Compute[:libvirt] | list_pools request", 'libvirt') do
       :num_of_volumes => 3
     }
 
-    response = ::Fog::Libvirt::Compute::Real.send(:pool_to_attributes, FakePool.new(inactive_pool), true)
+    response = compute.send(:pool_to_attributes, FakePool.new(inactive_pool), true)
 
     test("should be hash of attributes") { response.kind_of? Hash }
 
-    response = ::Fog::Libvirt::Compute::Real.send(:pool_to_attributes, FakePool.new(inactive_pool))
+    response = compute.send(:pool_to_attributes, FakePool.new(inactive_pool))
 
     test("should be nil") { response.nil? }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -210,16 +210,22 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.15'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '3'
 description: This library can be used as a module for 'fog' or as standalone libvirt
   provider.
 email: geemus@gmail.com