vagrant-windows 1.0.0 → 1.0.3

data/Gemfile

@@ -1,5 +1,11 @@
-source :rubygems
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in my_gem.gemspec
 gemspec
 
+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", :tag => 'v1.1.5'
+end

data/Gemfile.lock

@@ -1,32 +1,61 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: 64e360814c3ad960d810456add977fd4c7d47ce6
+  tag: v1.1.5
+  specs:
+    vagrant (1.1.5)
+      childprocess (~> 0.3.7)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (>= 1.5.1, < 1.8.0)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.6.6)
+
 PATH
   remote: .
   specs:
-    vagrant-windows (0.2.0)
+    vagrant-windows (1.0.3)
       highline
       winrm (~> 1.1.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    builder (3.0.4)
-    ffi (1.4.0)
+    builder (3.2.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.8.1)
     gssapi (1.0.3)
       ffi (>= 1.0.1)
-    gyoku (0.4.6)
+    gyoku (1.0.0)
       builder (>= 2.1.2)
-    highline (1.6.15)
+    highline (1.6.18)
     httpclient (2.2.0.2)
     httpi (0.9.7)
       rack
+    i18n (0.6.4)
+    json (1.7.7)
     little-plugger (1.1.3)
+    log4r (1.1.10)
     logging (1.6.2)
       little-plugger (>= 1.1.3)
-    nokogiri (1.5.6)
-    nori (1.1.3)
+    net-scp (1.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    nokogiri (1.5.9)
+    nori (1.1.5)
     rack (1.5.2)
+    rake (10.0.4)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
     rubyntlm (0.1.1)
     savon (0.9.5)
       akami (~> 1.0)
@@ -36,7 +65,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 1.0)
-    uuidtools (2.1.3)
+    uuidtools (2.1.4)
     wasabi (1.0.0)
       nokogiri (>= 1.4.0)
     winrm (1.1.2)
@@ -52,4 +81,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
+  rspec-core (~> 2.12.2)
+  rspec-expectations (~> 2.12.1)
+  rspec-mocks (~> 2.12.1)
+  vagrant!
   vagrant-windows!

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
 =========
@@ -138,6 +142,19 @@ Contributing
 4. Push to the branch (git push origin my_feature_branch)
 5. Create a pull requst from your branch into master (Please be sure to provide enough detail for us to cipher what this change is doing)
 
+Running tests
+=============
+Clone this repository and use [Bundler](http://gembundler.com) to get the dependencies:
+
+```
+$ bundle install
+```
+
+Once you have the dependencies, you can run the tests with `rake`:
+
+```
+$ rake spec
+```
 
 References and Shout Outs
 =========================
@@ -148,10 +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 
+
+- Fix #29 Monkey Patch the 4.2 driver to include read_mac_addresses. 
+  - use read_mac_addresses in all cases.
 
-0.1.2 - Added virtual box 4.2 support.
+1.0.3 
 
-0.1.3 - Added puppet provisioner.
+- Added vagrant shell provisioner. 
+          The built-in shell provisioner tried to chmod the target script which doesn't make sense on windows.
 
-1.0.0 - Converted to Vagrant 1.1.x plugin architecture.
+- 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/Rakefile

@@ -1,2 +1,15 @@
-#!/usr/bin/env rake
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+
+# Change to the directory of this file.
+Dir.chdir(File.expand_path("../", __FILE__))
+
+# For gem creation and bundling
 require "bundler/gem_tasks"
+
+# Install the `spec` task so that we can run tests.
+RSpec::Core::RakeTask.new
+
+# Default task is to run the unit tests
+task :default => "build"

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/guest/windows.rb

@@ -67,14 +67,7 @@ module VagrantWindows
 
       def configure_networks(networks)
         @logger.info("configure_networks: #{networks.inspect}")
-
-        # The VBox driver 4.0 and 4.1 implement read_mac_addresses, but 4.2 does not?
-        begin
-          driver_mac_address = @machine.provider.driver.read_mac_addresses.invert
-        rescue NoMethodError
-          driver_mac_address = {}
-          driver_mac_address[@machine.provider.driver.read_mac_address] = "macaddress1"
-        end
+        driver_mac_address = @machine.provider.driver.read_mac_addresses.invert
 
         vm_interface_map = {}
 

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/monkey_patches/vbox_42_driver.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Driver
+      class Version_4_2
+        def read_mac_addresses
+          macs = {}
+          info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+          info.split("\n").each do |line|
+            if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
+              adapter = matcher[1].to_i
+              mac = matcher[2].to_s
+              macs[adapter] = mac
+            end
+          end
+          macs
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-windows/plugin.rb

@@ -16,6 +16,9 @@ require "vagrant-windows/errors"
 # Add Vagrant WinRM communication channel
 require "vagrant-windows/communication/winrmcommunicator"
 
+# 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
 require "vagrant-windows/monkey_patches/machine"
 
@@ -25,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.0"
+  VERSION = "1.0.3"
 end

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/spec/vagrant-windows/config_spec.rb

@@ -0,0 +1,58 @@
+require "vagrant-windows/config/windows"
+require "vagrant-windows/config/winrm"
+
+describe VagrantWindows::Config::Windows 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
+  let(:instance) { described_class.new }
+
+  describe "defaults" do
+    subject do
+      instance.tap do |o|
+        o.finalize!
+      end
+    end
+
+    its("username")   { should == "vagrant" }
+    its("password")   { should == "vagrant" }
+    its("host")       { should == "localhost" }
+    its("port")       { should == 5985 }
+    its("guest_port") { should == 5985 }
+    its("max_tries")  { should == 12 }
+    its("timeout")    { should == 1800 }
+  end
+
+  describe "overriding defaults" do
+    [:username, :password, :host, :port, :guest_port, :max_tries, :timeout].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/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

data/vagrant-windows.gemspec

@@ -17,4 +17,9 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "winrm", "~> 1.1.1"
   gem.add_runtime_dependency 'highline'
-end
+
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec-core", "~> 2.12.2"
+  gem.add_development_dependency "rspec-expectations", "~> 2.12.1"
+  gem.add_development_dependency "rspec-mocks", "~> 2.12.1"
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Paul Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 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,17 +30,83 @@ 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
+        version: 2.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.2
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 description: Windows Guest Support for Vagrant
 email:
 - pmorton@biaprotect.com
@@ -56,38 +125,52 @@ 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
 - lib/vagrant-windows/scripts/command_alias.ps1
 - lib/vagrant-windows/scripts/mount_volume.ps1.erb
 - lib/vagrant-windows/scripts/ps_runas.ps1.erb
 - 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: []
+test_files:
+- spec/vagrant-windows/config_spec.rb
+- spec/vagrant-windows/helper_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6373e5fcaeafb284ed319640b162f38d2c1fbb42
-  data.tar.gz: f292ab1b6c18eb837fd7b5d8f9b2bc34dfda6aad
-SHA512:
-  metadata.gz: e86f29b4b5661bd43041cda843cf062735b3f66ca80a20a0c097724572a3124a4131bb809201bc8e77767e845c2a998350be3af2028108eb40c6e781dd6d0c96
-  data.tar.gz: 770f88ccf1d8bc53f22921a56dc1a27c5176b93c6bc8e4eab9336ab21d19706558a1c1f02ac3136302110313518d8275c207074db8ad5b2b76ade076edeca977