vagrant-windows 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vagrant-windows (0.0.2)
+    vagrant-windows (0.1.1)
       highline
       vagrant (~> 1.0.3)
       winrm (~> 1.1.1)
@@ -9,23 +9,24 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    akami (1.0.0)
+    akami (1.2.0)
       gyoku (>= 0.4.0)
+      nokogiri (>= 1.4.0)
     archive-tar-minitar (0.5.2)
-    builder (3.0.0)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    builder (3.1.3)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
     erubis (2.7.0)
-    ffi (1.0.11)
+    ffi (1.1.5)
     gssapi (1.0.3)
       ffi (>= 1.0.1)
-    gyoku (0.4.5)
+    gyoku (0.4.6)
       builder (>= 2.1.2)
-    highline (1.6.12)
+    highline (1.6.14)
     httpclient (2.2.0.2)
     httpi (0.9.7)
       rack
-    i18n (0.6.0)
+    i18n (0.6.1)
     json (1.5.4)
     little-plugger (1.1.3)
     log4r (1.1.10)
@@ -34,8 +35,8 @@ GEM
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.2.2)
-    nokogiri (1.5.3)
-    nori (1.1.0)
+    nokogiri (1.5.5)
+    nori (1.1.3)
     rack (1.4.1)
     rubyntlm (0.1.1)
     savon (0.9.5)
@@ -46,7 +47,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 1.0)
-    uuidtools (2.1.2)
+    uuidtools (2.1.3)
     vagrant (1.0.3)
       archive-tar-minitar (= 0.5.2)
       childprocess (~> 0.3.1)
@@ -58,7 +59,7 @@ GEM
       net-ssh (~> 2.2.2)
     wasabi (1.0.0)
       nokogiri (>= 1.4.0)
-    winrm (1.1.1)
+    winrm (1.1.2)
       gssapi (~> 1.0.0)
       httpclient (~> 2.2.0.2)
       logging (~> 1.6.1)

data/README.md

@@ -101,4 +101,9 @@ References and Shout Outs
 =========================
 - Chris McClimans - Vagrant Branch (https://github.com/hh/vagrant/blob/feature/winrm/)
 -Dan Wanek - WinRM GEM (https://github.com/zenchild/WinRM)
-  - +1 For being super responsive to pull requests.
+  - +1 For being super responsive to pull requests.
+
+
+Changelog
+=========
+0.1.1 - Remove extra debug information from command output.

data/lib/vagrant-windows/communication/winrm.rb

@@ -118,11 +118,11 @@ module Vagrant
         @highline ||= HighLine.new
       end
       
-      def print_data(data, color = :cyan)
+      def print_data(data, color = :green)
         if data =~ /\n/
           data.split(/\n/).each { |d| print_data(d, color) }
         else
-          puts "#{h.color('winrm', color)} #{data.chomp}"
+          puts h.color(data.chomp, color)
         end
       end
 
@@ -157,7 +157,7 @@ module Vagrant
         if shell.eql? :cmd
           output = session.cmd(command) do |out,error|
             print_data(out) if out
-            print_data(error) if error
+            print_data(error, :red) if error
           end  
         elsif shell.eql? :powershell
           new_command = File.read(File.expand_path("#{File.dirname(__FILE__)}/../scripts/command_alias.ps1"))
@@ -165,7 +165,7 @@ module Vagrant
           new_command << command
           output = session.powershell(new_command) do |out,error|
             print_data(out) if out
-            print_data(error) if error
+            print_data(error, :red) if error
           end
         else
           raise Vagrant::Errors::WinRMInvalidShell, "#{shell} is not a valid type of shell"

data/lib/vagrant-windows/guest/windows.rb

@@ -72,8 +72,6 @@ module Vagrant
             vm_interface_map[driver_mac_address[naked_mac]] = { :name => nic[:net_connection_id], :mac_address => naked_mac, :index => nic[:interface_index] }
           end
         end
-        puts networks
-        puts vm_interface_map
         networks.each do |network|
           if network[:type].to_sym == :static
               vm.channel.execute("netsh interface ip set address \"#{vm_interface_map[network[:interface]+1][:name]}\" static #{network[:ip]} #{network[:netmask]}")

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

@@ -11,12 +11,12 @@ $ShareName = "<%= options[:name] %>"
 # https://github.com/BIAINC/vagrant-windows/issues/4
 # Not sure why this works, but it does.
 
-& net use $ShareName
+& net use $ShareName 2>&1 | Out-Null
 
-Write-Host "Attempting to mount $ShareName to $MountPoint"
+Write-Debug "Attempting to mount $ShareName to $MountPoint"
 if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
 {
-  Write-Host "Junction already exists, so I will delete it"
+  Write-Debug "Junction already exists, so I will delete it"
   # Powershell refuses to delete junctions, oh well use cmd
   cmd /c rd "$MountPoint"
 
@@ -29,7 +29,7 @@ if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
 } 
 elseif(Test-Path $MountPoint) 
 {
-  Write-Host "Mount point already exists and is not a symbolic link"
+  Write-Debug "Mount point already exists and is not a symbolic link"
   exit 1
 }
 
@@ -37,11 +37,11 @@ $BaseDirectory = [System.IO.Path]::GetDirectoryName($MountPoint)
 
 if (-not (Test-Path $BaseDirectory))
 {
-  Write-Host "Creating parent directory for mount point $BaseDirectory"
+  Write-Debug "Creating parent directory for mount point $BaseDirectory"
   New-Item $BaseDirectory -Type Directory -Force | Out-Null
 }
 
-cmd /c mklink /D "$MountPoint" "\\vboxsrv\$ShareName"
+cmd /c mklink /D "$MountPoint" "\\vboxsrv\$ShareName" | out-null
 
 if ( $LASTEXITCODE -ne 0 )
 {

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm