vagrant-windows 1.0.0 → 1.0.1

checksums.yaml

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

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"
+end

data/Gemfile.lock

@@ -1,32 +1,60 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: 52448c97cc1ee506bacdff4bd679ca497bd7cf1c
+  specs:
+    vagrant (1.2.3.dev)
+      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.1)
       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)
+    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.4.0)
     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.16)
     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.0)
+      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)
@@ -52,4 +80,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

@@ -138,6 +138,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
 =========================
@@ -155,3 +168,6 @@ Changelog
 0.1.3 - Added puppet provisioner.
 
 1.0.0 - Converted to Vagrant 1.1.x plugin architecture.
+
+1.1.1 - Fix #29 Monkey Patch the 4.2 driver to include read_mac_addresses. 
+        use read_mac_addresses in all cases.

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/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/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 Puppet provisioner to support PowerShell/Windows
+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"
 

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 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/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Paul Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -38,6 +38,62 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.2
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.1
 description: Windows Guest Support for Vagrant
 email:
 - pmorton@biaprotect.com
@@ -59,12 +115,14 @@ files:
 - lib/vagrant-windows/monkey_patches/chef_solo.rb
 - lib/vagrant-windows/monkey_patches/machine.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
 - vagrant-windows.gemspec
 homepage: ''
 licenses: []
@@ -90,4 +148,5 @@ signing_key:
 specification_version: 4
 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