kitchen-dsc 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c826567005b0b8c0b62e28e0e80ea801056c8895
-  data.tar.gz: 6349284893ff24dafd4dc61f71239560823a0dfd
+  metadata.gz: 738167d2b4abdbc0b05048c64a965c801f3d2e10
+  data.tar.gz: f56a0e14b764ad65f7e2f38b45493c81f7687077
 SHA512:
-  metadata.gz: c45dad49b3de9a69ab85e0c0795bb869d4d489b738e376b3f99c954eeb40d8feef3a5a034f3bae959755da2ea0a2915328d3bc7e4ed543d738855f8fb38b8969
-  data.tar.gz: 063aebdec25039d04a8a8dbcbc20dd5aa7c346e2b9f746a2431592e847a8a9b5b070d479b09184d543fd03c4829ab386cb04bf34826d35f424fb7fc21601a093
+  metadata.gz: 0f60f1434718fc5c72f18e474c5ba1a0f99686c13619b284fb7564ba19c7f41ac35dfddd6c417a9dd3441d4e5771a5107f61e90629b9155e5c9a4150f7b7ab89
+  data.tar.gz: 501b9d24510aeadd805851323ba917035566bcd457bca7fb0c6f66bebda0a063f637164440dd6143be1409e5b86eb652a624691c16e4f38a6f48687d47713368

data/kitchen-dsc.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version           = Kitchen::Dsc::VERSION
   s.authors           = ['Steven Murawski']
   s.email             = ['steven.murawski@gmail.com']
-  s.homepage          = 'https://github.com/smurawski/kitchen-dsc'
+  s.homepage          = 'https://github.com/test-kitchen/kitchen-dsc'
   s.summary           = 'PowerShell DSC provisioner for test-kitchen'
   candidates          = Dir.glob('lib/**/*') + ['README.md', 'kitchen-dsc.gemspec']
   s.files             = candidates.sort

data/lib/kitchen-dsc/version.rb

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

data/lib/kitchen/provisioner/dsc.rb

@@ -27,7 +27,9 @@ module Kitchen
       default_config :configuration_name do |provisioner|
         provisioner.instance.suite.name
       end
+
       default_config :configuration_data_variable
+      default_config :configuration_data
 
       default_config :dsc_local_configuration_manager_version, 'wmf4'
       default_config :dsc_local_configuration_manager, {
@@ -90,6 +92,7 @@ module Kitchen
                 CertificateID = '#{lcm_config[:certificate_id].nil? ? '$null' : lcm_config[:certificate_id]}'
                 ConfigurationMode = '#{lcm_config[:configuration_mode]}'
                 ConfigurationModeFrequencyMins = #{lcm_config[:configuration_mode_frequency_mins].nil? ? '15' : lcm_config[:configuration_mode_frequency_mins]}
+                DebugMode = '#{lcm_config[:debug_mode]}'
                 RebootNodeIfNeeded = [bool]::Parse('#{lcm_config[:reboot_if_needed]}')
                 RefreshFrequencyMins = #{lcm_config[:refresh_frequency_mins].nil? ? '30' : lcm[:refresh_frequency_mins]}
                 RefreshMode = '#{lcm_config[:refresh_mode]}'
@@ -102,7 +105,6 @@ module Kitchen
 
         $null = SetupLCM
         Set-DscLocalConfigurationManager -Path ./SetupLCM
-        if ($PSVersionTable.PSVersion.Major -ge 5) {Enable-DscDebug}
         EOH
 
         wrap_shell_code(full_lcm_configuration_script)
@@ -127,6 +129,7 @@ module Kitchen
       # Disable line length check, it is all logging and embedded script.
       # rubocop:disable Metrics/LineLength
       def prepare_command
+        configuration_data_variable = config[:configuration_data_variable].nil? ? 'ConfigurationData' : config[:configuration_data_variable]
         info('Moving DSC Resources onto PSModulePath')
         info("Generating the MOF script for the configuration #{config[:configuration_name]}")
         stage_resources_and_generate_mof_script = <<-EOH
@@ -149,7 +152,10 @@ module Kitchen
           {
             throw "Failed to create a configuration command #{config[:configuration_name]}"
           }
-          $null = #{config[:configuration_name]} -outputpath c:/configurations #{'-configurationdata $' + config[:configuration_data_variable] if config[:configuration_data_variable]}
+
+          #{'$ConfigurationData = ' + ps_hash(config[:configuration_data]) unless config[:configuration_data].nil?}
+
+          $null = #{config[:configuration_name]} -outputpath c:/configurations #{'-configurationdata $' + configuration_data_variable}
         EOH
         debug("Shelling out: #{stage_resources_and_generate_mof_script}")
         wrap_shell_code(stage_resources_and_generate_mof_script)
@@ -229,6 +235,23 @@ module Kitchen
         File.join('configuration', config[:configuration_script])
       end
 
+      def pad(depth = 0)
+        " " * depth
+      end
+
+      def ps_hash(obj, depth = 0)
+        if obj.is_a?(Hash)
+          obj.map { |k, v|
+            %{#{pad(depth + 2)}#{ps_hash(k)} = #{ps_hash(v, depth + 2)}}
+          }.join(";\n").insert(0, "@{\n").insert(-1, "\n#{pad(depth)}}")
+        elsif obj.is_a?(Array)
+          array_string = obj.map { |v| ps_hash(v, depth+4)}.join(",")
+          "#{pad(depth)}@(\n#{array_string}\n)"
+        else
+          %{"#{obj}"}
+        end
+      end
+
       def prepare_configuration_script
         configuration_script_file = File.join(config[:configuration_script_folder], config[:configuration_script])
         configuration_script_path = File.join(config[:kitchen_root], configuration_script_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dsc
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -127,7 +127,7 @@ files:
 - kitchen-dsc.gemspec
 - lib/kitchen-dsc/version.rb
 - lib/kitchen/provisioner/dsc.rb
-homepage: https://github.com/smurawski/kitchen-dsc
+homepage: https://github.com/test-kitchen/kitchen-dsc
 licenses:
 - Apache 2
 metadata: {}