vagrant-libvirt 0.0.36 → 0.0.37

data/lib/vagrant-libvirt/action/wait_till_up.rb

@@ -6,14 +6,13 @@ require 'vagrant/util/retryable'
 module VagrantPlugins
   module ProviderLibvirt
     module Action
-
       # Wait till domain is started, till it obtains an IP address and is
       # accessible via ssh.
       class WaitTillUp
         include Vagrant::Util::Retryable
 
-        def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::wait_till_up")
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::wait_till_up')
           @app = app
         end
 
@@ -23,63 +22,63 @@ module VagrantPlugins
 
           # Get domain object
           domain = env[:machine].provider.driver.get_domain(env[:machine].id.to_s)
-          if domain == nil
+          if domain.nil?
             raise Errors::NoDomainError,
-              :error_message => "Domain #{env[:machine].id} not found"
+                  error_message: "Domain #{env[:machine].id} not found"
           end
 
           # Wait for domain to obtain an ip address. Ip address is searched
           # from arp table, either localy or remotely via ssh, if libvirt
           # connection was done via ssh.
           env[:ip_address] = nil
-          env[:metrics]["instance_ip_time"] = Util::Timer.time do
+          env[:metrics]['instance_ip_time'] = Util::Timer.time do
             @logger.debug("Searching for IP for MAC address: #{domain.mac}")
-            env[:ui].info(I18n.t("vagrant_libvirt.waiting_for_ip"))
-            retryable(:on => Fog::Errors::TimeoutError, :tries => 300) do
+            env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ip'))
+            retryable(on: Fog::Errors::TimeoutError, tries: 300) do
               # If we're interrupted don't worry about waiting
               return terminate(env) if env[:interrupted]
 
               # Wait for domain to obtain an ip address
-              domain.wait_for(2) {
-                addresses.each_pair do |type, ip|
-                  env[:ip_address] = ip[0] if ip[0] != nil
+              domain.wait_for(2) do
+                addresses.each_pair do |_type, ip|
+                  env[:ip_address] = ip[0] unless ip[0].nil?
                 end
-                env[:ip_address] != nil
-              }
+                !env[:ip_address].nil?
+              end
             end
           end
           @logger.info("Got IP address #{env[:ip_address]}")
-          @logger.info("Time for getting IP: #{env[:metrics]["instance_ip_time"]}")
-          
+          @logger.info("Time for getting IP: #{env[:metrics]['instance_ip_time']}")
+
           # Machine has ip address assigned, now wait till we are able to
           # connect via ssh.
-          env[:metrics]["instance_ssh_time"] = Util::Timer.time do
-            env[:ui].info(I18n.t("vagrant_libvirt.waiting_for_ssh"))
-            retryable(:on => Fog::Errors::TimeoutError, :tries => 60) do
+          env[:metrics]['instance_ssh_time'] = Util::Timer.time do
+            env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ssh'))
+            retryable(on: Fog::Errors::TimeoutError, tries: 60) do
               # If we're interrupted don't worry about waiting
               next if env[:interrupted]
 
               # Wait till we are able to connect via ssh.
-              while true
+              loop do
                 # If we're interrupted then just back out
                 break if env[:interrupted]
                 break if env[:machine].communicate.ready?
                 sleep 2
-              end            
+              end
             end
           end
           # if interrupted above, just terminate immediately
           return terminate(env) if env[:interrupted]
-          @logger.info("Time for SSH ready: #{env[:metrics]["instance_ssh_time"]}")
+          @logger.info("Time for SSH ready: #{env[:metrics]['instance_ssh_time']}")
 
           # Booted and ready for use.
-          #env[:ui].info(I18n.t("vagrant_libvirt.ready"))
-          
+          # env[:ui].info(I18n.t("vagrant_libvirt.ready"))
+
           @app.call(env)
         end
 
         def recover(env)
-          return if env["vagrant.error"].is_a?(Vagrant::Errors::VagrantError)
+          return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
 
           # Undo the import
           terminate(env)
@@ -88,7 +87,7 @@ module VagrantPlugins
         def terminate(env)
           if env[:machine].provider.state.id != :not_created
             # If we're not supposed to destroy on error then just return
-            return if !env[:destroy_on_error]
+            return unless env[:destroy_on_error]
 
             destroy_env = env.dup
             destroy_env.delete(:interrupted)
@@ -101,4 +100,3 @@ module VagrantPlugins
     end
   end
 end
-

data/lib/vagrant-libvirt/action.rb

@@ -105,7 +105,7 @@ module VagrantPlugins
                 b3.use ForwardPorts
                 b3.use PrepareNFSSettings
                 b3.use ShareFolders
-             end
+              end
             end
           end
         end
@@ -118,7 +118,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ClearForwardedPorts
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -128,7 +128,7 @@ module VagrantPlugins
             end
 
             b2.use Call, IsRunning do |env2, b3|
-              next if !env2[:result]
+              next unless env2[:result]
 
               # VM is running, halt it.
               b3.use HaltDomain
@@ -142,7 +142,7 @@ module VagrantPlugins
       def self.action_reload
         Vagrant::Action::Builder.new.tap do |b|
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -168,15 +168,11 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               # Try to remove stale volumes anyway
               b2.use SetNameOfDomain
-              if env[:machine].config.vm.box
-                b2.use RemoveStaleVolume
-              end
-              if !env[:result]
-                b2.use MessageNotCreated
-              end
+              b2.use RemoveStaleVolume if env[:machine].config.vm.box
+              b2.use MessageNotCreated unless env[:result]
 
               next
             end
@@ -195,13 +191,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
             b2.use Call, IsRunning do |env2, b3|
-              if !env2[:result]
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -217,13 +213,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
             b2.use Call, IsRunning do |env2, b3|
-              if !env2[:result]
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -241,13 +237,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
             b2.use Call, IsRunning do |env2, b3|
-              if !env2[:result]
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -263,13 +259,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
             b2.use Call, IsSuspended do |env2, b3|
-              if !env2[:result]
+              unless env2[:result]
                 b3.use MessageNotSuspended
                 next
               end
@@ -291,13 +287,13 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
             b2.use Call, IsRunning do |env2, b3|
-              if !env2[:result]
+              unless env2[:result]
                 b3.use MessageNotRunning
                 next
               end
@@ -305,7 +301,6 @@ module VagrantPlugins
               b3.use SSHRun
             end
           end
-
         end
       end
 
@@ -351,7 +346,7 @@ module VagrantPlugins
       autoload :WaitTillUp, action_root.join('wait_till_up')
       autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
 
-      autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
+      autoload :SSHRun, 'vagrant/action/builtin/ssh_run'
       autoload :HandleBox, 'vagrant/action/builtin/handle_box'
       autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
       autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'

data/lib/vagrant-libvirt/cap/mount_p9.rb

@@ -1,5 +1,5 @@
-require "digest/md5"
-require "vagrant/util/retryable"
+require 'digest/md5'
+require 'vagrant/util/retryable'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -8,30 +8,31 @@ module VagrantPlugins
         extend Vagrant::Util::Retryable
 
         def self.mount_p9_shared_folder(machine, folders)
-          folders.each do |name, opts|
+          folders.each do |_name, opts|
             # Expand the guest path so we can handle things like "~/vagrant"
             expanded_guest_path = machine.guest.capability(
-              :shell_expand_guest_path, opts[:guestpath])
+              :shell_expand_guest_path, opts[:guestpath]
+            )
 
             # Do the actual creating and mounting
             machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
 
             # Mount
-            mount_tag = Digest::MD5.new.update(opts[:hostpath]).to_s[0,31]
+            mount_tag = Digest::MD5.new.update(opts[:hostpath]).to_s[0, 31]
 
-            mount_opts="-o trans=virtio"
+            mount_opts = '-o trans=virtio'
             mount_opts += ",access=#{opts[:owner]}" if opts[:owner]
             mount_opts += ",version=#{opts[:version]}" if opts[:version]
             mount_opts += ",#{opts[:mount_opts]}" if opts[:mount_opts]
 
             mount_command = "mount -t 9p #{mount_opts} '#{mount_tag}' #{expanded_guest_path}"
-            retryable(:on => Vagrant::Errors::LinuxMountFailed,
-                      :tries => 5,
-                      :sleep => 3) do
+            retryable(on: Vagrant::Errors::LinuxMountFailed,
+                      tries: 5,
+                      sleep: 3) do
               machine.communicate.sudo('modprobe 9p')
               machine.communicate.sudo('modprobe 9pnet_virtio')
               machine.communicate.sudo(mount_command,
-                      :error_class => Vagrant::Errors::LinuxMountFailed)
+                                       error_class: Vagrant::Errors::LinuxMountFailed)
             end
           end
         end

data/lib/vagrant-libvirt/cap/nic_mac_addresses.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
           # and the mac as uppercase string without colons as value
           nic_macs = {}
           machine.provider.mac_addresses.each do |index, mac|
-            nic_macs[index+1] = mac.upcase.gsub(':','')
+            nic_macs[index + 1] = mac.upcase.delete(':')
           end
           nic_macs
         end

data/lib/vagrant-libvirt/cap/synced_folder.rb

@@ -1,7 +1,7 @@
 require 'log4r'
 require 'ostruct'
 require 'nokogiri'
-require "digest/md5"
+require 'digest/md5'
 
 require 'vagrant/util/subprocess'
 require 'vagrant/errors'
@@ -19,7 +19,7 @@ module VagrantPlugins
         @logger = Log4r::Logger.new('vagrant_libvirt::synced_folders::9p')
       end
 
-      def usable?(machine, raise_error = false)
+      def usable?(machine, _raise_error = false)
         # bail now if not using libvirt since checking version would throw error
         return false unless machine.provider_name == :libvirt
 
@@ -36,43 +36,43 @@ module VagrantPlugins
         begin
           # loop through folders
           folders.each do |id, folder_opts|
-            folder_opts.merge!({  target: id,
-                                  accessmode: 'passthrough',
-                                  mount: true,
-                                  readonly: nil }) { |_k, ov, _nv| ov }
+            folder_opts.merge!(target: id,
+                               accessmode: 'passthrough',
+                               mount: true,
+                               readonly: nil) { |_k, ov, _nv| ov }
 
-            mount_tag = Digest::MD5.new.update(folder_opts[:hostpath]).to_s[0,31]
+            mount_tag = Digest::MD5.new.update(folder_opts[:hostpath]).to_s[0, 31]
             folder_opts[:mount_tag] = mount_tag
-            
+
             machine.ui.info "================\nMachine id: #{machine.id}\nShould be mounting folders\n #{id}, opts: #{folder_opts}"
-            
-            xml =  to_xml('filesystem', folder_opts)
+
+            xml = to_xml('filesystem', folder_opts)
             # puts "<<<<< XML:\n #{xml}\n >>>>>"
             @conn.lookup_domain_by_uuid(machine.id).attach_device(xml, 0)
           end
         rescue => e
           machine.ui.error("could not attach device because: #{e}")
           raise VagrantPlugins::ProviderLibvirt::Errors::AttachDeviceError,
-            error_message: e.message
+                error_message: e.message
         end
       end
 
-      # TODO once up, mount folders
+      # TODO: once up, mount folders
       def enable(machine, folders, _opts)
         # Go through each folder and mount
         machine.ui.info('mounting p9 share in guest')
         # Only mount folders that have a guest path specified.
         mount_folders = {}
         folders.each do |id, opts|
-          if opts[:mount] && opts[:guestpath] && ! opts[:guestpath].empty?
-            mount_folders[id] = opts.dup
-            # merge common options if not given
-            mount_folders[id].merge!(version: '9p2000.L') { |_k, ov, _nv| ov }
-          end
+          next unless opts[:mount] && opts[:guestpath] && !opts[:guestpath].empty?
+          mount_folders[id] = opts.dup
+          # merge common options if not given
+          mount_folders[id].merge!(version: '9p2000.L') { |_k, ov, _nv| ov }
         end
         # Mount the actual folder
         machine.guest.capability(
-            :mount_p9_shared_folder, mount_folders)
+          :mount_p9_shared_folder, mount_folders
+        )
       end
 
       def cleanup(machine, _opts)
@@ -84,7 +84,8 @@ module VagrantPlugins
           if machine.id && machine.id != ''
             dom = @conn.lookup_domain_by_uuid(machine.id)
             Nokogiri::XML(dom.xml_desc).xpath(
-              '/domain/devices/filesystem').each do |xml|
+              '/domain/devices/filesystem'
+            ).each do |xml|
               dom.detach_device(xml.to_s)
               machine.ui.info 'Cleaned up shared folders'
             end