vagrant-windows 1.0.1 → 1.0.3

data/Gemfile

@@ -7,5 +7,5 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.1.5'
 end

data/README.md

@@ -1,4 +1,3 @@
-
 Installing Vagrant-Windows
 ==========================
 
@@ -6,6 +5,15 @@ Installing Vagrant-Windows
 - Vagrant 1.1 should use <code>gem "vagrant-windows", "~> 1.0.0"</code>
 - Vagrant 1.2 is not yet supported. There needs to be a refactor to support capabilities. We are looking for a backwards compatiable way to implement this.
 
+Supported Guest Operating Systems (Your VM)
+===========================================
+_Does NOT work with Windows 2003 or XP_
+
+- Windows 7
+- Windows 2008
+- Windows 2008 R2
+- Windows 2012
+- Windows 8
 
 Building a Base Box
 ===================
@@ -39,7 +47,6 @@ config.vm.guest = :windows
 config.windows.halt_timeout = 15
 config.winrm.username = "vagrant"
 config.winrm.password = "vagrant"
-config.vm.network :forwarded_port, guest: 3389, host: 3389
 config.vm.network :forwarded_port, guest: 5985, host: 5985
 ```
 
@@ -87,10 +94,7 @@ What Works?
 - vagrant up|halt|reload|provision
 - Chef Vagrant Provisioner
 - Puppet Vagrant Provisioner
-
-What has not been tested
-========================
-- Shell provisioning. Shell should work, though I have not vetted it yet.
+- Shell Vagrant provisioner. Batch files or PowerShell (ps1) scripts are supported as well as inline scripts.
 
 TODOs
 =========
@@ -161,13 +165,31 @@ References and Shout Outs
 
 Changelog
 =========
-0.1.1 - Remove extra debug information from command output.
+0.1.1
+
+- Remove extra debug information from command output.
+
+0.1.2
+
+- Added virtual box 4.2 support.
+
+0.1.3 
+
+- Added puppet provisioner.
+
+1.0.0 
+
+- Converted to Vagrant 1.1.x plugin architecture.
+
+1.0.1 
 
-0.1.2 - Added virtual box 4.2 support.
+- Fix #29 Monkey Patch the 4.2 driver to include read_mac_addresses. 
+  - use read_mac_addresses in all cases.
 
-0.1.3 - Added puppet provisioner.
+1.0.3 
 
-1.0.0 - Converted to Vagrant 1.1.x plugin architecture.
+- Added vagrant shell provisioner. 
+          The built-in shell provisioner tried to chmod the target script which doesn't make sense on windows.
 
-1.1.1 - Fix #29 Monkey Patch the 4.2 driver to include read_mac_addresses. 
-        use read_mac_addresses in all cases.
+- Can now run the vagrant-windows plugin via bundle exec instead of vagrant plugin install (for plugin dev).The vagrant src root finding logic didn't work from a bundle, but the native Vagrant src root does.
+- Readme fixes/updates.

data/lib/vagrant-windows.rb

@@ -2,15 +2,6 @@ require "pathname"
 
 module VagrantWindows
   
-  def self.vagrant_lib_root
-    # example match: /Applications/Vagrant/embedded/gems/gems/vagrant-1.1.2/lib
-    @vagrant_lib_root ||= $LOAD_PATH.select { |p| p =~ /\/vagrant-[1-9].[0-9].[0-9]\/lib/ }.first
-  end
-  
-  def self.vagrant_root
-    @vagrant_root ||= Pathname.new(File.expand_path("../", vagrant_lib_root))
-  end
-  
   def self.vagrant_windows_root
     @vagrant_windows_root ||= Pathname.new(File.expand_path("../../", __FILE__))
   end

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

@@ -51,7 +51,9 @@ module VagrantWindows
           :shell       => :powershell
         }.merge(opts || {})
 
-        command = VagrantWindows.load_script("command_alias.ps1") << "\r\n" << command
+        if opts[:shell].eql? :powershell
+          command = VagrantWindows.load_script("command_alias.ps1") << "\r\n" << command
+        end
         exit_status = 0
         
         begin
@@ -113,7 +115,7 @@ module VagrantWindows
         Base64.encode64(IO.binread(from)).gsub("\n",'').chars.to_a.each_slice(8000-file_name.size) do |chunk|
           out = session.cmd( "echo #{chunk.join} >> \"#{file_name}\"" )
         end
-        execute "mkdir [System.IO.Path]::GetDirectoryName(\"#{to}\")"
+        execute "mkdir $([System.IO.Path]::GetDirectoryName(\"#{to}\"))"
         execute <<-EOH
           $base64_string = Get-Content \"#{file_name}\"
           $bytes  = [System.Convert]::FromBase64String($base64_string) 
@@ -210,4 +212,4 @@ module VagrantWindows
 
     end #WinRM class
   end
-end
+end

data/lib/vagrant-windows/helper.rb

@@ -0,0 +1,13 @@
+module VagrantWindows
+  module Helper
+    
+    def win_friendly_path(path)
+      if path
+        new_path = path.gsub('/', '\\')
+        new_path = "c:#{new_path}" if new_path =~ /^\\/
+      end
+      new_path
+    end
+    
+  end
+end

data/lib/vagrant-windows/monkey_patches/chef_solo.rb

@@ -1,4 +1,4 @@
-require "#{VagrantWindows::vagrant_root}/plugins/provisioners/chef/provisioner/chef_solo"
+require "#{Vagrant::source_root}/plugins/provisioners/chef/provisioner/chef_solo"
 
 module VagrantPlugins
   module Chef

data/lib/vagrant-windows/monkey_patches/provisioner.rb

@@ -0,0 +1,89 @@
+require "#{Vagrant::source_root}/plugins/provisioners/shell/provisioner"
+require "vagrant-windows/helper"
+
+module VagrantPlugins
+  module Shell
+      class Provisioner < Vagrant.plugin("2", :provisioner)
+        
+        include VagrantWindows::Helper
+
+        # This patch is needed until Vagrant supports Puppet on Windows guests
+        provision_on_linux = instance_method(:provision)
+        
+        define_method(:provision) do
+          is_windows ? provision_on_windows() : provision_on_linux.bind(self).()
+        end
+
+        def provision_on_windows
+            args = ""
+            args = " #{config.args}" if config.args
+
+            with_script_file do |path|
+            # Upload the script to the machine
+            @machine.communicate.tap do |comm|
+              # Ensure the uploaded script has a file extension, by default
+              # config.upload_path from vagrant core does not
+              fixed_upload_path = if File.extname(config.upload_path) == ""
+                "#{config.upload_path}#{File.extname(path.to_s)}"
+              else
+                config.upload_path
+              end
+              comm.upload(path.to_s, fixed_upload_path)
+
+              command = <<-EOH
+              $old = Get-ExecutionPolicy;
+              Set-ExecutionPolicy Unrestricted -force;
+              #{win_friendly_path(fixed_upload_path)}#{args};
+              Set-ExecutionPolicy $old -force
+              EOH
+              
+              # Execute it with sudo
+              comm.sudo(command) do |type, data|
+                if [:stderr, :stdout].include?(type)
+                  # Output the data with the proper color based on the stream.
+                  color = type == :stdout ? :green : :red
+
+                  # Note: Be sure to chomp the data to avoid the newlines that the
+                  # Chef outputs.
+                  @machine.env.ui.info(data.chomp, :color => color, :prefix => false)
+                end
+              end
+              
+            end
+          end
+        end
+
+
+        protected
+
+        # This method yields the path to a script to upload and execute
+        # on the remote server. This method will properly clean up the
+        # script file if needed.
+        def with_script_file
+          if config.path
+            # Just yield the path to that file...
+            yield config.path
+          else
+            # Otherwise we have an inline script, we need to Tempfile it,
+            # and handle it specially...
+            file = Tempfile.new(['vagrant-powershell', '.ps1'])
+
+            begin
+              file.write(config.inline)
+              file.fsync
+              file.close
+              yield file.path
+            ensure
+              file.close
+              file.unlink
+            end
+          end
+        end
+
+        def is_windows
+            @machine.config.vm.guest.eql? :windows
+        end
+
+      end # Provisioner class
+  end
+end

data/lib/vagrant-windows/monkey_patches/puppet.rb

@@ -1,4 +1,4 @@
-require "#{VagrantWindows::vagrant_root}/plugins/provisioners/puppet/provisioner/puppet"
+require "#{Vagrant::source_root}/plugins/provisioners/puppet/provisioner/puppet"
 
 module VagrantPlugins
   module Puppet
@@ -85,7 +85,7 @@ module VagrantPlugins
           @module_paths.each do |from, to|
             # Sorry for the cryptic key here, but VirtualBox has a strange limit on
             # maximum size for it and its something small (around 10)
-            root_config.vm.synced_folder(from, to)
+            root_config.vm.synced_folder(from, to, :id => "v-modules-#{count}")
             count += 1
           end
         end

data/lib/vagrant-windows/plugin.rb

@@ -16,7 +16,7 @@ require "vagrant-windows/errors"
 # Add Vagrant WinRM communication channel
 require "vagrant-windows/communication/winrmcommunicator"
 
-# Monkey patch the Puppet provisioner to support PowerShell/Windows
+# Monkey patch the vbox42 driver 
 require "vagrant-windows/monkey_patches/vbox_42_driver"
 
 # Monkey Patch the VM object to support multiple channels, i.e. WinRM
@@ -28,6 +28,9 @@ require "vagrant-windows/monkey_patches/puppet"
 # Monkey patch the Chef-Solo provisioner to support PowerShell/Windows
 require "vagrant-windows/monkey_patches/chef_solo"
 
+# Monkey patch the shell provisioner to support PowerShell/batch/exe/Windows/etc
+require "vagrant-windows/monkey_patches/provisioner"
+
 # Add our windows specific config object
 require "vagrant-windows/config/windows"
 

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.0.1"
+  VERSION = "1.0.3"
 end

data/spec/vagrant-windows/helper_spec.rb

@@ -0,0 +1,27 @@
+require "vagrant-windows/helper"
+
+describe VagrantWindows::Helper do
+  
+  class DummyHelper
+    include VagrantWindows::Helper
+  end
+  
+  before(:all) do
+    @dummy = DummyHelper.new
+  end
+
+  describe "win_friendly_path" do
+    it "should replace slashes with backslashes" do
+      @dummy.win_friendly_path('c:/tmp/dir').should eq('c:\\tmp\\dir')
+    end
+    
+    it "should prepend c: drive if not drive specified" do
+      @dummy.win_friendly_path('/tmp/dir').should eq('c:\\tmp\\dir')
+    end
+    
+    it "should return nil if no path specified" do
+      @dummy.win_friendly_path(nil).should be_nil
+    end
+  end
+
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Paul Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-06-07 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 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,34 +30,39 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !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
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,8 +125,10 @@ files:
 - lib/vagrant-windows/config/winrm.rb
 - lib/vagrant-windows/errors.rb
 - lib/vagrant-windows/guest/windows.rb
+- lib/vagrant-windows/helper.rb
 - lib/vagrant-windows/monkey_patches/chef_solo.rb
 - lib/vagrant-windows/monkey_patches/machine.rb
+- lib/vagrant-windows/monkey_patches/provisioner.rb
 - lib/vagrant-windows/monkey_patches/puppet.rb
 - lib/vagrant-windows/monkey_patches/vbox_42_driver.rb
 - lib/vagrant-windows/plugin.rb
@@ -123,30 +138,39 @@ files:
 - lib/vagrant-windows/version.rb
 - locales/en.yml
 - spec/vagrant-windows/config_spec.rb
+- spec/vagrant-windows/helper_spec.rb
 - vagrant-windows.gemspec
 homepage: ''
 licenses: []
-metadata: {}
 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: 459186587088148181
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 459186587088148181
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 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/vagrant-windows/config_spec.rb
+- spec/vagrant-windows/helper_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e8275a55fe7f1a0a294fbe31a81a6e6e6a6014b2
-  data.tar.gz: dc9745a62fe13ee73cb65812e4698051f726508c
-SHA512:
-  metadata.gz: ad5f812d845fce099340ba355bef6b6e041576125483e706b989c6b092005f0aa45375f0f4a24981834710eebaadde495eda90c499a943fded37783fe75e6b18
-  data.tar.gz: 7f504f4eb7aac168441142cb90225fbf22f6535f330c33c384f9eac2bc29238faddd886715235c4a4f3ed88760ddad13ab900e3a42f27774f972e1bb18e8b2e4