vagrant-windows 1.2.1 → 1.2.2

data/LICENSE

@@ -0,0 +1,13 @@
+Copyright (c) 2013 Paul Morton, Shawn Neal
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -20,12 +20,12 @@ Use Windows guests with Vagrant
 
 Supported Guest Operating Systems:
 - Windows 7
-- Windows 2008
-- Windows 2008 R2
-- Windows 2012
 - Windows 8
+- Windows Server 2008
+- Windows Server 2008 R2
+- Windows Server 2012
 
-Windows Server 2003 and Windows XP are not supported.
+Windows Server 2003 and Windows XP are not supported by the maintainers of this project. Any issues regarding any unsupported guest OS will be closed. If you still insist on using XP or Server 2003, [this](http://stackoverflow.com/a/18593425/18475) may help.
 
 You'll need to create a new Vagrant base box. Create a new Windows VM in VirtualBox, configure some Windows settings (see below) then follow the [Vagrant packaging instructions](http://docs.vagrantup.com/v2/cli/package.html).
 

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

@@ -42,19 +42,29 @@ module VagrantWindows
       end
       
       def execute(command, opts={}, &block)
-        if opts[:shell].eql? :cmd
-          session.cmd(command, &block)[:exitcode]
-        else
-          command = VagrantWindows.load_script("command_alias.ps1") << "\r\n" << command
-          session.powershell(command, &block)[:exitcode]
+        opts = {
+          :error_check => true,
+          :error_class => VagrantWindows::Errors::WinRMExecutionError,
+          :error_key   => :winrm_execution_error,
+          :command     => command,
+          :shell       => :powershell
+        }.merge(opts || {})
+        exit_status = do_execute(command, opts[:shell], &block)
+        if opts[:error_check] && exit_status != 0
+          raise_execution_error(opts, exit_status)
         end
+        exit_status
       end
       alias_method :sudo, :execute
       
       def test(command, opts=nil)
+        @logger.debug("Testing: #{command}")
+        
         # HACK: to speed up Vagrant 1.2 OS detection, skip checking for *nix OS
         return false unless (command =~ /^uname|^cat \/etc|^cat \/proc|grep 'Fedora/).nil?
-        execute(command) == 0
+
+        opts = { :error_check => false }.merge(opts || {})
+        execute(command, opts) == 0
       end
 
       def upload(from, to)
@@ -103,6 +113,23 @@ module VagrantWindows
       
       protected
       
+      def do_execute(command, shell, &block)
+        if shell.eql? :cmd
+          session.cmd(command, &block)[:exitcode]
+        else
+          command = VagrantWindows.load_script("command_alias.ps1") << "\r\n" << command
+          session.powershell(command, &block)[:exitcode]
+        end
+      end
+      
+      def raise_execution_error(opts, exit_code)
+        # The error classes expect the translation key to be _key, but that makes for an ugly
+        # configuration parameter, so we set it here from `error_key`
+        msg = "Command execution failed with an exit code of #{exit_code}"
+        error_opts = opts.merge(:_key => opts[:error_key], :message => msg)
+        raise opts[:error_class], error_opts
+      end
+      
       def new_session
         WinRMShell.new(
           @winrm_finder.winrm_host_address(),

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

@@ -15,11 +15,14 @@ module VagrantWindows
 
       def winrm_host_address
         # Get the SSH info for the machine, raise an exception if the
-        # provider is saying that SSH is not ready.
+        # provider is saying that the machine is not ready.
         ssh_info = @machine.ssh_info
-        raise Vagrant::Errors::SSHNotReady if ssh_info.nil?
-        @logger.info("WinRM host: #{ssh_info[:host]}")
-        return ssh_info[:host]
+        raise VagrantWindows::Errors::WinRMNotReady if ssh_info.nil?
+        
+        # if the configuration has a host value, that takes precedence
+        host = @machine.config.winrm.host || ssh_info[:host]
+        @logger.info("WinRM host: #{host}")
+        host
       end
       
       def winrm_host_port

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

@@ -60,26 +60,24 @@ module VagrantWindows
       protected
       
       def execute_shell(command, shell=:powershell, &block)
+        raise Errors::WinRMInvalidShell, :shell => shell unless shell == :cmd || shell == :powershell
+        begin
+          execute_shell_with_retry(command, shell, &block)
+        rescue => e
+          raise_winrm_exception(e, shell, command)
+        end
+      end
+      
+      def execute_shell_with_retry(command, shell, &block)
         retryable(:tries => @max_tries, :on => @@exceptions_to_retry_on, :sleep => 10) do
           @logger.debug("#{shell} executing:\n#{command}")
-          if shell.eql? :cmd
-            output = session.cmd(command) do |out, err|
-              block.call(:stdout, out) if block_given? && out
-              block.call(:stderr, err) if block_given? && err
-            end
-          elsif shell.eql? :powershell
-            output = session.powershell(command) do |out, err|
-              block.call(:stdout, out) if block_given? && out
-              block.call(:stderr, err) if block_given? && err
-            end
-          else
-            raise Errors::WinRMInvalidShell, :shell => shell
+          output = session.send(shell, command) do |out, err|
+            block.call(:stdout, out) if block_given? && out
+            block.call(:stderr, err) if block_given? && err
           end
           @logger.debug("Exit status: #{output[:exitcode].inspect}")
           return output
         end
-      rescue => e
-        handle_winrm_exception(e, shell, command)
       end
       
       def execute_wql(query)
@@ -90,10 +88,10 @@ module VagrantWindows
           return output
         end
       rescue => e
-        handle_winrm_exception(e, :wql, query)
+        raise_winrm_exception(e, :wql, query)
       end
       
-      def handle_winrm_exception(winrm_exception, shell, command)
+      def raise_winrm_exception(winrm_exception, shell, command)
         if winrm_exception.message.include?("401") # return a more specific auth error for 401 errors
           raise Errors::WinRMAuthorizationError,
             :user => @username,

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

@@ -27,7 +27,6 @@ module VagrantWindows
 
         errors << "winrm.username cannot be nil."   if machine.config.winrm.username.nil?
         errors << "winrm.password cannot be nil."   if machine.config.winrm.password.nil?
-        errors << "winrm.host cannot be nil."       if machine.config.winrm.host.nil?
         errors << "winrm.port cannot be nil."       if machine.config.winrm.port.nil?
         errors << "winrm.guest_port cannot be nil." if machine.config.winrm.guest_port.nil?
         errors << "winrm.max_tries cannot be nil."  if machine.config.winrm.max_tries.nil?
@@ -39,7 +38,7 @@ module VagrantWindows
       def finalize!
         @username = "vagrant" if @username == UNSET_VALUE
         @password = "vagrant" if @password == UNSET_VALUE
-        @host = "localhost"   if @host == UNSET_VALUE
+        @host = nil           if @host == UNSET_VALUE
         @port = 5985          if @port == UNSET_VALUE
         @guest_port = 5985    if @guest_port == UNSET_VALUE
         @max_tries = 20       if @max_tries == UNSET_VALUE

data/lib/vagrant-windows/errors.rb

@@ -7,8 +7,8 @@ module VagrantWindows
       error_namespace("vagrant_windows.errors")
     end  
     
-    class WinRMPortNotDetected < VagrantWindowsError
-      error_key(:winrm_port_not_detected)
+    class WinRMNotReady < VagrantWindowsError
+      error_key(:winrm_not_ready)
     end
 
     class WinRMInvalidShell < VagrantWindowsError

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

@@ -9,7 +9,7 @@ module VagrantWindows
   module Guest
     class Windows < Vagrant.plugin("2", :guest)
       
-      # Vagrant 1.1.x compatibibility methods
+      # Vagrant 1.1.x compatibility methods
       # Implement the 1.1.x methods and call through to the new 1.2.x capabilities
       
       attr_reader :machine
@@ -46,7 +46,7 @@ module VagrantWindows
       end
       
       
-      # Vagrant 1.2.x compatibibility methods
+      # Vagrant 1.2.x compatibility methods
       
       def detect?(machine)
         

data/lib/vagrant-windows/monkey_patches/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -4,19 +4,19 @@ module VagrantPlugins
   module Puppet
     module Provisioner
       class Puppet < Vagrant.plugin("2", :provisioner)
-        
+
         # This patch is needed until Vagrant supports Puppet on Windows guests
         run_puppet_apply_on_linux = instance_method(:run_puppet_apply)
         configure_on_linux = instance_method(:configure)
-        
+
         define_method(:run_puppet_apply) do
           is_windows ? run_puppet_apply_on_windows() : run_puppet_apply_on_linux.bind(self).()
         end
-        
+
         define_method(:configure) do |root_config|
           is_windows ? configure_on_windows(root_config) : configure_on_linux.bind(self).(root_config)
         end
-        
+
         def run_puppet_apply_on_windows
           options = [config.options].flatten
           module_paths = @module_paths.map { |_, to| to }
@@ -28,6 +28,16 @@ module VagrantPlugins
             options << "--modulepath '#{module_paths.join(';')}'"
           end
 
+          if @hiera_config_path
+            options << "--hiera_config=#{@hiera_config_path}"
+          end
+
+          if !@machine.env.ui.is_a?(Vagrant::UI::Colored)
+            options << "--color=false"
+          end
+
+          options << "--manifestdir #{manifests_guest_path}"
+          options << "--detailed-exitcodes"
           options << @manifest_file
           options = options.join(" ")
 
@@ -41,9 +51,12 @@ module VagrantPlugins
 
             facter = "#{facts.join(" ")} "
           end
-          
-          command = "cd #{manifests_guest_path}; if($?) \{ #{facter} puppet apply #{options} \}"
-          
+
+          command = "#{facter} puppet apply #{options}"
+          if config.working_directory
+            command = "cd #{config.working_directory}; if($?) \{ #{command} \}"
+          end
+
           @machine.env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet",
                                       :manifest => @manifest_file)
 
@@ -53,13 +66,13 @@ module VagrantPlugins
             end
           end
         end
-        
+
         def configure_on_windows(root_config)
           # Calculate the paths we're going to use based on the environment
           root_path = @machine.env.root_path
           @expanded_manifests_path = @config.expanded_manifests_path(root_path)
           @expanded_module_paths   = @config.expanded_module_paths(root_path)
-          @manifest_file           = @config.manifest_file
+          @manifest_file           = File.join(manifests_guest_path, @config.manifest_file)
 
           # Setup the module paths
           @module_paths = []
@@ -70,7 +83,7 @@ module VagrantPlugins
           @logger.debug("Syncing folders from puppet configure")
           @logger.debug("manifests_guest_path = #{manifests_guest_path}")
           @logger.debug("expanded_manifests_path = #{@expanded_manifests_path}")
-          
+
           # Windows guest volume mounting fails without an "id" specified
           # This hacks around that problem and allows the PS mount script to work
           root_config.vm.synced_folder(

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/locales/en.yml

@@ -2,11 +2,8 @@ en:
   vagrant_windows:
 
     errors:
-      winrm_port_not_detected: |-
-        Vagrant could not detect the WinRM port.
-
-        Host port: %{port}
-        Guest port: %{guest_port}
+      winrm_not_ready: |-
+        The box is not ready for WinRM connections yet.
       winrm_invalid_shell: |-
         %{shell} is not a supported type of Windows shell.
       winrm_execution_error: |-

data/spec/vagrant-windows/windows_config_spec.rb

@@ -0,0 +1,26 @@
+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

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

@@ -11,15 +11,17 @@ describe VagrantWindows::Communication::WinRMCommunicator, :integration => true
   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
-      end
-      expect(exit_code).to eq(1)
+    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
 

data/spec/vagrant-windows/winrmfinder_spec.rb

@@ -0,0 +1,44 @@
+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_config = stub(:winrm => winrm_config)
+      @machine.stubs(:config).returns(machine_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_config = stub(:winrm => winrm_config)
+      @machine.stubs(:config).returns(machine_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("localhost", "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/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,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
 - Paul Morton
+- Shawn Neal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -110,6 +111,7 @@ dependencies:
 description: Windows Guest Support for Vagrant
 email:
 - pmorton@biaprotect.com
+- sneal@sneal.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -188,23 +190,28 @@ files:
 - lib/vagrant-windows/scripts/winrs_v3_get_adapters.ps1
 - lib/vagrant-windows/version.rb
 - lib/vagrant-windows.rb
+- LICENSE
 - 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/mount_shared_folder_spec.rb
+- spec/vagrant-windows/windows_config_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
 - vagrant-windows.gemspec
 - .DS_Store
 - .gitignore
 - .travis.yml
 - coverage/.last_run.json
 - coverage/.resultset.json
-homepage: ''
-licenses: []
+homepage: https://github.com/WinRb/vagrant-windows
+licenses:
+- APACHE2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -217,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1712186085374339877
+      hash: -3356460021389253902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1712186085374339877
+      hash: -3356460021389253902
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -236,8 +243,11 @@ summary: A small gem that adds windows guest support to vagrant, uses WinRM as t
   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/winrm_config_spec.rb
 - spec/vagrant-windows/winrmcommunicator_spec.rb
+- spec/vagrant-windows/winrmfinder_spec.rb
+- spec/vagrant-windows/winrmshell_spec.rb