vagrant-windows 1.6.0 → 1.7.0.pre.2

data/spec/vagrant-windows/winrmshell_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe VagrantWindows::Communication::WinRMShell, :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("127.0.0.1", "vagrant", "vagrant")
+    port = (ENV['WINRM_PORT'] || 5985).to_i
+    @shell = VagrantWindows::Communication::WinRMShell.new(
+      "127.0.0.1", "vagrant", "vagrant", { port: port })
   end
   
-  describe "powershell" do
+  describe ".powershell" do
     it "should return exit code of 0" do
       expect(@shell.powershell("exit 0")[:exitcode]).to eq(0)
     end
@@ -26,7 +26,7 @@ describe VagrantWindows::Communication::WinRMShell, :integration => true do
     end
   end
   
-  describe "cmd" do
+  describe ".cmd" do
     it "should return stdout" do
       result = @shell.cmd("dir") do |type, line|
         expect(type).to eq(:stdout)
@@ -35,5 +35,12 @@ describe VagrantWindows::Communication::WinRMShell, :integration => true do
       expect(result[:exitcode]).to eq(0)
     end
   end
+
+  describe ".wql" do
+    it "should return query results in stdout" do
+      result = @shell.wql('SELECT * FROM Win32_NetworkAdapter WHERE MACAddress IS NOT NULL')
+      expect(result[:win32_network_adapter]).to_not be_empty
+    end
+  end
  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0.pre.2
 platform: ruby
 authors:
 - Paul Morton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -105,8 +105,17 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - Gemfile
+- lib/vagrant-windows/communication/command_filters/cat.rb
+- lib/vagrant-windows/communication/command_filters/chmod.rb
+- lib/vagrant-windows/communication/command_filters/chown.rb
+- lib/vagrant-windows/communication/command_filters/rm.rb
+- lib/vagrant-windows/communication/command_filters/test.rb
+- lib/vagrant-windows/communication/command_filters/uname.rb
+- lib/vagrant-windows/communication/command_filters/which.rb
 - lib/vagrant-windows/communication/guestnetwork.rb
+- lib/vagrant-windows/communication/linux_command_filter.rb
 - lib/vagrant-windows/communication/winrmcommunicator.rb
+- lib/vagrant-windows/communication/winrmfilemanager.rb
 - lib/vagrant-windows/communication/winrmfinder.rb
 - lib/vagrant-windows/communication/winrmshell.rb
 - lib/vagrant-windows/communication/winrmshell_factory.rb
@@ -130,10 +139,7 @@ files:
 - lib/vagrant-windows/monkey_patches/plugins/provisioners/shell/provisioner.rb
 - lib/vagrant-windows/plugin.rb
 - lib/vagrant-windows/provisioners/chef_command_builder.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/elevated_shell.ps1.erb
 - lib/vagrant-windows/scripts/mount_volume.ps1.erb
 - lib/vagrant-windows/scripts/reboot_detect.ps1
 - lib/vagrant-windows/scripts/set_work_network.ps1
@@ -149,6 +155,7 @@ files:
 - spec/vagrant-windows/chef_command_builder_spec.rb
 - spec/vagrant-windows/guestnetwork_spec.rb
 - spec/vagrant-windows/helper_spec.rb
+- spec/vagrant-windows/linux_command_filter_spec.rb
 - spec/vagrant-windows/mount_shared_folder_spec.rb
 - spec/vagrant-windows/windows_config_spec.rb
 - spec/vagrant-windows/windows_machine_spec.rb
@@ -174,9 +181,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
@@ -189,6 +196,7 @@ test_files:
 - spec/vagrant-windows/chef_command_builder_spec.rb
 - spec/vagrant-windows/guestnetwork_spec.rb
 - spec/vagrant-windows/helper_spec.rb
+- spec/vagrant-windows/linux_command_filter_spec.rb
 - spec/vagrant-windows/mount_shared_folder_spec.rb
 - spec/vagrant-windows/windows_config_spec.rb
 - spec/vagrant-windows/windows_machine_spec.rb

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

@@ -1,48 +0,0 @@
-# kill the task so we can recreate it
-schtasks /delete /tn "chef-solo" /f 2>&1 | out-null
-
-# Ensure the chef task running file doesn't exist from a previous failure
-if (Test-Path "<%= options[:chef_task_running] %>") {
-  del "<%= options[:chef_task_running] %>"
-}
-
-# schedule the task to run once in the far distant future
-schtasks /create /tn 'chef-solo' /xml '<%= options[:chef_task_xml] %>' /ru '<%= options[:user] %>' /rp '<%= options[:pass] %>' | Out-Null
-
-# start the scheduled task right now
-schtasks /run /tn "chef-solo" | Out-Null
-
-# wait for run_chef.ps1 to start or timeout after 1 minute
-$timeoutSeconds = 60
-$elapsedSeconds = 0
-while ( (!(Test-Path "<%= options[:chef_task_running] %>")) -and ($elapsedSeconds -lt $timeoutSeconds) ) {
-  Start-Sleep -s 1
-  $elapsedSeconds++
-}
-
-if ($elapsedSeconds -ge $timeoutSeconds) {
-  Write-Error "Timed out waiting for chef scheduled task to start"
-  exit -2
-}
-
-# read the entire file, but only write out new lines we haven't seen before
-$numLinesRead = 0
-$success = $TRUE
-while (Test-Path "<%= options[:chef_task_running] %>") {
-  Start-Sleep -m 100
-  
-  if (Test-Path "<%= options[:chef_stdout_log] %>") {
-    $text = (get-content "<%= options[:chef_stdout_log] %>")
-    $numLines = ($text | Measure-Object -line).lines    
-    $numLinesToRead = $numLines - $numLinesRead
-    
-    if ($numLinesToRead -gt 0) {
-      $text | select -first $numLinesToRead -skip $numLinesRead | ForEach {
-        Write-Host "$_"
-      }
-      $numLinesRead += $numLinesToRead
-    }
-  }
-}
-
-exit Get-Content "<%= options[:chef_task_exitcode] %>"

data/lib/vagrant-windows/scripts/cheftask.xml.erb

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-16"?>
-<Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
-  <RegistrationInfo>
-    <Date>2013-06-21T22:41:43</Date>
-    <Author>Administrator</Author>
-  </RegistrationInfo>
-  <Triggers>
-    <TimeTrigger>
-      <StartBoundary>2045-01-01T12:00:00</StartBoundary>
-      <Enabled>true</Enabled>
-    </TimeTrigger>
-  </Triggers>
-  <Principals>
-    <Principal id="Author">
-      <UserId>vagrant</UserId>
-      <LogonType>Password</LogonType>
-      <RunLevel>HighestAvailable</RunLevel>
-    </Principal>
-  </Principals>
-  <Settings>
-    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>
-    <DisallowStartIfOnBatteries>false</DisallowStartIfOnBatteries>
-    <StopIfGoingOnBatteries>false</StopIfGoingOnBatteries>
-    <AllowHardTerminate>true</AllowHardTerminate>
-    <StartWhenAvailable>false</StartWhenAvailable>
-    <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
-    <IdleSettings>
-      <StopOnIdleEnd>true</StopOnIdleEnd>
-      <RestartOnIdle>false</RestartOnIdle>
-    </IdleSettings>
-    <AllowStartOnDemand>true</AllowStartOnDemand>
-    <Enabled>true</Enabled>
-    <Hidden>false</Hidden>
-    <RunOnlyIfIdle>false</RunOnlyIfIdle>
-    <WakeToRun>false</WakeToRun>
-    <ExecutionTimeLimit>PT2H</ExecutionTimeLimit>
-    <Priority>4</Priority>
-  </Settings>
-  <Actions Context="Author">
-    <Exec>
-      <Command>powershell</Command>
-      <Arguments>-file <%= options[:chef_task_run_ps1] %></Arguments>
-    </Exec>
-  </Actions>
-</Task>

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

@@ -1,18 +0,0 @@
-$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] %>"
-  if (Test-Path "<%= options[:chef_task_running] %>") {
-    del "<%= options[:chef_task_running] %>"
-  }
-}
-
-exit $exitCode

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

@@ -1,36 +0,0 @@
-function which {
-    $command = [Array](Get-Command $args[0] -errorAction SilentlyContinue)
-    if($null -eq $command)
-    {
-      exit 1
-    }
-    write-host $command[0].Definition
-    exit 0
-}
-
-function test ([Switch] $d, [String] $path) {
-  if(Test-Path $path)
-  {
-    exit 0
-  }
-  exit 1
-}
-
-function chmod {
-  exit 0
-}
-
-function chown {
-  exit 0
-}
-
-function mkdir ([Switch] $p, [String] $path)
-{
-  if(Test-Path $path)
-  {
-    exit 0
-  } else {
-    New-Item $path -Type Directory -Force | Out-Null
-  }
-}
-