vagrant-windows 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- vagrant-windows (0.0.2)
4
+ vagrant-windows (0.1.1)
5
5
  highline
6
6
  vagrant (~> 1.0.3)
7
7
  winrm (~> 1.1.1)
@@ -9,23 +9,24 @@ PATH
9
9
  GEM
10
10
  remote: http://rubygems.org/
11
11
  specs:
12
- akami (1.0.0)
12
+ akami (1.2.0)
13
13
  gyoku (>= 0.4.0)
14
+ nokogiri (>= 1.4.0)
14
15
  archive-tar-minitar (0.5.2)
15
- builder (3.0.0)
16
- childprocess (0.3.2)
17
- ffi (~> 1.0.6)
16
+ builder (3.1.3)
17
+ childprocess (0.3.5)
18
+ ffi (~> 1.0, >= 1.0.6)
18
19
  erubis (2.7.0)
19
- ffi (1.0.11)
20
+ ffi (1.1.5)
20
21
  gssapi (1.0.3)
21
22
  ffi (>= 1.0.1)
22
- gyoku (0.4.5)
23
+ gyoku (0.4.6)
23
24
  builder (>= 2.1.2)
24
- highline (1.6.12)
25
+ highline (1.6.14)
25
26
  httpclient (2.2.0.2)
26
27
  httpi (0.9.7)
27
28
  rack
28
- i18n (0.6.0)
29
+ i18n (0.6.1)
29
30
  json (1.5.4)
30
31
  little-plugger (1.1.3)
31
32
  log4r (1.1.10)
@@ -34,8 +35,8 @@ GEM
34
35
  net-scp (1.0.4)
35
36
  net-ssh (>= 1.99.1)
36
37
  net-ssh (2.2.2)
37
- nokogiri (1.5.3)
38
- nori (1.1.0)
38
+ nokogiri (1.5.5)
39
+ nori (1.1.3)
39
40
  rack (1.4.1)
40
41
  rubyntlm (0.1.1)
41
42
  savon (0.9.5)
@@ -46,7 +47,7 @@ GEM
46
47
  nokogiri (>= 1.4.0)
47
48
  nori (~> 1.0)
48
49
  wasabi (~> 1.0)
49
- uuidtools (2.1.2)
50
+ uuidtools (2.1.3)
50
51
  vagrant (1.0.3)
51
52
  archive-tar-minitar (= 0.5.2)
52
53
  childprocess (~> 0.3.1)
@@ -58,7 +59,7 @@ GEM
58
59
  net-ssh (~> 2.2.2)
59
60
  wasabi (1.0.0)
60
61
  nokogiri (>= 1.4.0)
61
- winrm (1.1.1)
62
+ winrm (1.1.2)
62
63
  gssapi (~> 1.0.0)
63
64
  httpclient (~> 2.2.0.2)
64
65
  logging (~> 1.6.1)
data/README.md CHANGED
@@ -101,4 +101,9 @@ References and Shout Outs
101
101
  =========================
102
102
  - Chris McClimans - Vagrant Branch (https://github.com/hh/vagrant/blob/feature/winrm/)
103
103
  -Dan Wanek - WinRM GEM (https://github.com/zenchild/WinRM)
104
- - +1 For being super responsive to pull requests.
104
+ - +1 For being super responsive to pull requests.
105
+
106
+
107
+ Changelog
108
+ =========
109
+ 0.1.1 - Remove extra debug information from command output.
@@ -118,11 +118,11 @@ module Vagrant
118
118
  @highline ||= HighLine.new
119
119
  end
120
120
 
121
- def print_data(data, color = :cyan)
121
+ def print_data(data, color = :green)
122
122
  if data =~ /\n/
123
123
  data.split(/\n/).each { |d| print_data(d, color) }
124
124
  else
125
- puts "#{h.color('winrm', color)} #{data.chomp}"
125
+ puts h.color(data.chomp, color)
126
126
  end
127
127
  end
128
128
 
@@ -157,7 +157,7 @@ module Vagrant
157
157
  if shell.eql? :cmd
158
158
  output = session.cmd(command) do |out,error|
159
159
  print_data(out) if out
160
- print_data(error) if error
160
+ print_data(error, :red) if error
161
161
  end
162
162
  elsif shell.eql? :powershell
163
163
  new_command = File.read(File.expand_path("#{File.dirname(__FILE__)}/../scripts/command_alias.ps1"))
@@ -165,7 +165,7 @@ module Vagrant
165
165
  new_command << command
166
166
  output = session.powershell(new_command) do |out,error|
167
167
  print_data(out) if out
168
- print_data(error) if error
168
+ print_data(error, :red) if error
169
169
  end
170
170
  else
171
171
  raise Vagrant::Errors::WinRMInvalidShell, "#{shell} is not a valid type of shell"
@@ -72,8 +72,6 @@ module Vagrant
72
72
  vm_interface_map[driver_mac_address[naked_mac]] = { :name => nic[:net_connection_id], :mac_address => naked_mac, :index => nic[:interface_index] }
73
73
  end
74
74
  end
75
- puts networks
76
- puts vm_interface_map
77
75
  networks.each do |network|
78
76
  if network[:type].to_sym == :static
79
77
  vm.channel.execute("netsh interface ip set address \"#{vm_interface_map[network[:interface]+1][:name]}\" static #{network[:ip]} #{network[:netmask]}")
@@ -11,12 +11,12 @@ $ShareName = "<%= options[:name] %>"
11
11
  # https://github.com/BIAINC/vagrant-windows/issues/4
12
12
  # Not sure why this works, but it does.
13
13
 
14
- & net use $ShareName
14
+ & net use $ShareName 2>&1 | Out-Null
15
15
 
16
- Write-Host "Attempting to mount $ShareName to $MountPoint"
16
+ Write-Debug "Attempting to mount $ShareName to $MountPoint"
17
17
  if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
18
18
  {
19
- Write-Host "Junction already exists, so I will delete it"
19
+ Write-Debug "Junction already exists, so I will delete it"
20
20
  # Powershell refuses to delete junctions, oh well use cmd
21
21
  cmd /c rd "$MountPoint"
22
22
 
@@ -29,7 +29,7 @@ if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
29
29
  }
30
30
  elseif(Test-Path $MountPoint)
31
31
  {
32
- Write-Host "Mount point already exists and is not a symbolic link"
32
+ Write-Debug "Mount point already exists and is not a symbolic link"
33
33
  exit 1
34
34
  }
35
35
 
@@ -37,11 +37,11 @@ $BaseDirectory = [System.IO.Path]::GetDirectoryName($MountPoint)
37
37
 
38
38
  if (-not (Test-Path $BaseDirectory))
39
39
  {
40
- Write-Host "Creating parent directory for mount point $BaseDirectory"
40
+ Write-Debug "Creating parent directory for mount point $BaseDirectory"
41
41
  New-Item $BaseDirectory -Type Directory -Force | Out-Null
42
42
  }
43
43
 
44
- cmd /c mklink /D "$MountPoint" "\\vboxsrv\$ShareName"
44
+ cmd /c mklink /D "$MountPoint" "\\vboxsrv\$ShareName" | out-null
45
45
 
46
46
  if ( $LASTEXITCODE -ne 0 )
47
47
  {
@@ -1,3 +1,3 @@
1
1
  module VagrantWindows
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-windows
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-07-25 00:00:00.000000000 Z
12
+ date: 2012-09-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: winrm