fog-proxmox 0.14.0 → 0.15.0

data/lib/fog/proxmox/identity/models/domain_type.rb

@@ -41,7 +41,6 @@ module Fog
         attribute :verify
         attribute :step
         attribute :digits
-
       end
     end
   end

data/lib/fog/proxmox/identity/models/domains.rb

@@ -31,14 +31,13 @@ module Fog
         end
 
         def get(id)
-          all.find { |domain| domain.identity === id }
+          all.find { |domain| domain.identity == id }
         end
 
         def destroy(id)
           domain = get(id)
           domain.destroy
         end
-
       end
     end
   end

data/lib/fog/proxmox/identity/models/group.rb

@@ -28,7 +28,7 @@ module Fog
         attribute :members
 
         def save(options = {})
-          service.create_group((attributes.reject { |attribute| [:users, :members].include? attribute }).merge(options))
+          service.create_group((attributes.reject { |attribute| %i[users members].include? attribute }).merge(options))
           reload
         end
 
@@ -40,7 +40,9 @@ module Fog
 
         def update
           requires :groupid
-          service.update_group(identity, attributes.reject { |attribute| [:groupid, :users, :members].include? attribute })
+          service.update_group(identity, attributes.reject do |attribute|
+                                           %i[groupid users members].include? attribute
+                                         end)
           reload
         end
       end

data/lib/fog/proxmox/identity/models/groups.rb

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |group| group.identity === id }
+          all.find { |group| group.identity == id }
         end
 
         def destroy(id)

data/lib/fog/proxmox/identity/models/permission.rb

@@ -40,17 +40,18 @@ module Fog
 
         def initialize_roles(new_attributes = {})
           roles = new_attributes.delete(:roleid)
-          new_attributes.store(:roles, roles)       
+          new_attributes.store(:roles, roles)
         end
 
         def initialize_ugid(new_attributes = {})
           ugs = new_attributes.delete(:ugid)
-          if type === 'user'
+          case type
+          when 'user'
             new_attributes.store(:users, ugs)
-          elsif type === 'group'
+          when 'group'
             new_attributes.store(:groups, ugs)
           end
-          new_attributes.delete(:type)          
+          new_attributes.delete(:type)
         end
 
         def to_update

data/lib/fog/proxmox/identity/models/permissions.rb

@@ -31,7 +31,9 @@ module Fog
         end
 
         def get(type, path, roleid, ugid)
-          all.find { |permission| permission.type === type && permission.path === path && permission.roleid === roleid && permission.ugid === ugid }
+          all.find do |permission|
+            permission.type == type && permission.path == path && permission.roleid == roleid && permission.ugid == ugid
+          end
         end
 
         def destroy(permission_hash)

data/lib/fog/proxmox/identity/models/pool.rb

@@ -67,14 +67,14 @@ module Fog
         end
 
         def has_server?(vmid)
-          has?("vmid", vmid)
+          has?('vmid', vmid)
         end
 
         def has_storage?(storage)
-          has?("storage", storage)
+          has?('storage', storage)
         end
-        
-        private 
+
+        private
 
         def has?(key, vmid)
           result = false

data/lib/fog/proxmox/identity/models/pools.rb

@@ -27,13 +27,13 @@ module Fog
         model Fog::Proxmox::Identity::Pool
 
         def all
-          pools_with_members = Array.new
-          service.list_pools.each { |pool| pools_with_members.push(pool.merge(service.get_pool(pool["poolid"]))) }
+          pools_with_members = []
+          service.list_pools.each { |pool| pools_with_members.push(pool.merge(service.get_pool(pool['poolid']))) }
           load pools_with_members
         end
-   
+
         def get(id)
-          all.find { |pool| pool.identity === id }
+          all.find { |pool| pool.identity == id }
         end
 
         def destroy(id)

data/lib/fog/proxmox/identity/models/role.rb

@@ -39,7 +39,7 @@ module Fog
 
         def update
           requires :roleid
-          service.update_role(roleid, attributes.reject { |attribute| [:roleid, :special].include? attribute })
+          service.update_role(roleid, attributes.reject { |attribute| %i[roleid special].include? attribute })
           reload
         end
       end

data/lib/fog/proxmox/identity/models/roles.rb

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |role| role.identity === id }
+          all.find { |role| role.identity == id }
         end
 
         def destroy(id)

data/lib/fog/proxmox/identity/models/token.rb

@@ -40,10 +40,9 @@ module Fog
           super(new_attributes)
         end
 
-
         def save(options = {})
           requires :tokenid, :userid
-          token_hash = (attributes.reject { |attribute| [:userid, :tokenid, :info].include? attribute }).merge(options)
+          token_hash = (attributes.reject { |attribute| %i[userid tokenid info].include? attribute }).merge(options)
           service.create_token(userid, tokenid, token_hash)
           reload
         end
@@ -56,7 +55,9 @@ module Fog
 
         def update
           requires :tokenid, :userid
-          service.update_token(userid, tokenid, attributes.reject { |attribute| [:userid, :tokenid, :info].include? attribute })
+          service.update_token(userid, tokenid, attributes.reject do |attribute|
+                                                  %i[userid tokenid info].include? attribute
+                                                end)
           reload
         end
 

data/lib/fog/proxmox/identity/models/token_info.rb

@@ -24,9 +24,9 @@ module Fog
       class TokenInfo < Fog::Model
         identity  :tokenid
         identity  :userid
-        attribute  :fulltokenid
+        attribute :fulltokenid
         attribute :info
-        attribute :value        
+        attribute :value
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)

data/lib/fog/proxmox/identity/models/tokens.rb

@@ -32,24 +32,20 @@ module Fog
         end
 
         def get(tokenid)
-          all.find { |token| token.tokenid === tokenid && token.userid == userid }
+          all.find { |token| token.tokenid == tokenid && token.userid == userid }
         end
 
-        def all(options = {})
-          begin
-            load service.list_tokens(userid)
-          rescue Excon::Error::InternalServerError => error
-            if error.response.status_line.include? "no such user"
-              return []
-            else
-              raise error
-            end
-          end
+        def all(_options = {})
+          load service.list_tokens(userid)
+        rescue Excon::Error::InternalServerError => e
+          raise e unless e.response.status_line.include? 'no such user'
+
+          []
         end
 
         def create(new_attributes = {})
-          object = new(new_attributes.select { |key, _value| [:userid, :tokenid].include? key.to_sym })
-          object.save(new_attributes.reject { |key, _value| [:userid, :tokenid].include? key.to_sym })
+          object = new(new_attributes.select { |key, _value| %i[userid tokenid].include? key.to_sym })
+          object.save(new_attributes.reject { |key, _value| %i[userid tokenid].include? key.to_sym })
           object
         end
       end

data/lib/fog/proxmox/identity/models/user.rb

@@ -57,7 +57,7 @@ module Fog
 
         def update
           requires :userid
-          service.update_user(userid, attributes.reject { |attribute| [:userid, :tokens].include? attribute })
+          service.update_user(userid, attributes.reject { |attribute| %i[userid tokens].include? attribute })
           reload
         end
 
@@ -76,7 +76,6 @@ module Fog
         def initialize_tokens
           attributes[:tokens] = Fog::Proxmox::Identity::Tokens.new(service: service, userid: userid)
         end
-
       end
     end
   end

data/lib/fog/proxmox/identity/models/users.rb

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |user| user.identity === id }
+          all.find { |user| user.identity == id }
         end
 
         def destroy(id)

data/lib/fog/proxmox/identity/requests/get_user.rb

@@ -31,6 +31,7 @@ module Fog
           )
         end
       end
+
       # class Mock get_user request
       class Mock
         def get_user(userid); end

data/lib/fog/proxmox/identity/requests/list_user_permissions.rb

@@ -26,7 +26,7 @@ module Fog
         def list_user_permissions(userid, path)
           options = { userid: userid }
           options.store(:path, path) if path
-            request(
+          request(
             expects: [200],
             method: 'GET',
             path: 'access/permissions',

data/lib/fog/proxmox/network/models/networks.rb

@@ -40,7 +40,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |network| network.identity === id }
+          all.find { |network| network.identity == id }
         end
       end
     end

data/lib/fog/proxmox/network/models/node.rb

@@ -60,6 +60,7 @@ module Fog
           action_known = %w[reboot shutdown].include? action
           message = "Action #{action} not implemented"
           raise Fog::Errors::Error, message unless action_known
+
           service.power_node({ node: node }, command: action)
         end
 

data/lib/fog/proxmox/network/models/nodes.rb

@@ -31,7 +31,7 @@ module Fog
         end
 
         def get(id)
-          all.find { |node| node.identity === id }
+          all.find { |node| node.identity == id }
         end
       end
     end

data/lib/fog/proxmox/string.rb

@@ -22,9 +22,10 @@ module Fog
     # module String mixins
     module String
       def self.to_boolean(text)
-        return true if text == true   || text =~ (/(true|t|yes|y|1)$/i)
-        return false if text == false  || text.empty? || text =~ (/(false|f|no|n|0)$/i)
-        raise ArgumentError.new("invalid value for Boolean: \"#{text}\"")
+        return true if text == true || text =~ (/(true|t|yes|y|1)$/i)
+        return false if text == false || text.empty? || text =~ (/(false|f|no|n|0)$/i)
+
+        raise ArgumentError, "invalid value for Boolean: \"#{text}\""
       end
     end
   end

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.14.0'
+    VERSION = '0.15.0'
   end
 end

data/lib/fog/proxmox.rb

@@ -24,7 +24,6 @@ require 'fog/json'
 module Fog
   # Proxmox module
   module Proxmox
-
     require 'fog/proxmox/auth/token'
 
     autoload :Core, 'fog/proxmox/core'
@@ -35,7 +34,7 @@ module Fog
     autoload :Network, 'fog/proxmox/network'
 
     extend Fog::Provider
-    
+
     service(:identity, 'Identity')
     service(:compute, 'Compute')
     service(:storage, 'Storage')
@@ -50,6 +49,5 @@ module Fog
     def self.clear_token_cache
       Fog::Proxmox.token_cache = {}
     end
-    
   end
 end

data/spec/hash_spec.rb

@@ -30,7 +30,8 @@ describe Fog::Proxmox::Hash do
 
   describe '#flatten' do
     it 'returns string net_vm' do
-      assert_equal 'net0: virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1', Fog::Proxmox::Hash.flatten(net_vm)
+      assert_equal 'net0: virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1',
+                   Fog::Proxmox::Hash.flatten(net_vm)
     end
   end
 

data/spec/helpers/controller_helper_spec.rb

@@ -20,126 +20,138 @@
 require 'spec_helper'
 require 'fog/proxmox/helpers/controller_helper'
 
-    describe Fog::Proxmox::ControllerHelper do
-            
-        let(:net) do 
-            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
-        end
-        let(:net_no_options) do 
-            { net0: 'virtio=66:89:C5:59:AA:96' }
-        end 
-        let(:net_lxc) do 
-            { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,ip=192.168.56.100/31,ip6=2001:0000:1234:0000:0000:C1C0:ABCD:0876/31' }
-        end  
-        let(:scsi) do 
-            { scsi10: 'local-lvm:1,cache=none' }
-        end
-        let(:cdrom) do 
-            { ide2: 'none,media=cdrom' }
-        end
-        let(:mp) do 
-            { mp0: 'local-lvm:1,mp=/opt/path' }
-        end        
-        let(:rootfs) do 
-            { rootfs: 'local-lvm:1' }
-        end
-
-        describe '#extract' do
-            it "returns bridge" do
-                bridge = Fog::Proxmox::ControllerHelper.extract('bridge',net[:net0])
-                assert_equal 'vmbr0', bridge
-            end
-            it "returns nil" do
-                bridge = Fog::Proxmox::ControllerHelper.extract('bridge',net_no_options[:net0])
-                assert !bridge
-            end
-            it "returns firewall" do
-                firewall = Fog::Proxmox::ControllerHelper.extract('firewall',net[:net0])
-                assert_equal '1', firewall
-            end
-            it "returns cache" do
-                cache = Fog::Proxmox::ControllerHelper.extract('cache',scsi[:scsi10])
-                assert_equal 'none', cache
-            end
-            it "returns mp" do
-                path = Fog::Proxmox::ControllerHelper.extract('mp',mp[:mp0])
-                assert_equal '/opt/path', path
-            end
-            it "returns cidr ip" do
-                path = Fog::Proxmox::ControllerHelper.extract('ip',net_lxc[:net0])
-                assert_equal '192.168.56.100/31', path
-            end
-            it "returns cidr ip6" do
-                path = Fog::Proxmox::ControllerHelper.extract('ip6',net_lxc[:net0])
-                assert_equal '2001:0000:1234:0000:0000:C1C0:ABCD:0876/31', path
-            end
-        end
-
-        describe '#extract_index' do
-            it "net0 returns 0" do
-                index = Fog::Proxmox::ControllerHelper.extract_index('net',:net0)
-                assert index == 0
-            end
-            it "scsi10 returns 10" do
-                index = Fog::Proxmox::ControllerHelper.extract_index('scsi',:scsi10)
-                assert index == 10
-            end
-        end
-
-        describe '#last_index' do
-            it "returns -1" do
-                last = Fog::Proxmox::ControllerHelper.last_index('net',{})
-                assert last == -1
-            end
-            it "returns 0" do
-                last = Fog::Proxmox::ControllerHelper.last_index('net',net)
-                assert last == 0
-            end
-            it "returns 10" do
-                last = Fog::Proxmox::ControllerHelper.last_index('scsi',scsi)
-                assert last == 10
-            end
-        end
-
-        describe '#valid?' do
-            it "returns true" do
-                assert Fog::Proxmox::ControllerHelper.valid?('net','net0')
-            end
-            it "returns false" do
-                assert !Fog::Proxmox::ControllerHelper.valid?('net','sdfdsf')
-            end
-        end
-
-        describe '#select' do
-            it "returns scsi10" do
-                controllers = Fog::Proxmox::ControllerHelper.select(scsi,'scsi')
-                assert controllers.has_key?(:scsi10)
-                assert controllers.has_value?(scsi[:scsi10])
-            end
-            it "returns empty" do
-                controllers = Fog::Proxmox::ControllerHelper.select(net,'scsi')
-                assert controllers.empty?
-            end
-        end
-
-        describe '#collect_controllers' do
-            it "returns scsi0 and ide2" do
-                controllers = Fog::Proxmox::ControllerHelper.collect_controllers(scsi.merge(cdrom))
-                assert controllers.has_key?(:scsi10)
-                assert controllers.has_value?(scsi[:scsi10])
-                assert controllers.has_key?(:ide2)
-                assert controllers.has_value?(cdrom[:ide2])
-            end
-            it "returns rootfs and mp0" do
-                controllers = Fog::Proxmox::ControllerHelper.collect_controllers(rootfs.merge(mp))
-                assert controllers.has_key?(:mp0)
-                assert controllers.has_value?(mp[:mp0])
-                assert controllers.has_key?(:rootfs)
-                assert controllers.has_value?(rootfs[:rootfs])
-            end
-            it "returns empty" do
-                controllers = Fog::Proxmox::ControllerHelper.collect_controllers(net)
-                assert controllers.empty?
-            end
-        end
-    end
+describe Fog::Proxmox::ControllerHelper do
+  let(:net) do
+    { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1' }
+  end
+  let(:net_no_options) do
+    { net0: 'virtio=66:89:C5:59:AA:96' }
+  end
+  let(:net_lxc) do
+    { net0: 'virtio=66:89:C5:59:AA:96,bridge=vmbr0,firewall=1,link_down=1,queues=1,rate=1,tag=1,ip=192.168.56.100/31,ip6=2001:0000:1234:0000:0000:C1C0:ABCD:0876/31' }
+  end
+  let(:scsi) do
+    { scsi10: 'local-lvm:1,cache=none' }
+  end
+  let(:cdrom) do
+    { ide2: 'none,media=cdrom' }
+  end
+  let(:mp) do
+    { mp0: 'local-lvm:1,mp=/opt/path' }
+  end
+  let(:rootfs) do
+    { rootfs: 'local-lvm:1' }
+  end
+
+  describe '#extract' do
+    it 'returns bridge' do
+      bridge = Fog::Proxmox::ControllerHelper.extract('bridge', net[:net0])
+      assert_equal 'vmbr0', bridge
+    end
+
+    it 'returns nil' do
+      bridge = Fog::Proxmox::ControllerHelper.extract('bridge', net_no_options[:net0])
+      assert !bridge
+    end
+
+    it 'returns firewall' do
+      firewall = Fog::Proxmox::ControllerHelper.extract('firewall', net[:net0])
+      assert_equal '1', firewall
+    end
+
+    it 'returns cache' do
+      cache = Fog::Proxmox::ControllerHelper.extract('cache', scsi[:scsi10])
+      assert_equal 'none', cache
+    end
+
+    it 'returns mp' do
+      path = Fog::Proxmox::ControllerHelper.extract('mp', mp[:mp0])
+      assert_equal '/opt/path', path
+    end
+
+    it 'returns cidr ip' do
+      path = Fog::Proxmox::ControllerHelper.extract('ip', net_lxc[:net0])
+      assert_equal '192.168.56.100/31', path
+    end
+
+    it 'returns cidr ip6' do
+      path = Fog::Proxmox::ControllerHelper.extract('ip6', net_lxc[:net0])
+      assert_equal '2001:0000:1234:0000:0000:C1C0:ABCD:0876/31', path
+    end
+  end
+
+  describe '#extract_index' do
+    it 'net0 returns 0' do
+      index = Fog::Proxmox::ControllerHelper.extract_index('net', :net0)
+      assert index == 0
+    end
+
+    it 'scsi10 returns 10' do
+      index = Fog::Proxmox::ControllerHelper.extract_index('scsi', :scsi10)
+      assert index == 10
+    end
+  end
+
+  describe '#last_index' do
+    it 'returns -1' do
+      last = Fog::Proxmox::ControllerHelper.last_index('net', {})
+      assert last == -1
+    end
+
+    it 'returns 0' do
+      last = Fog::Proxmox::ControllerHelper.last_index('net', net)
+      assert last == 0
+    end
+
+    it 'returns 10' do
+      last = Fog::Proxmox::ControllerHelper.last_index('scsi', scsi)
+      assert last == 10
+    end
+  end
+
+  describe '#valid?' do
+    it 'returns true' do
+      assert Fog::Proxmox::ControllerHelper.valid?('net', 'net0')
+    end
+
+    it 'returns false' do
+      assert !Fog::Proxmox::ControllerHelper.valid?('net', 'sdfdsf')
+    end
+  end
+
+  describe '#select' do
+    it 'returns scsi10' do
+      controllers = Fog::Proxmox::ControllerHelper.select(scsi, 'scsi')
+      assert controllers.has_key?(:scsi10)
+      assert controllers.has_value?(scsi[:scsi10])
+    end
+
+    it 'returns empty' do
+      controllers = Fog::Proxmox::ControllerHelper.select(net, 'scsi')
+      assert controllers.empty?
+    end
+  end
+
+  describe '#collect_controllers' do
+    it 'returns scsi0 and ide2' do
+      controllers = Fog::Proxmox::ControllerHelper.collect_controllers(scsi.merge(cdrom))
+      assert controllers.has_key?(:scsi10)
+      assert controllers.has_value?(scsi[:scsi10])
+      assert controllers.has_key?(:ide2)
+      assert controllers.has_value?(cdrom[:ide2])
+    end
+
+    it 'returns rootfs and mp0' do
+      controllers = Fog::Proxmox::ControllerHelper.collect_controllers(rootfs.merge(mp))
+      assert controllers.has_key?(:mp0)
+      assert controllers.has_value?(mp[:mp0])
+      assert controllers.has_key?(:rootfs)
+      assert controllers.has_value?(rootfs[:rootfs])
+    end
+
+    it 'returns empty' do
+      controllers = Fog::Proxmox::ControllerHelper.collect_controllers(net)
+      assert controllers.empty?
+    end
+  end
+end