vagrant-guest-msys2 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3f7a4a1d4dbac452c62e24485f0d3e8888eadf
-  data.tar.gz: e1f593cbb79a14b3e3093dd065a38d77988e50a8
+  metadata.gz: 026ae197e2fb6b998bdff1de9b11cd6fab7e1354
+  data.tar.gz: 4873e8ea80587ca21f15bc21b35ad1b06c09244d
 SHA512:
-  metadata.gz: 71abe576af291dedd846c7771f0c6da3929d268c897659dc2259e070fe5df297576225bb8ab18463c7e70b14bd34f371fc909c01f6fd76f0f259265b36d6eff4
-  data.tar.gz: 5051d0bbb50183fcdefc3ec56e9b24c9c9b46e73ebc9ea46e53644b7d5f819fb173cd83e5d7a746cf925aa0dfbca304b1a70ded4620f97a6ce2c229d36fb4056
+  metadata.gz: 575ef68704c07d8726338c6ac1dd5fef45660eaba36778aa484966aa65ad138b4b7506e31caac62e290c16c42dba99a768dc3395d2fa03d33c648527cd0ef65b
+  data.tar.gz: e25db1a2b8cdcd48767f56036535ad54436ed41c789dc3fe92baa400269ac605ea6d730520439bb3d4094c865e6ff9382e1a3da19b7e25523ed49d9e272901f8

data/lib/vagrant-guest-msys2.rb

@@ -1 +1,15 @@
 require "vagrant-guest-msys2/plugin"
+
+module VagrantPlugins
+  module GuestMSYS2
+    lib_path = Pathname.new(File.expand_path('../vagrant-guest-msys2', __FILE__))
+    autoload :Errors, lib_path.join('errors')
+    
+    # This returns the path to the source of this plugin.
+    #
+    # @return [Pathname]
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/change_host_name.rb

@@ -0,0 +1,39 @@
+require "vagrant-guest-msys2/util/cap_helpers"
+
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      module ChangeHostName
+          def self.change_host_name(machine, name)
+            change_host_name_and_wait(machine, name, machine.config.vm.graceful_halt_timeout)
+          end
+
+          def self.change_host_name_and_wait(machine, name, sleep_timeout)
+            machine.guest.capability(:powershell_check) if machine.guest.capability?(:powershell_check)
+            
+            escaped_name = name.gsub("'", "''")
+            
+            # If the configured name matches the current name, then bail
+            # We cannot use %ComputerName% because it truncates at 15 chars
+            return if machine.communicate.test(Util::CapHelpers.wrap_powershell("if ([System.Net.Dns]::GetHostName() -eq '#{escaped_name}') { exit 0 } exit 1"))
+            
+            # Rename and reboot host if rename succeeded
+            script = <<-EOH.gsub(/^ {14}/, '')
+              $computer = Get-WmiObject -Class Win32_ComputerSystem
+              $retval = $computer.rename('#{escaped_name}').returnvalue
+              if ($retval -eq 0) {
+                shutdown -r -t 5 -f -d p:4:1 -c "Vagrant Rename Computer"
+              }
+              exit $retval
+            EOH
+            machine.ui.info I18n.t("vagrant-guest-msys2.info.run_change_host_name", host: name)
+            machine.communicate.execute(Util::CapHelpers.wrap_powershell(script))
+
+            # Don't continue until the machine has shutdown and rebooted
+            machine.ui.info I18n.t("vagrant-guest-msys2.info.run_wait_for_reboot", host: name)
+            sleep(sleep_timeout)
+          end
+        end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/choose_addressable_ip_addr.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      module ChooseAddressableIPAddr
+        def self.choose_addressable_ip_addr(machine, possible)
+          machine.communicate.tap do |comm|
+            possible.each do |ip|
+              command = "ping -n 1 -w 1 #{ip}"
+              if comm.test(command)
+                return ip
+              end
+            end
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/configure_networks.rb

@@ -0,0 +1,23 @@
+require "log4r"
+require_relative "../guest_network"
+
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      module ConfigureNetworks
+        @@logger = Log4r::Logger.new("vagrant::guest::windows::configure_networks")
+
+        def self.configure_networks(machine, networks)
+          @@logger.debug("Networks: #{networks.inspect}")
+          @@logger.debug("communicator: #{machine.config.vm.communicator.inspect}")
+          
+          guest_network = GuestNetwork.new(machine.communicate)
+          network_adapters = guest_network.network_adapters()
+          @@logger.debug("network_adapters: #{network_adapters}")
+          
+          return
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/insert_public_key.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      class InsertPublicKey
+        def self.insert_public_key(machine, contents)
+          comm = machine.communicate
+          contents = contents.chomp
+
+          remote_path = "/tmp/vagrant-authorized-keys-#{Time.now.to_i}"
+          Tempfile.open("vagrant-msys2-insert-public-key") do |f|
+            f.binmode
+            f.write(contents)
+            f.fsync
+            f.close
+            comm.upload(f.path, remote_path)
+          end
+
+          comm.execute <<-EOH.gsub(/^ {12}/, '')
+            mkdir -p ~/.ssh
+            chmod 0700 ~/.ssh
+            cat '#{remote_path}' >> ~/.ssh/authorized_keys
+            chmod 0600 ~/.ssh/authorized_keys
+
+            # Remove the temporary file
+            rm -f '#{remote_path}'
+          EOH
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/powershell.rb

@@ -0,0 +1,59 @@
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      class Powershell
+        def self.powershell_installed(machine)
+          machine.communicate.test('which powershell')
+        end
+        
+        def self.powershell_install(machine)
+          machine.ui.info I18n.t("vagrant-guest-msys2.info.run_powershell_install")
+          script = <<-EOH.gsub(/^ {12}/, '')
+            set -e
+            OS_VERSION=`echo '' | wmic os get version | grep -o '^[0-9]*\\.[0-9]*'`
+            OS_ARCH=`regtool -l get '\\HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment\\PROCESSOR_ARCHITECTURE' | tr '[:upper:]' '[:lower:]'`
+            
+            if [ "$OS_VERSION" = "5.1" -a "$OS_ARCH" = "x86" ]; then # Windows XP 32-bit
+              pacman -S --noconfirm wget
+              
+              if ! (regtool -l get '\\HKLM\\SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v2.0.50727\\SP' | grep -q "1"); then
+                wget --no-verbose --no-check-certificate "https://download.microsoft.com/download/0/8/c/08c19fa4-4c4f-4ffb-9d6c-150906578c9e/NetFx20SP1_x86.exe" -O "/tmp/NetFx20SP1_x86.exe"
+                /tmp/NetFx20SP1_x86.exe //passive //norestart
+                rm /tmp/NetFx20SP1_x86.exe
+              fi
+              
+              if ! (regtool -l get '\\HKLM\\SOFTWARE\\Microsoft\\PowerShell\\1\\PowerShellEngine\\PowerShellVersion' | grep -q "2\\.0"); then
+                  wget --no-verbose --no-check-certificate "https://download.microsoft.com/download/E/C/E/ECE99583-2003-455D-B681-68DB610B44A4/WindowsXP-KB968930-x86-ENG.exe" -O "/tmp/WindowsXP-KB968930-x86-ENG.exe"
+                  /tmp/WindowsXP-KB968930-x86-ENG.exe //passive //norestart
+                  rm /tmp/WindowsXP-KB968930-x86-ENG.exe
+              fi
+            else
+              (>&2 echo Unsupported OS $OS_VERSION $OS_ARCH)
+            fi
+            
+            if [ -f "c:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" -a ! -f /bin/powershell ]; then
+                echo '#!/bin/sh'$'\\n''"c:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" -inputformat none $@' > /bin/powershell
+                chmod 755 /bin/powershell
+            fi
+            
+            which powershell
+          EOH
+          machine.communicate.execute(script)
+        end
+        
+        def self.powershell_check(machine)
+          if machine.guest.capability?(:powershell_installed)
+            installed = machine.guest.capability(:powershell_installed)
+            if !installed
+              if machine.guest.capability?(:powershell_install)
+                machine.guest.capability(:powershell_install)
+              end
+              installed = machine.guest.capability(:powershell_installed)
+              raise Errors::PowershellNotInstalledInGuest if !installed
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/reboot.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module GuestWindows
+    module Cap
+      class Reboot
+        def self.wait_for_reboot(machine)
+          return if machine.config.vm.communicator != :ssh
+          
+          script  = File.expand_path("../../scripts/reboot_detect.ps1", __FILE__)
+          script  = File.read(script)
+          while machine.communicate.execute(script, error_check: false) != 0
+            sleep 10
+          end
+
+          # This re-establishes our symbolic links if they were
+          # created between now and a reboot
+          machine.communicate.execute("net use", error_check: false)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/remove_public_key.rb

@@ -0,0 +1,24 @@
+require "vagrant/util/shell_quote"
+
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      class RemovePublicKey
+        def self.remove_public_key(machine, contents)
+          contents = contents.chomp
+          contents = Vagrant::Util::ShellQuote.escape(contents, "'")
+
+          machine.communicate.tap do |comm|
+            if comm.test("test -f ~/.ssh/authorized_keys")
+              comm.execute(<<SCRIPT)
+sed -e '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.new
+mv ~/.ssh/authorized_keys.new ~/.ssh/authorized_keys
+chmod 600 ~/.ssh/authorized_keys
+SCRIPT
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/cap/rsync.rb

@@ -3,7 +3,7 @@ module VagrantPlugins
     module Cap
       class RSync
         def self.rsync_installed(machine)
-          machine.communicate.test("which rsync")
+          machine.communicate.test('which rsync')
         end
         
         def self.rsync_install(machine)
@@ -12,7 +12,7 @@ module VagrantPlugins
         end
 
         def self.rsync_command(machine)
-          "rsync"
+          'rsync'
         end
 
         def self.rsync_pre(machine, opts)

data/lib/vagrant-guest-msys2/errors.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+  module GuestMSYS2
+    module Errors
+      # A convenient superclass for all our errors.
+      class MSYS2Error < Vagrant::Errors::VagrantError
+        error_namespace("vagrant-guest-msys2.errors")
+      end
+
+      class RenameComputerFailed < MSYS2Error
+        error_key(:rename_computer_failed)
+      end
+      
+      class PowershellNotInstalledInGuest < MSYS2Error
+        error_key(:powershell_not_installed_in_guest)
+      end
+      
+      class PowershellInstallationFailed < MSYS2Error
+        error_key(:powershell_installation_failed)
+      end
+      
+    end
+  end
+end

data/lib/vagrant-guest-msys2/guest_network.rb

@@ -0,0 +1,127 @@
+require "log4r"
+
+module VagrantPlugins
+  module GuestMSYS2
+    # Manages the remote Windows guest network.
+    class GuestNetwork
+      PS_GET_WSMAN_VER = '((test-wsman).productversion.split(" ") | select -last 1).split("\.")[0]'
+      WQL_NET_ADAPTERS_V2 = 'SELECT * FROM Win32_NetworkAdapter WHERE MACAddress IS NOT NULL'
+
+      def initialize(communicator)
+        @logger       = Log4r::Logger.new("vagrant::windows::guestnetwork")
+        @communicator = communicator
+      end
+
+      # Returns an array of all NICs on the guest. Each array entry is a
+      # Hash of the NICs properties.
+      #
+      # @return [Array]
+      def network_adapters
+        @logger.debug("querying network adapters")
+        
+        wsman_version == 2? network_adapters_v2_winrm : network_adapters_v3_winrm
+      end
+
+      # Checks to see if the specified NIC is currently configured for DHCP.
+      #
+      # @return [Boolean]
+      def is_dhcp_enabled(nic_index)
+        cmd = <<-EOH
+          if (Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter "Index=#{nic_index} and DHCPEnabled=True") {
+            exit 0
+          }
+          exit 1
+        EOH
+        @communicator.test(cmd)
+      end
+
+      # Configures the specified interface for DHCP
+      #
+      # @param [Integer] The interface index.
+      # @param [String] The unique name of the NIC, such as 'Local Area Connection'.
+      def configure_dhcp_interface(nic_index, net_connection_id)
+        @logger.info("Configuring NIC #{net_connection_id} for DHCP")
+        if !is_dhcp_enabled(nic_index)
+          netsh = "netsh interface ip set address \"#{net_connection_id}\" dhcp"
+          @communicator.execute(netsh)
+        end
+      end
+
+      # Configures the specified interface using a static address
+      #
+      # @param [Integer] The interface index.
+      # @param [String] The unique name of the NIC, such as 'Local Area Connection'.
+      # @param [String] The static IP address to assign to the specified NIC.
+      # @param [String] The network mask to use with the static IP.
+      def configure_static_interface(nic_index, net_connection_id, ip, netmask)
+        @logger.info("Configuring NIC #{net_connection_id} using static ip #{ip}")
+        #netsh interface ip set address "Local Area Connection 2" static 192.168.33.10 255.255.255.0
+        netsh = "netsh interface ip set address \"#{net_connection_id}\" static #{ip} #{netmask}"
+        @communicator.execute(netsh)
+      end
+
+      # Sets all networks on the guest to 'Work Network' mode. This is
+      # to allow guest access from the host via a private IP on Win7
+      # https://github.com/WinRb/vagrant-windows/issues/63
+      def set_all_networks_to_work
+        @logger.info("Setting all networks to 'Work Network'")
+        command = File.read(File.expand_path("../scripts/set_work_network.ps1", __FILE__))
+        @communicator.execute(command)
+      end
+
+      protected
+
+      # Checks the WinRS version on the guest. Usually 2 on Windows 7/2008
+      # and 3 on Windows 8/2012.
+      #
+      # @return [Integer]
+      def wsman_version
+        @logger.debug("querying WSMan version")
+        version = ''
+        @communicator.execute(PS_GET_WSMAN_VER) do |type, line|
+          version = version + "#{line}" if type == :stdout && !line.nil?
+        end
+        @logger.debug("wsman version: #{version}")
+        Integer(version)
+      end
+
+      # Returns an array of all NICs on the guest. Each array entry is a
+      # Hash of the NICs properties. This method should only be used on
+      # guests that have WinRS version 2.
+      #
+      # @return [Array]
+      def network_adapters_v2_winrm
+        @logger.debug("querying network adapters")
+
+        # Get all NICs that have a MAC address
+        # https://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
+        adapters = @communicator.execute(WQL_NET_ADAPTERS_V2, { shell: :wql } )[:win32_network_adapter]
+        @logger.debug("#{adapters.inspect}")
+        return adapters
+      end
+
+      # Returns an array of all NICs on the guest. Each array entry is a
+      # Hash of the NICs properties. This method should only be used on
+      # guests that have WinRS version 3.
+      #
+      # This method is a workaround until the WinRM gem supports WinRS version 3.
+      #
+      # @return [Array]
+      def network_adapters_v3_winrm
+        command = File.read(File.expand_path("../scripts/winrs_v3_get_adapters.ps1", __FILE__))
+        output = ""
+        @communicator.execute(command) do |type, line|
+          output = output + "#{line}" if type == :stdout && !line.nil?
+        end
+
+        adapters = []
+        JSON.parse(output).each do |nic|
+          adapters << nic.inject({}){ |memo,(k,v)| memo[k.to_sym] = v; memo }
+        end
+
+        @logger.debug("#{adapters.inspect}")
+        return adapters
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/plugin.rb

@@ -11,6 +11,8 @@ module VagrantPlugins
       description "MSYS2 guest support."
 
       guest('msys2') do
+        init!
+        
         require File.expand_path("../guest", __FILE__)
         Guest
       end
@@ -21,13 +23,13 @@ module VagrantPlugins
       end
       
       guest_capability("msys2", "insert_public_key") do
-        require Vagrant.source_root.join('plugins/guests/linux/cap/insert_public_key') 
-        VagrantPlugins::GuestLinux::Cap::InsertPublicKey
+        require_relative "cap/insert_public_key"
+        Cap::InsertPublicKey
       end
       
       guest_capability("msys2", "remove_public_key") do
-        require Vagrant.source_root.join('plugins/guests/linux/cap/remove_public_key')
-        VagrantPlugins::GuestLinux::Cap::RemovePublicKey
+        require_relative "cap/remove_public_key"
+        Cap::RemovePublicKey
       end
 
       guest_capability("msys2", "rsync_installed") do
@@ -55,6 +57,50 @@ module VagrantPlugins
         Cap::RSync
       end
       
+      guest_capability("msys2", "choose_addressable_ip_addr") do
+        require_relative "cap/choose_addressable_ip_addr"
+        Cap::ChooseAddressableIPAddr
+      end
+      
+      guest_capability("msys2", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("msys2", "wait_for_reboot") do
+        require_relative "cap/reboot"
+        Cap::Reboot
+      end
+    
+      guest_capability("msys2", "powershell_check") do
+        require_relative "cap/powershell"
+        Cap::Powershell
+      end
+
+      guest_capability("msys2", "powershell_install") do
+        require_relative "cap/powershell"
+        Cap::Powershell
+      end
+      
+      guest_capability("msys2", "powershell_installed") do
+        require_relative "cap/powershell"
+        Cap::Powershell
+      end
+      
+      guest_capability("msys2", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+      
+      protected
+
+      def self.init!
+        return if defined?(@_init)
+        I18n.load_path << File.expand_path('locales/en.yml', VagrantPlugins::GuestMSYS2.source_root)
+        I18n.reload!
+        @_init = true
+      end
+    
     end
   end
 end

data/lib/vagrant-guest-msys2/util/cap_helpers.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module GuestMSYS2
+    module Util
+      module CapHelpers
+        def self.wrap_powershell(script)
+          wrapped = <<-EOH.gsub(/^ {12}/, '')
+            cat << 'EOF' | powershell -InputFormat none -Command - 
+            #{script}
+            EOF
+          EOH
+          wrapped
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guest-msys2/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GuestMSYS2
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/locales/en.yml

@@ -0,0 +1,17 @@
+en:
+  vagrant-guest-msys2:
+    info:
+      run_powershell_install: "Installing powershell to the VM..."      
+      run_change_host_name: "Changing hostname to %{host}"
+      run_wait_for_reboot: "Waiting until %{host} reboots"
+      
+    errors:
+      rename_computer_failed: |-
+        Renaming the MSYS2 guest failed. Most often this is because you've
+        specified a FQDN instead of just a host name.
+
+        Ensure the new guest name is properly formatted. Standard names may
+        contain letters (a-z, A-Z), numbers (0-9), and hypens (-), but no
+        spaces or periods (.). The name may not consist entirely of digits.
+      
+      powershell_not_installed_in_guest: "Powershell is not installed in this VM."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guest-msys2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tobias
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies: []
 description: 'Adds MSYS2 (https://sourceforge.net/p/msys2/wiki/Home/) as a guest for
   Vagrant. '
@@ -20,9 +20,19 @@ extra_rdoc_files: []
 files:
 - lib/vagrant-guest-msys2.rb
 - lib/vagrant-guest-msys2/plugin.rb
+- lib/vagrant-guest-msys2/cap/change_host_name.rb
+- lib/vagrant-guest-msys2/cap/choose_addressable_ip_addr.rb
+- lib/vagrant-guest-msys2/cap/powershell.rb
+- lib/vagrant-guest-msys2/cap/remove_public_key.rb
 - lib/vagrant-guest-msys2/cap/halt.rb
+- lib/vagrant-guest-msys2/cap/configure_networks.rb
+- lib/vagrant-guest-msys2/cap/reboot.rb
 - lib/vagrant-guest-msys2/cap/rsync.rb
+- lib/vagrant-guest-msys2/cap/insert_public_key.rb
+- lib/vagrant-guest-msys2/util/cap_helpers.rb
+- lib/vagrant-guest-msys2/guest_network.rb
 - lib/vagrant-guest-msys2/version.rb
+- lib/vagrant-guest-msys2/errors.rb
 - lib/vagrant-guest-msys2/guest.rb
 - Rakefile
 - CHANGELOG.md
@@ -30,6 +40,7 @@ files:
 - Gemfile
 - README.md
 - LICENSE
+- locales/en.yml
 - .gitignore
 homepage: https://github.com/tsmolka/vagrant-guest-msys2
 licenses: