kitchen-dsc 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738167d2b4abdbc0b05048c64a965c801f3d2e10
-  data.tar.gz: f56a0e14b764ad65f7e2f38b45493c81f7687077
+  metadata.gz: 29faf507f394613d5f7fa39c2561d4629ea4235c
+  data.tar.gz: 71ec0f06d7a21ca9fd2e326a205cb85c04359836
 SHA512:
-  metadata.gz: 0f60f1434718fc5c72f18e474c5ba1a0f99686c13619b284fb7564ba19c7f41ac35dfddd6c417a9dd3441d4e5771a5107f61e90629b9155e5c9a4150f7b7ab89
-  data.tar.gz: 501b9d24510aeadd805851323ba917035566bcd457bca7fb0c6f66bebda0a063f637164440dd6143be1409e5b86eb652a624691c16e4f38a6f48687d47713368
+  metadata.gz: 26503fe0492d1ec6509ec027c7160b41060446095850cc42ce45bd92f6bb48a25df0703282d009c0e1dd363a4c3096ffa018c0f86d426308271e157eac296ea2
+  data.tar.gz: cb60c8a93accab2abdc637a9675d8b2fcbf6b1237eabb1f83ac8760ea37c2731856778cd38fac8d3f1f30c0dc78247f1aea2ed52c9ab9f3ef12d3969d47b8c0a

data/README.md

@@ -10,6 +10,9 @@ You'll need a driver box with WMF4 or greater (ONLY WINDOWS SYSTEMS)
 ## Installation & Setup
 You'll need the test-kitchen & kitchen-dsc gems installed in your system, along with kitchen-vagrant or some ther suitable driver for test-kitchen. 
 
+### Note:
+You will see a delay in the return of the run details due to an difference in how the verbose stream is returned for DSC runs between WMF versions, so I return the verbose stream after the job completes.  I'd love to live stream the results, but that'll take a bit more experimentation. (PR's welcome!)
+
 ## Example Configurations
 * [Repository Style Testing](https://github.com/smurawski/dsc-kitchen-project)
 * [Module Style Testing](https://github.com/powershellorg/cwebadministration/tree/smurawski/adding_tests)
@@ -18,19 +21,30 @@ You'll need the test-kitchen & kitchen-dsc gems installed in your system, along
 * configuration_script_folder
   * Defaults to 'examples'.
   * The location of a PowerShell script(s) containing the DSC configuration command(s).
+
 * configuration_script
   * Defaults to 'dsc_configuration.ps1'
   * The name of the PowerShell script containing the DSC configuration command(s) (and possibly configuration data)
+
 * configuration_name
   * Name of the configuration to run, defaults to the suite name.
+
+* configuration_data
+  * A YAML representation of what should be passed to the configuration.
+  * Overrides any configurationdata variable assigned in the configuration script.
+
 * configuration_data_variable
-  * Name of the variable in the configuration_script that contains the ConfigurationData hashtable
+  * Defaults to 'ConfigurationData'
+  * Name of the variable that contains the ConfigurationData hashtable
+  * Can be defined in the configuration script or via the `configuration_data` configuration setting.
+
 * dsc_local_configuration_manager_version
-  * Defaults to 'wmf4' ()
+  * Defaults to 'wmf4' 
   * Identifies what version of the LCM is in place
   * Other valid values are 'wmf4_with_update' and 'wmf5'
     * Currently the only difference between wmf4 and wmf4_with_update/wmf5 is the action_after_reboot and the debug_mode settings.  Eventually, I'd like to add support for partial configurations, pull servers, etc..
   * In this context, wmf4_with_update refers to wmf4 with KB3000850 applied (to add support for WMF 5 generated configurations, plus some fixes).
+
 * dsc_local_configuration_manager
   * Settings for the LCM
   * Defaults are:

data/lib/kitchen-dsc/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Dsc
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/kitchen/provisioner/dsc.rb

@@ -28,7 +28,7 @@ module Kitchen
         provisioner.instance.suite.name
       end
 
-      default_config :configuration_data_variable
+      default_config :configuration_data_variable, 'ConfigurationData'
       default_config :configuration_data
 
       default_config :dsc_local_configuration_manager_version, 'wmf4'
@@ -153,7 +153,7 @@ module Kitchen
             throw "Failed to create a configuration command #{config[:configuration_name]}"
           }
 
-          #{'$ConfigurationData = ' + ps_hash(config[:configuration_data]) unless config[:configuration_data].nil?}
+          #{configuration_data_assignment unless config[:configuration_data].nil?}
 
           $null = #{config[:configuration_name]} -outputpath c:/configurations #{'-configurationdata $' + configuration_data_variable}
         EOH
@@ -162,12 +162,22 @@ module Kitchen
       end
       # rubocop:enable Metrics/LineLength
 
+      def configuration_data_assignment
+        '$' + configuration_data_variable + ' = ' + ps_hash(config[:configuration_data])
+      end
+
       def run_command
         info("Running the configuration #{config[:configuration_name]}")
         run_configuration_script = <<-EOH
+          $ProgressPreference = 'SilentlyContinue'
           $job = start-dscconfiguration -Path c:/configurations/ -force
           $job | wait-job
           $job.childjobs[0].verbose
+          $dsc_errors = $job.childjobs[0].Error
+          if ($dsc_errors -ne $null) {
+            $dsc_errors
+            exit 1
+          }
         EOH
 
         debug("Shelling out: #{run_configuration_script}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dsc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen