vagrant-dsc 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407c2cc8f7c8786fe7628c4894ed967be86d05aa
-  data.tar.gz: 4f093c1e28adb46cdbc804ad8cc4a329d03f9008
+  metadata.gz: a27d30fb1437143bb3969c933581d2a78549134e
+  data.tar.gz: e45f109d21e48ad8d6226f3fa729b89993fffea1
 SHA512:
-  metadata.gz: 568a9dfdb800956ad3724a3a2582a3a7785310142ac139273577cc3643475fbf02d478c13ca7056b9aabffc746a54d04253e33f580327892b50830d4298cd482
-  data.tar.gz: 7f063bd5ce7baa8b876296306d67da778a9b9597be5a3ccae045a2f4152b6e463e19d9d379b83686dd845daff76118055afc9c4d0c933b90e7293e8bf49f1dbe
+  metadata.gz: aaf2163219c6c17f22d78494b28897ac0c203f2e51658ec509abd19556260b6224c49b02dfd71169a6de6424dc7015b03a9c5131280fe5cb788d9c13bc13e348
+  data.tar.gz: d05416921b9d639382e006e4bae98bda92c1776ee7a45692257ec120f9b0f2c3a80b0056d9703f74133ee9ae4aa3a63346a90e7d4d2d574951303f2312fbed0e

data/README.md

@@ -22,6 +22,7 @@ In your Vagrantfile, add the following plugin and configure to your needs:
 
 ```ruby
   config.vm.provision "dsc" do |dsc|
+  
     # The path relative to `dsc.manifests_path` pointing to the Configuration file
     dsc.configuration_file  = "MyWebsite.ps1"
 
@@ -35,16 +36,22 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # To pass in flags, simply set the value to `nil`
     dsc.configuration_params = {"-MachineName" => "localhost", "-EnableDebug" => nil}
 
+    # A path relative to the Vagrantfile pointing to a Configuration Data file.
+    #
+    # See https://technet.microsoft.com/en-us/library/dn249925.aspx for details
+    # on how to parameterise your Configuration files.
+    dsc.configuration_data_file  = "manifests/MyConfig.psd1"
+
     # Relative path to a folder containing a pre-generated MOF file.
     #
     # Path is relative to the folder containing the Vagrantfile.
-    #dsc.mof_path = "mof_output"
+    dsc.mof_path = "mof_output"
 
     # Relative path to the folder containing the root Configuration manifest file.
     # Defaults to 'manifests'.
     #
     # Path is relative to the folder containing the Vagrantfile.
-    # dsc.manifests_path = "manifests"
+    dsc.manifests_path = "manifests"
 
     # Set of module paths relative to the Vagrantfile dir.
     #
@@ -52,17 +59,17 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # environment to enable local modules to be addressed.
     #
     # @return [Array] Set of relative module paths.
-    #dsc.module_path = ["manifests", "modules"]
+    dsc.module_path = ["manifests", "modules"]
 
     # The type of synced folders to use when sharing the data
     # required for the provisioner to work properly.
     #
     # By default this will use the default synced folder type.
     # For example, you can set this to "nfs" to use NFS synced folders.
-    #dsc.synced_folder_type = ""
+    dsc.synced_folder_type = "nfs"
 
     # Temporary working directory on the guest machine.
-    #dsc.temp_dir = "/tmp/vagrant-dsc"
+    dsc.temp_dir = "/tmp/vagrant-dsc"
   end
 ```
 ## Example
@@ -70,6 +77,10 @@ In your Vagrantfile, add the following plugin and configure to your needs:
 There is a [sample](https://github.com/mefellows/vagrant-dsc/tree/master/development) Vagrant setup used for development of this plugin. 
 This is a great real-life example to get you on your way.
 
+## Creating Windows Vagrant boxes
+
+Look at some example Packer templates [here](https://github.com/mefellows/packer-windows-templates/).
+
 ## Roadmap
 
 * Support DSC Pull Server provisioning

data/development/Vagrantfile

@@ -6,7 +6,7 @@ $shell_script = <<SCRIPT
   #choco install seek-dsc
   (New-Object System.Net.WebClient).DownloadFile('https://gallery.technet.microsoft.com/scriptcenter/xWebAdministration-Module-3c8bb6be/file/131367/3/xWebAdministration_1.3.2.zip','c:\\xwebadmin.zip')
   choco install 7zip
-  7za.exe x -y C:\\xwebadmin.zip -o'C:\\Program Files\\WindowsPowerShell\\Modules'
+  & 'C:\\Program Files\\7-Zip\\7z.exe' x -y C:\\xwebadmin.zip -o'C:\\Program Files\\WindowsPowerShell\\Modules'
   Get-DSCResource
 SCRIPT
 
@@ -19,9 +19,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  # config.vm.box = "mfellows/windows2012r2"
-  # config.vm.box_version = "1.0.1"
-  config.vm.box = "windows2012r2"
+  config.vm.box = "mfellows/windows2012r2"
+  config.vm.box_version = "1.0.1"
 
   config.vm.guest = :windows
   config.vm.communicator = "winrm"

data/lib/vagrant-dsc/provisioner.rb

@@ -191,32 +191,28 @@ module VagrantPlugins
 
       # Runs the DSC Configuration on the guest machine.
       def run_dsc_apply
-        command = ". '#{DSC_GUEST_RUNNER_PATH}'"
 
         @machine.ui.info(I18n.t(
           "vagrant_dsc.running_dsc",
           manifest: config.configuration_file))
 
-        opts = {
-          elevated: true,
-          error_key: :ssh_bad_exit_status_muted,
-          good_exit: 0,
-          shell: :powershell
-        }
-
-        @machine.communicate.sudo(command, opts) do |type, data|
+        # A bit of an ugly dance, but this is how we get neat, colourised output and exit codes from a Powershell run
+        last_type = nil
+        new_line = ""
+        error = false
+        machine.communicate.shell.powershell("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{DSC_GUEST_RUNNER_PATH}") do |type, data|
           if !data.chomp.empty?
+            error = true if type == :stderr
             if [:stderr, :stdout].include?(type)
-              # Output the data with the proper color based on the stream.
-              # TODO: Seems the WinRM communicator or a bug in my powershell code
-              # precludes from errors coming back in the :stderr stream
               color = type == :stdout ? :green : :red
-              @machine.ui.info(
-                data.chomp,
-                color: color, new_line: false, prefix: false)
+              new_line = "\r\n" if last_type != nil and last_type != type
+              last_type = type
+              @machine.ui.info( new_line + data.chomp, color: color, new_line: false, prefix: false)
             end
           end
         end
+
+        error == false
       end
 
       # Verify that the shared folders have been properly configured

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -11,6 +11,7 @@ describe VagrantPlugins::DSC::Provisioner do
   let(:machine)                 { double("machine", ui: ui) }
   let(:env)                     { double("environment", root_path: root_path, ui: ui) }
   let(:vm)                      { double ("vm") }
+  let(:shell)                   { double ("shell") }
   let(:communicator)            { double ("communicator") }
   let(:guest)                   { double ("guest") }
   let(:configuration_file)      { "manifests/MyWebsite.ps1" }
@@ -523,21 +524,26 @@ $response"
 
   describe "Apply DSC" do
     it "should invoke the DSC Runner and notify the User of provisioning status" do
-      expect(ui).to receive(:info).with(any_args).once
-      expect(ui).to receive(:info).with("provisioned!", {color: :green, new_line: false, prefix: false}).once
+      allow(communicator).to receive(:shell).and_return(shell)
       allow(machine).to receive(:communicate).and_return(communicator)
-      expect(communicator).to receive(:sudo).with('. ' + "'c:/tmp/vagrant-dsc-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "provisioned!")
+      expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-dsc-runner.ps1").and_yield(:stdout, "provisioned!")
+      root_config.configuration_file = configuration_file
+      expect(ui).to receive(:info).with("\"Running DSC Provisioner with manifests/MyWebsite.ps1...\"")
+      expect(ui).to receive(:info).with("provisioned!", {color: :green, new_line: false, prefix: false}).once
 
       subject.run_dsc_apply
     end
 
     it "should show error output in red" do
-      expect(ui).to receive(:info).with(any_args).once
-      expect(ui).to receive(:info).with("provisioned!", {color: :red, new_line: false, prefix: false}).once
       allow(machine).to receive(:communicate).and_return(communicator)
-      expect(communicator).to receive(:sudo).with('. ' + "'c:/tmp/vagrant-dsc-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_yield(:stderr, "provisioned!")
+      allow(communicator).to receive(:shell).and_return(shell)
+
+      root_config.configuration_file = configuration_file
+      expect(ui).to receive(:info).with("\"Running DSC Provisioner with manifests/MyWebsite.ps1...\"")
+      expect(ui).to receive(:info).with("not provisioned!", {color: :red, new_line: false, prefix: false}).once
+      expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-dsc-runner.ps1").and_yield(:stderr, "not provisioned!")
 
       subject.run_dsc_apply
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: DSC Provisioner for Vagrant