vagrant-guest-msys2 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 026ae197e2fb6b998bdff1de9b11cd6fab7e1354
-  data.tar.gz: 4873e8ea80587ca21f15bc21b35ad1b06c09244d
+  metadata.gz: af7802cda0568d6a063b68cb3452f67648159dd0
+  data.tar.gz: fcfbc1a87759bb101f21de94f6b8810bc968c4cc
 SHA512:
-  metadata.gz: 575ef68704c07d8726338c6ac1dd5fef45660eaba36778aa484966aa65ad138b4b7506e31caac62e290c16c42dba99a768dc3395d2fa03d33c648527cd0ef65b
-  data.tar.gz: e25db1a2b8cdcd48767f56036535ad54436ed41c789dc3fe92baa400269ac605ea6d730520439bb3d4094c865e6ff9382e1a3da19b7e25523ed49d9e272901f8
+  metadata.gz: a395497aeffc997adbcf174e3393db6b91c3930ef52d0417ba8a18d8e889888a73e38bdaec566db87b395c5045e7d3b38afbebd7cf30a8ef92eb62d37557f0cf
+  data.tar.gz: 0a14c3a8f140356d7e35f77796b634c9eb23466468e71639f93613061ae78f8ad83430ca0f7d223e631858689580dec81aa202b041b540462102879682dc7520

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.2.3
+
+before_install:
+  - rvm @global do gem uninstall bundler --all --executables
+  - gem uninstall bundler --all --executables
+  - gem install bundler --version '1.12.5'
+
+sudo: false

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/tsmolka/vagrant-guest-msys2.svg?branch=master)](https://travis-ci.org/tsmolka/vagrant-guest-msys2) [![Gem Version](https://badge.fury.io/rb/vagrant-guest-msys2.svg)](http://badge.fury.io/rb/vagrant-guest-msys2)
+
 vagrant-guest-msys2
 ==============
 

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

@@ -9,8 +9,6 @@ module VagrantPlugins
           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

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

@@ -0,0 +1,40 @@
+require "vagrant/util/template_renderer"
+require "vagrant-guest-msys2/util/cap_helpers"
+
+module VagrantPlugins
+  module GuestMSYS2
+    module Cap
+      class MountSharedFolder
+        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
+          mount_shared_folder(machine, name, guestpath, "\\\\vboxsrv\\")
+        end
+
+        def self.mount_vmware_shared_folder(machine, name, guestpath, options)
+          mount_shared_folder(machine, name, guestpath, "\\\\vmware-host\\Shared Folders\\")
+        end
+
+        def self.mount_parallels_shared_folder(machine, name, guestpath, options)
+          mount_shared_folder(machine, name, guestpath, "\\\\psf\\")
+        end
+
+        def self.mount_smb_shared_folder(machine, name, guestpath, options)
+          machine.communicate.execute("cmdkey -add:#{options[:smb_host]} -user:#{options[:smb_username]} -pass:#{options[:smb_password]}")
+          mount_shared_folder(machine, name, guestpath, "\\\\#{options[:smb_host]}\\")
+        end
+
+        protected
+
+        def self.mount_shared_folder(machine, name, guestpath, vm_provider_unc_base)
+          name = name.gsub(/[\/\/]/,'_').sub(/^_/, '')
+          path = File.expand_path("../../scripts/mount_volume.ps1", __FILE__)
+          script = Vagrant::Util::TemplateRenderer.render(path, options: {
+            mount_point: guestpath,
+            share_name: name,
+            vm_provider_unc_path: vm_provider_unc_base + name,
+          })
+          machine.communicate.execute(Util::CapHelpers.wrap_powershell(script))
+        end
+      end
+    end
+  end
+end

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

@@ -77,21 +77,16 @@ module VagrantPlugins
         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
       
+      guest_capability("msys2", "mount_virtualbox_shared_folder") do
+        require_relative "cap/mount_shared_folder"
+        Cap::MountSharedFolder
+      end
+      
       protected
 
       def self.init!

data/lib/vagrant-guest-msys2/scripts/mount_volume.ps1.erb

@@ -0,0 +1,48 @@
+function Test-ReparsePoint([string]$path) {
+  $file = Get-Item $path -Force -ea 0
+  return [bool]($file.Attributes -band [IO.FileAttributes]::ReparsePoint)
+}
+
+$MountPoint = [System.IO.Path]::GetFullPath("<%= options[:mount_point] %>")
+$ShareName = "<%= options[:share_name] %>"
+$VmProviderUncPath = "<%= options[:vm_provider_unc_path] %>"
+
+# https://github.com/BIAINC/vagrant-windows/issues/4
+# Not sure why this works, but it does.
+
+& net use $ShareName 2>&1 | Out-Null
+
+Write-Output "Attempting to mount $ShareName to $MountPoint"
+if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
+{
+  Write-Output "Junction already exists, so I will delete it"
+  # Powershell refuses to delete junctions, oh well use cmd
+  cmd /c rd "$MountPoint"
+
+  if ( $LASTEXITCODE -ne 0 )
+  {
+    Write-Error "Failed to delete symbolic link at $MountPoint"
+    exit 1
+  }
+
+}
+elseif(Test-Path $MountPoint)
+{
+  Write-Output "Mount point already exists and is not a symbolic link"
+  exit 1
+}
+
+$BaseDirectory = [System.IO.Path]::GetDirectoryName($MountPoint)
+
+if (-not (Test-Path $BaseDirectory))
+{
+  Write-Output "Creating parent directory for mount point $BaseDirectory"
+  New-Item $BaseDirectory -Type Directory -Force | Out-Null
+}
+
+& cmd.exe /c mklink /D "$MountPoint" "$VmProviderUncPath" | out-null
+
+if ( $LASTEXITCODE -ne 0 )
+{
+  exit 1
+}

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

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

data/vagrant-guest-msys2.gemspec

@@ -14,37 +14,9 @@ Gem::Specification.new do |s|
   s.description   = "Adds MSYS2 (https://sourceforge.net/p/msys2/wiki/Home/) as a guest for Vagrant. "
   s.homepage      = "https://github.com/tsmolka/vagrant-guest-msys2"
   s.required_rubygems_version = ">= 1.3.6"
-
-  # Note that the entire gitignore(5) syntax is not supported, specifically
-  # the "!" syntax, but it should mostly work correctly.
-  root_path      = File.dirname(__FILE__)
-  all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  gitignore_path = File.join(root_path, ".gitignore")
-  gitignore      = File.readlines(gitignore_path)
-  gitignore.map!    { |line| line.chomp.strip }
-  gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  unignored_files = all_files.reject do |file|
-    # Ignore any directories, the gemspec only cares about files
-    next true if File.directory?(file)
-
-    # Ignore any paths that match anything in the gitignore. We do
-    # two tests here:
-    #
-    #   - First, test to see if the entire path matches the gitignore.
-    #   - Second, match if the basename does, this makes it so that things
-    #     like '.DS_Store' will match sub-directories too (same behavior
-    #     as git).
-    #
-    gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-        File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-    end
-  end
-
-  s.files         = unignored_files
-  s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
+  root_path       = File.dirname(__FILE__)
+  
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.require_path  = 'lib'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guest-msys2
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tobias
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies: []
 description: 'Adds MSYS2 (https://sourceforge.net/p/msys2/wiki/Home/) as a guest for
   Vagrant. '
@@ -18,30 +18,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
 - 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/halt.rb
+- lib/vagrant-guest-msys2/cap/insert_public_key.rb
+- lib/vagrant-guest-msys2/cap/mount_shared_folder.rb
 - lib/vagrant-guest-msys2/cap/reboot.rb
+- lib/vagrant-guest-msys2/cap/remove_public_key.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
-- vagrant-guest-msys2.gemspec
-- Gemfile
-- README.md
-- LICENSE
+- lib/vagrant-guest-msys2/guest_network.rb
+- lib/vagrant-guest-msys2/plugin.rb
+- lib/vagrant-guest-msys2/scripts/mount_volume.ps1.erb
+- lib/vagrant-guest-msys2/util/cap_helpers.rb
+- lib/vagrant-guest-msys2/version.rb
 - locales/en.yml
-- .gitignore
+- vagrant-guest-msys2.gemspec
 homepage: https://github.com/tsmolka/vagrant-guest-msys2
 licenses:
 - GPL-2.0
@@ -52,17 +54,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: MSYS2 guest for Vagrant

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

@@ -1,59 +0,0 @@
-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