vagrant-windows 1.0.3 → 1.2.0

data/lib/vagrant-windows/scripts/cheftaskrun.ps1.erb

@@ -0,0 +1,16 @@
+$exitCode = -1
+Set-ExecutionPolicy Unrestricted -force;
+
+Try
+{
+  "running" | Out-File "<%= options[:chef_task_running] %>"
+  $process = (Start-Process "<%= options[:chef_binary_path] %>" -ArgumentList "<%= options[:chef_arguments] %>" -NoNewWindow -PassThru -Wait -RedirectStandardOutput "<%= options[:chef_stdout_log] %>" -RedirectStandardError "<%= options[:chef_stderr_log] %>")
+  $exitCode = $process.ExitCode
+}
+Finally
+{
+  $exitCode | Out-File "<%= options[:chef_task_exitcode] %>"
+  del "<%= options[:chef_task_running] %>"
+}
+
+exit $exitCode

data/lib/vagrant-windows/scripts/command_alias.ps1

@@ -16,6 +16,10 @@ function test ([Switch] $d, [String] $path) {
   exit 1
 }
 
+function chmod {
+  exit 0
+}
+
 function chown {
   exit 0
 }

data/lib/vagrant-windows/scripts/{mount_volume.ps1.erb → mount_volume.virtualbox.ps1.erb}

@@ -6,7 +6,7 @@ function Test-ReparsePoint([string]$path) {
 
 
 $MountPoint = [System.IO.Path]::GetFullPath("<%= options[:mount_point] %>")
-$ShareName = "<%= options[:name] %>"
+$ShareName = "<%= options[:share_name] %>"
 
 # https://github.com/BIAINC/vagrant-windows/issues/4
 # Not sure why this works, but it does.

data/lib/vagrant-windows/scripts/mount_volume.vmware.ps1.erb

@@ -0,0 +1,49 @@
+
+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] %>"
+
+# https://github.com/BIAINC/vagrant-windows/issues/4
+# Not sure why this works, but it does.
+
+& net use $ShareName 2>&1 | Out-Null
+
+Write-Debug "Attempting to mount $ShareName to $MountPoint"
+if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
+{
+  Write-Debug "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-Debug "Mount point already exists and is not a symbolic link"
+  exit 1
+}
+
+$BaseDirectory = [System.IO.Path]::GetDirectoryName($MountPoint)
+
+if (-not (Test-Path $BaseDirectory))
+{
+  Write-Debug "Creating parent directory for mount point $BaseDirectory"
+  New-Item $BaseDirectory -Type Directory -Force | Out-Null
+}
+
+cmd /c mklink /D "$MountPoint" "\\vmware-host\Shared Folders\$ShareName" | out-null
+
+if ( $LASTEXITCODE -ne 0 )
+{
+  exit 1
+}

data/lib/vagrant-windows/scripts/set_work_network.ps1

@@ -0,0 +1,6 @@
+# Get network connections 
+$networkListManager = [Activator]::CreateInstance([Type]::GetTypeFromCLSID([Guid]"{DCB00C01-570F-4A9B-8D69-199FDBA5723B}")) 
+$connections = $networkListManager.GetNetworkConnections() 
+
+# Set network location to Private for all networks 
+$connections | % {$_.GetNetwork().SetCategory(1)}

data/lib/vagrant-windows/scripts/winrs_v3_get_adapters.ps1

@@ -0,0 +1,11 @@
+$adapters = get-ciminstance win32_networkadapter -filter "macaddress is not null" 
+$processed = @()
+foreach ($adapter in $adapters) {
+  $Processed += new-object PSObject -Property @{
+    mac_address = $adapter.macaddress
+    net_connection_id = $adapter.netconnectionid
+    interface_index = $adapter.interfaceindex
+    index = $adapter.index
+  }
+} 
+convertto-json -inputobject $processed

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.0.3"
+  VERSION = "1.2.0"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'bundler'
+Bundler.setup
+Bundler.require
+
+require "vagrant-windows/config/windows"
+require "vagrant-windows/config/winrm"
+require "vagrant-windows/communication/guestnetwork"
+require "vagrant-windows/communication/winrmshell"
+require "vagrant-windows/helper"
+
+

data/spec/vagrant-windows/config_spec.rb

@@ -1,7 +1,6 @@
-require "vagrant-windows/config/windows"
-require "vagrant-windows/config/winrm"
+require 'spec_helper'
 
-describe VagrantWindows::Config::Windows do
+describe VagrantWindows::Config::Windows , :unit => true do
   let(:instance) { described_class.new }
 
   describe "defaults" do
@@ -42,7 +41,7 @@ describe VagrantWindows::Config::WinRM do
     its("host")       { should == "localhost" }
     its("port")       { should == 5985 }
     its("guest_port") { should == 5985 }
-    its("max_tries")  { should == 12 }
+    its("max_tries")  { should == 20 }
     its("timeout")    { should == 1800 }
   end
 

data/spec/vagrant-windows/guestnetwork_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe VagrantWindows::Communication::GuestNetwork , :integration => true do
+  
+  before(:all) do
+    # This test requires you already have a running Windows Server 2008 R2 Vagrant VM
+    # Not ideal, but you have to start somewhere
+    @shell = VagrantWindows::Communication::WinRMShell.new("localhost", "vagrant", "vagrant")
+    @guestnetwork = VagrantWindows::Communication::GuestNetwork.new(@shell)
+  end
+  
+  describe "wsman_version" do
+    it "network_adapters" do
+      nics = @guestnetwork.network_adapters()
+      #puts nics.pretty_inspect()
+
+      expect(nics.count).to be >= 1
+      nic = nics[0]
+
+      expect(nic.has_key?(:mac_address)).to be_true
+      expect(nic.has_key?(:net_connection_id)).to be_true
+      expect(nic.has_key?(:interface_index)).to be_true
+      expect(nic.has_key?(:index)).to be_true
+      
+      expect(nic[:mac_address]).to match(/^([0-9A-F]{2}[:]){5}([0-9A-F]{2})$/)
+      Integer(nic[:interface_index])
+      Integer(nic[:index])
+    end
+    
+    it "should configure DHCP for adapter" do
+      nics = @guestnetwork.network_adapters()
+      @guestnetwork.configure_dhcp_interface(nics[0][:index], nics[0][:net_connection_id])
+      expect(@guestnetwork.is_dhcp_enabled(nics[0][:index])).to be_true
+    end
+    
+    it "should configure static IP for adapter" do
+      nics = @guestnetwork.network_adapters()
+      @guestnetwork.configure_static_interface(nics[1][:index], nics[1][:net_connection_id], "192.168.0.100", "255.255.255.0")
+      expect(@guestnetwork.is_dhcp_enabled(nics[1][:index])).to be_false
+    end
+    
+    it "should configure all networks to work mode" do
+      @guestnetwork.set_all_networks_to_work()
+    end
+  end
+
+end

data/spec/vagrant-windows/helper_spec.rb

@@ -1,6 +1,6 @@
-require "vagrant-windows/helper"
+require 'spec_helper'
 
-describe VagrantWindows::Helper do
+describe VagrantWindows::Helper , :unit => true do
   
   class DummyHelper
     include VagrantWindows::Helper
@@ -11,7 +11,7 @@ describe VagrantWindows::Helper do
   end
 
   describe "win_friendly_path" do
-    it "should replace slashes with backslashes" do
+    it "should replace slashes with backslashes"  do
       @dummy.win_friendly_path('c:/tmp/dir').should eq('c:\\tmp\\dir')
     end
     
@@ -23,5 +23,16 @@ describe VagrantWindows::Helper do
       @dummy.win_friendly_path(nil).should be_nil
     end
   end
+  
+  describe "win_friendly_share_id" do
+    it "should use share id if present" do
+      @dummy.win_friendly_share_id('sharename').should eq('sharename')
+    end
+    
+    it "should use last folder name in guest_path" do
+      @dummy.win_friendly_share_id('/tmp/folder/sharename').should eq('tmp_folder_sharename')
+    end
+
+  end
 
 end

data/spec/vagrant-windows/winrmcommunicator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe VagrantWindows::Communication::WinRMCommunicator, :integration => true do
+  
+  before(:all) do
+    # This test requires you already have a running Windows Server 2008 R2 Vagrant VM
+    # Not ideal, but you have to start somewhere
+    @shell = VagrantWindows::Communication::WinRMShell.new("localhost", "vagrant", "vagrant")
+    @communicator = VagrantWindows::Communication::WinRMCommunicator.new({})
+    @communicator.set_winrmshell(@shell)
+  end
+  
+  describe "execute" do
+    it "should return 1" do
+      expect(@communicator.execute("exit 1")).to eq(1)
+    end
+    
+    it "should return 1 with block" do
+      exit_code = @communicator.sudo("exit 1", {}) do |type, line|
+        puts line
+      end
+      expect(exit_code).to eq(1)
+    end
+  end
+
+end

data/vagrant-windows.gemspec

@@ -8,7 +8,38 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A small gem that adds windows guest support to vagrant, uses WinRM as the Communication Channel}
   gem.homepage      = ""
 
-  gem.files         = `git ls-files`.split($\)
+  # The following block of code determines the files that should be included
+  # in the gem. It does this by reading all the files in the directory where
+  # this gemspec is, and parsing out the ignored files from the gitignore.
+  # 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
+
+  gem.files         = unignored_files
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "vagrant-windows"
@@ -16,10 +47,10 @@ Gem::Specification.new do |gem|
   gem.version       = VagrantWindows::VERSION
 
   gem.add_runtime_dependency "winrm", "~> 1.1.1"
-  gem.add_runtime_dependency 'highline'
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec-core", "~> 2.12.2"
   gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
   gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
+  gem.add_development_dependency "simplecov"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Paul Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,47 +20,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,11 +76,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Windows Guest Support for Vagrant
 email:
 - pmorton@biaprotect.com
@@ -114,63 +101,121 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- coverage/assets/0.7.1/application.css
+- coverage/assets/0.7.1/application.js
+- coverage/assets/0.7.1/fancybox/blank.gif
+- coverage/assets/0.7.1/fancybox/fancy_close.png
+- coverage/assets/0.7.1/fancybox/fancy_loading.png
+- coverage/assets/0.7.1/fancybox/fancy_nav_left.png
+- coverage/assets/0.7.1/fancybox/fancy_nav_right.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_e.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_n.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_s.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_se.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png
+- coverage/assets/0.7.1/fancybox/fancy_shadow_w.png
+- coverage/assets/0.7.1/fancybox/fancy_title_left.png
+- coverage/assets/0.7.1/fancybox/fancy_title_main.png
+- coverage/assets/0.7.1/fancybox/fancy_title_over.png
+- coverage/assets/0.7.1/fancybox/fancy_title_right.png
+- coverage/assets/0.7.1/fancybox/fancybox-x.png
+- coverage/assets/0.7.1/fancybox/fancybox-y.png
+- coverage/assets/0.7.1/fancybox/fancybox.png
+- coverage/assets/0.7.1/favicon_green.png
+- coverage/assets/0.7.1/favicon_red.png
+- coverage/assets/0.7.1/favicon_yellow.png
+- coverage/assets/0.7.1/loading.gif
+- coverage/assets/0.7.1/magnify.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png
+- coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png
+- coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png
+- coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/index.html
 - Gemfile
-- Gemfile.lock
-- README.md
-- Rakefile
-- lib/vagrant-windows.rb
+- lib/vagrant-windows/communication/guestnetwork.rb
 - lib/vagrant-windows/communication/winrmcommunicator.rb
+- lib/vagrant-windows/communication/winrmfinder.rb
+- lib/vagrant-windows/communication/winrmshell.rb
 - lib/vagrant-windows/config/windows.rb
 - lib/vagrant-windows/config/winrm.rb
 - lib/vagrant-windows/errors.rb
+- lib/vagrant-windows/guest/cap/change_host_name.rb
+- lib/vagrant-windows/guest/cap/configure_networks.rb
+- lib/vagrant-windows/guest/cap/halt.rb
+- lib/vagrant-windows/guest/cap/mount_virtualbox_shared_folder.rb
+- lib/vagrant-windows/guest/cap/mount_vmware_shared_folder.rb
 - lib/vagrant-windows/guest/windows.rb
 - lib/vagrant-windows/helper.rb
-- lib/vagrant-windows/monkey_patches/chef_solo.rb
-- lib/vagrant-windows/monkey_patches/machine.rb
-- lib/vagrant-windows/monkey_patches/provisioner.rb
-- lib/vagrant-windows/monkey_patches/puppet.rb
-- lib/vagrant-windows/monkey_patches/vbox_42_driver.rb
+- lib/vagrant-windows/monkey_patches/lib/vagrant/machine.rb
+- lib/vagrant-windows/monkey_patches/plugins/providers/virtualbox/action/share_folders.rb
+- lib/vagrant-windows/monkey_patches/plugins/providers/virtualbox/driver/version_4_2.rb
+- lib/vagrant-windows/monkey_patches/plugins/provisioners/chef/provisioner/chef_client.rb
+- lib/vagrant-windows/monkey_patches/plugins/provisioners/chef/provisioner/chef_solo.rb
+- lib/vagrant-windows/monkey_patches/plugins/provisioners/puppet/provisioner/puppet.rb
+- lib/vagrant-windows/monkey_patches/plugins/provisioners/puppet/provisioner/puppet_server.rb
+- lib/vagrant-windows/monkey_patches/plugins/provisioners/shell/provisioner.rb
 - lib/vagrant-windows/plugin.rb
+- lib/vagrant-windows/scripts/cheftask.ps1.erb
+- lib/vagrant-windows/scripts/cheftask.xml.erb
+- lib/vagrant-windows/scripts/cheftaskrun.ps1.erb
 - lib/vagrant-windows/scripts/command_alias.ps1
-- lib/vagrant-windows/scripts/mount_volume.ps1.erb
-- lib/vagrant-windows/scripts/ps_runas.ps1.erb
+- lib/vagrant-windows/scripts/mount_volume.virtualbox.ps1.erb
+- lib/vagrant-windows/scripts/mount_volume.vmware.ps1.erb
+- lib/vagrant-windows/scripts/set_work_network.ps1
+- lib/vagrant-windows/scripts/winrs_v3_get_adapters.ps1
 - lib/vagrant-windows/version.rb
+- lib/vagrant-windows.rb
 - locales/en.yml
+- Rakefile
+- README.md
+- spec/spec_helper.rb
 - spec/vagrant-windows/config_spec.rb
+- spec/vagrant-windows/guestnetwork_spec.rb
 - spec/vagrant-windows/helper_spec.rb
+- spec/vagrant-windows/winrmcommunicator_spec.rb
 - vagrant-windows.gemspec
+- .gitignore
+- .travis.yml
+- coverage/.last_run.json
+- coverage/.resultset.json
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 459186587088148181
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 459186587088148181
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A small gem that adds windows guest support to vagrant, uses WinRM as the
   Communication Channel
 test_files:
+- spec/spec_helper.rb
 - spec/vagrant-windows/config_spec.rb
+- spec/vagrant-windows/guestnetwork_spec.rb
 - spec/vagrant-windows/helper_spec.rb
+- spec/vagrant-windows/winrmcommunicator_spec.rb