vagrant-dsc 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb46c21c9dad5ddf2db40a8a841534d6f05a11e1
-  data.tar.gz: cc3926215945aa34552386b308336b6a59e664bb
+  metadata.gz: 62685e91971c7c7cb5efccec0e81fd8af44e0d20
+  data.tar.gz: 2bb9b7e13583abed3f226e9734a77d30c4bed9ea
 SHA512:
-  metadata.gz: 8405032a7b4fd7aa23daed69c33e378e0523cb855145dd2468bd0e8ec49eabba932ad1823ac6996927be042091a7e2083664c94d6c5e02d6f2202ae2f3867576
-  data.tar.gz: 80a245e2d999405d4f6843eb65c39727dc627929f1c905ccf5785eca6fb23f0f82b19370d0b397e998014ad3a2872762ebfe37e331bde0b83a74c8fe36245155
+  metadata.gz: 53db6b5272916a49bd32bfb2f512fffb63340565705ef0be7113cebc512904127bf64167b2928466e0a285d41cef6157b1f4d4423f59ce11ff5b932c6d43fab6
+  data.tar.gz: 8a862de42af21ad8cb703102e2635a6a63bd062f6456ab857d315d57d7aa21651ae1ac1f4aa3fcef57d1d88f2a1878f31aa16bca478023abb6a31a6eae3db089

data/README.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://coveralls.io/repos/mefellows/vagrant-dsc/badge.png?branch=master)](https://coveralls.io/r/mefellows/vagrant-dsc?branch=master)
 [![Gem Version](https://badge.fury.io/rb/vagrant-dsc.svg)](http://badge.fury.io/rb/vagrant-dsc)
 
-[Desired State Configuration](http://technet.microsoft.com/en-au/library/dn249912.aspx) provisioning plugin for Vagrant, enabling you to quickly configure & bootstrap a Windows Virtual Machine in a repeatable, reliable fashion - the Vagrant way.
+[Desired State Configuration](https://msdn.microsoft.com/en-us/powershell/dsc/overview) provisioning plugin for Vagrant, enabling you to quickly configure & bootstrap a Windows Virtual Machine in a repeatable, reliable fashion - the Vagrant way.
 
 .NET Devs - no more excuses...
 
@@ -12,6 +12,13 @@
 
 ...is a thing of the past
 
+## Features
+
+1. Automated provisioning using [PowerShell DSC](https://msdn.microsoft.com/en-us/powershell/dsc/overview)
+2. Install modules from the [Powershell Gallery](https://www.powershellgallery.com/) 
+   with PowerShellGet / PowerShell5
+3. Windows development machine from zero to dev-ready < 5 minutes!
+
 ## Installation
 
 ```vagrant plugin install vagrant-dsc```
@@ -60,16 +67,15 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     #
     # These paths are added to the DSC Configuration running
     # environment to enable local modules to be addressed.
-    #
-    # @return [Array] Set of relative module paths.
     dsc.module_path = ["manifests", "modules"]
 
-    # Set of modules that should installed from the [PowerShell Gallery](https://www.powershellgallery.com/)
+    # Set of modules to install from the PowerShell Gallery 
+    # (https://www.powershellgallery.com/).
     #
-    # Requires Powershell 5 or PowerShellGet on box installed
+    # Requires PowerShell 5 or PowerShellGet installed on guest machine.
     #
-    # These modules are downloaded and installed when provisong. 
-    # If module is allready installed no update is done.
+    # These modules are downloaded and installed when provisioning,
+    # if a module is already installed it is a no-op.
     dsc.module_install = ["xNetworking", "xComputerManagement"]
 
     # The type of synced folders to use when sharing the data
@@ -131,7 +137,9 @@ We may consider automatically installing and configuring DSC in a future release
 
 Before getting started, read the Vagrant plugin [development basics](https://docs.vagrantup.com/v2/plugins/development-basics.html) and [packaging](https://docs.vagrantup.com/v2/plugins/packaging.html) documentation.
 
-You will need Ruby 1.9.3+ and Bundler installed before proceeding.
+You will need Ruby 2.1.5 and Bundler v1.12.5 installed before proceeding.
+
+_NOTE_: it _must_ be bundler v1.12.5 due to a hard dependency in Vagrant at this time.
 
 ```
 git clone git@github.com:mefellows/vagrant-dsc.git
@@ -152,6 +160,16 @@ bundle exec vagrant up
 
 There is a test Vagrant DSC setup in `./development` that is a good example of a simple acceptance test.
 
+### Multiple Bundlers?
+
+If you have multiple Bundler versions, you can still use 1.12.5 with the following:
+
+```
+bundle _1.12.5_ <command>
+```
+
+e.g. `bundle _1.12.5_ exec rake spec`
+
 ### Visual Studio Code
 
 You can run the test from Visual Studio Code. This needs the binstubs from bundler. Run

data/lib/vagrant-dsc/locales/en.yml

@@ -40,6 +40,5 @@ en:
         "Absolute 'module_path' not allowed. Please provide a path relative to your Vagrantfile."
       failure_status: |-
         "DSC Status is \"Failure\"."
-
-    winRMAuthorizationError_recover: |-
-      The Host disconnect the active connection. Try to wait for the completion of DSC.
+      winrm_authorization_error_recover: |-
+        The host terminated the active connection. Try to wait for the completion of DSC.

data/lib/vagrant-dsc/provisioner.rb

@@ -103,7 +103,7 @@ module VagrantPlugins
         rescue VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed
           # when install set a domain controller windows kills the active connection with a AuthenticationFailed.
           # The DSC job is still running and new connections are possible, so try to wait 
-          @machine.ui.info(I18n.t("vagrant_dsc.winRMAuthorizationError_recover"))
+          @machine.ui.info(I18n.t("vagrant_dsc.errors.winrm_authorization_error_recover"))
         end
         
         wait_for_dsc_completion
@@ -196,13 +196,7 @@ module VagrantPlugins
       # Operation is current unsupported, but is likely to be enabled
       # as a flag when the plugin detects an unsupported OS.
       def install_dsc
-        # raise DSCError, I18n.t("vagrant_dsc.errors.manifest_missing", operation: "install_dsc")
         raise DSCUnsupportedOperation,  :operation => "install_dsc"
-        # Install chocolatey
-
-        # Ensure .NET 4.5 installed
-
-        # Ensure WMF 4.0 is installed
       end
 
       # Generates a PowerShell DSC runner script from an ERB template
@@ -232,7 +226,6 @@ module VagrantPlugins
       # @return [String] the Path to the uploaded location on the guest machine.
       def write_dsc_runner_script(script)
         guest_script_path = DSC_GUEST_RUNNER_PATH
-        # TODO: Get a counter in here in case of multiple runs
         file = Tempfile.new(["vagrant-dsc-runner", "ps1"])
         begin
           file.write(script)

data/lib/vagrant-dsc/templates/runner.ps1.erb

@@ -17,10 +17,15 @@ $env:PSModulePath="$absoluteModulePaths;${env:PSModulePath}"
 
 <% if !options[:module_install].empty?  %>
 Write-Host "Ensure Modules"
+Get-PackageProvider -Name NuGet -ListAvailable -ErrorAction SilentlyContinue -ErrorVariable NuGetError | Out-Null
+if ($NuGetError) {
+    Write-Host "Install Package Provider Nuget"
+    Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null
+}
 if ((Get-PSRepository -Name PSGallery).InstallationPolicy -ne "Trusted") {
     Set-PSRepository -Name PSGallery -InstallationPolicy "Trusted"
 }
-# Install-Modules only installs if the module is not installed
+# Install-Module only installs if the module is not already installed
 "<%= options[:module_install] %>".Split(";") | foreach { Install-Module $_ }
 <% end %>
 

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -338,14 +338,8 @@ describe VagrantPlugins::DSC::Provisioner do
     end
 
     it "should raise an error if DSC version is invalid" do
-      # shell = double("WinRMShell")
-      # allow(communicator).to receive(:shell).and_return(shell)
-      # allow(communicator).to receive(:create_shell).and_return(shell)
-
-      # TODO: Create an actual Communicator object and mock out methods/calls to isolate this behaviour better
       expect(communicator).to receive(:test).with("(($PSVersionTable | ConvertTo-json | ConvertFrom-Json).PSVersion.Major) -ge 4", {:error_class=>VagrantPlugins::DSC::DSCError, :error_key=>:dsc_incorrect_PowerShell_version})
       allow(subject).to receive(:verify_binary).and_return(true)
-      # expect { subject.verify_dsc }.to raise_error("Unable to detect a working DSC environment. Please ensure powershell v4+ is installed, including WMF 4+.")
       subject.verify_dsc
     end
 
@@ -661,10 +655,15 @@ $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
 Write-Host \"Ensure Modules\"
+Get-PackageProvider -Name NuGet -ListAvailable -ErrorAction SilentlyContinue -ErrorVariable NuGetError | Out-Null
+if ($NuGetError) {
+    Write-Host \"Install Package Provider Nuget\"
+    Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null
+}
 if ((Get-PSRepository -Name PSGallery).InstallationPolicy -ne \"Trusted\") {
     Set-PSRepository -Name PSGallery -InstallationPolicy \"Trusted\"
 }
-# Install-Modules only installs if the module is not installed
+# Install-Module only installs if the module is not already installed
 \"xNetworking;xSQLServer\".Split(\";\") | foreach { Install-Module $_ }
 
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: DSC Provisioner for Vagrant