vagrant-windows 1.2.0 → 1.3.1

data/spec/vagrant-windows/windows_machine_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'mocha/api'
+require 'vagrant-windows/windows_machine'
+
+describe VagrantWindows::WindowsMachine , :unit => true do
+  
+  describe "is_vmware?" do
+    it "should be true for vmware_fusion" do
+      machine = stub(:provider_name => :vmware_fusion)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_vmware?()).to be_true
+    end
+    
+    it "should be true for vmware_workstation" do
+      machine = stub(:provider_name => :vmware_workstation)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_vmware?()).to be_true
+    end
+    
+    it "should be false for virtual_box" do
+      machine = stub(:provider_name => :virtual_box)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_vmware?()).to be_false
+    end
+  end
+  
+  describe "is_virtualbox?" do
+    it "should be true for virtualbox" do
+      machine = stub(:provider_name => :virtualbox)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_virtualbox?()).to be_true
+    end
+    
+    it "should be false for vmware_workstation" do
+      machine = stub(:provider_name => :vmware_workstation)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_virtualbox?()).to be_false
+    end
+  end
+  
+  describe "is_windows?" do
+    it "should return true when config vm guest is windows" do
+      vm = stub(:guest => :windows)
+      config = stub(:vm => vm)
+      machine = stub(:config => config)
+      expect(VagrantWindows::WindowsMachine.is_windows?(machine)).to be_true
+    end
+    
+    it "should return false when config vm guest is not windows" do
+      vm = stub(:guest => :ubuntu)
+      config = stub(:vm => vm)
+      machine = stub(:config => config)
+      expect(VagrantWindows::WindowsMachine.is_windows?(machine)).to be_false
+    end
+  end
+  
+  describe "read_forwarded_ports" do
+    it "should return empty array for vmware provider" do
+      machine = stub(:provider_name => :vmware_fusion)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.read_forwarded_ports()).to eq([])
+    end
+  end
+
+end

data/spec/vagrant-windows/{config_spec.rb → winrm_config_spec.rb}

@@ -1,32 +1,6 @@
 require 'spec_helper'
 
-describe VagrantWindows::Config::Windows , :unit => true do
-  let(:instance) { described_class.new }
-
-  describe "defaults" do
-    subject do
-      instance.tap do |o|
-        o.finalize!
-      end
-    end
-
-    its("halt_timeout")        { should == 30 }
-    its("halt_check_interval") { should == 1 }
-  end
-
-  describe "overriding defaults" do
-    [:halt_timeout, :halt_check_interval].each do |attribute|
-      it "should not default #{attribute} if overridden" do
-        instance.send("#{attribute}=".to_sym, 10)
-        instance.finalize!
-        instance.send(attribute).should == 10
-      end
-    end
-  end
-end
-
-
-describe VagrantWindows::Config::WinRM do
+describe VagrantWindows::Config::WinRM, :unit => true do
   let(:instance) { described_class.new }
 
   describe "defaults" do
@@ -38,7 +12,7 @@ describe VagrantWindows::Config::WinRM do
 
     its("username")   { should == "vagrant" }
     its("password")   { should == "vagrant" }
-    its("host")       { should == "localhost" }
+    its("host")       { should == nil }
     its("port")       { should == 5985 }
     its("guest_port") { should == 5985 }
     its("max_tries")  { should == 20 }

data/spec/vagrant-windows/winrmcommunicator_spec.rb

@@ -5,21 +5,42 @@ describe VagrantWindows::Communication::WinRMCommunicator, :integration => true
   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)
+    @communicator.winrmshell = VagrantWindows::Communication::WinRMShell.new("127.0.0.1", "vagrant", "vagrant")
   end
   
   describe "execute" do
-    it "should return 1" do
-      expect(@communicator.execute("exit 1")).to eq(1)
+    it "should return 1 when error_check is false" do
+      expect(@communicator.execute("exit 1", { :error_check => false })).to eq(1)
     end
     
-    it "should return 1 with block" do
-      exit_code = @communicator.sudo("exit 1", {}) do |type, line|
-        puts line
+    it "should raise WinRMExecutionError when error_check is true" do
+      expect { @communicator.execute("exit 1") }.to raise_error(VagrantWindows::Errors::WinRMExecutionError)
+    end
+    
+    it "should raise specified error type when specified and error_check is true" do
+      opts = { :error_class => VagrantWindows::Errors::WinRMInvalidShell }
+      expect { @communicator.execute("exit 1", opts) }.to raise_error(VagrantWindows::Errors::WinRMInvalidShell)
+    end
+  end
+  
+  describe "upload" do
+    it "should upload the file and overwrite it if it exists" do
+      test_file = Tempfile.new("uploadtest")
+      IO.write(test_file, "hello world")
+      @communicator.upload(test_file, "c:\\vagrantuploadtest.txt")
+      
+      # ensure we can overwrite
+      IO.write(test_file, "goodbye cruel world")
+      @communicator.upload(test_file, "c:\\vagrantuploadtest.txt")
+      
+      # get the uploaded file's contents to ensure it uploaded properly
+      uploaded_file_content = ''
+      @communicator.execute("cat c:\\vagrantuploadtest.txt", {}) do |type, line|
+        uploaded_file_content = uploaded_file_content + line
       end
-      expect(exit_code).to eq(1)
+      
+      expect(uploaded_file_content.chomp).to eq("goodbye cruel world")
     end
   end
 

data/spec/vagrant-windows/winrmfinder_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe VagrantWindows::Communication::WinRMFinder, :unit => true do
+
+  before(:each) do
+    @machine = stub()
+    @winrmfinder = VagrantWindows::Communication::WinRMFinder.new(@machine)
+  end
+
+  describe 'winrm_host_address' do
+    it 'should raise WinRMNotReady exception when ssh_info is nil' do
+      @machine.stubs(:ssh_info).returns(nil)
+      expect { @winrmfinder.winrm_host_address() }.to raise_error(VagrantWindows::Errors::WinRMNotReady)
+    end
+    
+    it 'should return ssh_info host if config host has no value' do
+      # setup the winrm config to return nil for the host (i.e. the default)
+      winrm_config = VagrantWindows::Config::WinRM.new()
+      winrm_config.finalize!()
+      @machine.stubs(:winrm_config).returns(winrm_config)
+      
+      # setup the machine ssh_info to return a 10.0.0.1
+      @machine.stubs(:ssh_info).returns({ :host => '10.0.0.1' })
+      
+      expect(@winrmfinder.winrm_host_address()).to eq('10.0.0.1')
+    end
+    
+    it 'should return host config if set (issue 104)' do
+      # setup the winrm config to return nil for the host (i.e. the default)
+      winrm_config = VagrantWindows::Config::WinRM.new()
+      winrm_config.host = '10.0.0.1'
+      winrm_config.finalize!()
+      @machine.stubs(:winrm_config).returns(winrm_config)
+      
+      # setup the machine ssh_info to return a 10.0.0.1
+      @machine.stubs(:ssh_info).returns({ :host => '127.0.0.1' })
+      
+      expect(@winrmfinder.winrm_host_address()).to eq('10.0.0.1')
+    end
+  end
+
+end

data/spec/vagrant-windows/winrmshell_spec.rb

@@ -0,0 +1,39 @@
+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")
+  end
+  
+  describe "powershell" do
+    it "should return exit code of 0" do
+      expect(@shell.powershell("exit 0")[:exitcode]).to eq(0)
+    end
+    
+    it "should return exit code greater than 0" do
+      expect(@shell.powershell("exit 1")[:exitcode]).to eq(1)
+    end
+    
+    it "should return stdout" do
+      result = @shell.powershell("dir") do |type, line|
+        expect(type).to eq(:stdout)
+        expect(line.length).to be > 1  
+      end
+      expect(result[:exitcode]).to eq(0)
+    end
+  end
+  
+  describe "cmd" do
+    it "should return stdout" do
+      result = @shell.cmd("dir") do |type, line|
+        expect(type).to eq(:stdout)
+        expect(line.length).to be > 1  
+      end
+      expect(result[:exitcode]).to eq(0)
+    end
+  end
+ 
+end

data/test.ps1

@@ -0,0 +1 @@
+echo 'hi'

data/vagrant-windows.gemspec

@@ -2,11 +2,14 @@
 require File.expand_path('../lib/vagrant-windows/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Paul Morton"]
-  gem.email         = ["pmorton@biaprotect.com"]
+  gem.name          = "vagrant-windows"
+  gem.version       = VagrantWindows::VERSION
+  gem.authors       = ["Paul Morton", "Shawn Neal"]
+  gem.email         = ["pmorton@biaprotect.com", "sneal@sneal.net"]
   gem.description   = %q{Windows Guest Support for Vagrant}
   gem.summary       = %q{A small gem that adds windows guest support to vagrant, uses WinRM as the Communication Channel}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/WinRb/vagrant-windows"
+  gem.license       = "APACHE2"
 
   # 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
@@ -42,9 +45,7 @@ Gem::Specification.new do |gem|
   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"
   gem.require_paths = ["lib"]
-  gem.version       = VagrantWindows::VERSION
 
   gem.add_runtime_dependency "winrm", "~> 1.1.1"
 

metadata

@@ -1,18 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Paul Morton
+- Shawn Neal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +31,23 @@ dependencies:
 - !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
@@ -48,6 +55,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,24 +95,28 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   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'
 description: Windows Guest Support for Vagrant
 email:
 - pmorton@biaprotect.com
+- sneal@sneal.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - coverage/assets/0.7.1/application.css
 - coverage/assets/0.7.1/application.js
 - coverage/assets/0.7.1/fancybox/blank.gif
@@ -143,18 +159,19 @@ files:
 - coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
 - coverage/index.html
 - Gemfile
+- init.pp
 - 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/communication/winrmshell_factory.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/cap/mount_shared_folder.rb
 - lib/vagrant-windows/guest/windows.rb
 - lib/vagrant-windows/helper.rb
 - lib/vagrant-windows/monkey_patches/lib/vagrant/machine.rb
@@ -170,52 +187,75 @@ files:
 - 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.virtualbox.ps1.erb
-- lib/vagrant-windows/scripts/mount_volume.vmware.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
 - lib/vagrant-windows/scripts/winrs_v3_get_adapters.ps1
 - lib/vagrant-windows/version.rb
+- lib/vagrant-windows/windows_machine.rb
 - lib/vagrant-windows.rb
+- LICENSE
 - locales/en.yml
+- puppet-3.3.2.msi
 - 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/mount_shared_folder_spec.rb
+- spec/vagrant-windows/windows_config_spec.rb
+- spec/vagrant-windows/windows_machine_spec.rb
+- spec/vagrant-windows/winrm_config_spec.rb
 - spec/vagrant-windows/winrmcommunicator_spec.rb
+- spec/vagrant-windows/winrmfinder_spec.rb
+- spec/vagrant-windows/winrmshell_spec.rb
+- test.ps1
 - vagrant-windows.gemspec
+- .DS_Store
 - .gitignore
 - .travis.yml
 - coverage/.last_run.json
 - coverage/.resultset.json
-homepage: ''
-licenses: []
-metadata: {}
+homepage: https://github.com/WinRb/vagrant-windows
+licenses:
+- APACHE2
 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: -417370087256644247
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -417370087256644247
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 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/mount_shared_folder_spec.rb
+- spec/vagrant-windows/windows_config_spec.rb
+- spec/vagrant-windows/windows_machine_spec.rb
+- spec/vagrant-windows/winrm_config_spec.rb
 - spec/vagrant-windows/winrmcommunicator_spec.rb
+- spec/vagrant-windows/winrmfinder_spec.rb
+- spec/vagrant-windows/winrmshell_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cecfc851c351d99894540e03b595c9ed93fb313b
-  data.tar.gz: 325c6d920df52dc61f4db48e64337b88480a1b0d
-SHA512:
-  metadata.gz: c5d93cd182875294ee9c50911b272363752039d8ab1ccae5c620291b109eb7c04a3ec8073901982e64fa040b04678197936fc8f2fe97d925ebb71fb8c230c438
-  data.tar.gz: 9932265ce43b14f7b942146291e1696d861c2070d8b79b147bda0b02bc4e41ac486b8996e20fac232802ddea0b083f276e2dddd7f7692cd5e49a711033fc2582

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

@@ -1,17 +0,0 @@
-require_relative '../../helper'
-
-module VagrantWindows
-  module Guest
-    module Cap
-      class MountVirtualBoxSharedFolder
-        
-        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
-          share_name = VagrantWindows::Helper.win_friendly_share_id(name)
-          mount_script = VagrantWindows.load_script_template("mount_volume.virtualbox.ps1",
-            :options => {:mount_point => guestpath, :share_name => share_name})
-          machine.communicate.execute(mount_script, {:shell => :powershell})
-        end
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-module VagrantWindows
-  module Guest
-    module Cap
-      class MountVMwareSharedFolder
-
-        def self.mount_vmware_shared_folder(machine, name, guestpath, options)
-          share_name = VagrantWindows::Helper.win_friendly_share_id(name)
-          mount_script = VagrantWindows.load_script_template("mount_volume.vmware.ps1",
-            :options => {:mount_point => guestpath, :share_name => share_name})
-          machine.communicate.execute(mount_script, {:shell => :powershell})
-        end
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-
-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" "\\vboxsrv\$ShareName" | out-null
-
-if ( $LASTEXITCODE -ne 0 )
-{
-  exit 1
-}