kitchen-dsc 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7648a4ce929eaf9c6ae05202aea0eafd81ea4f0e
-  data.tar.gz: 1f1b628411d96a2f6ab322510895fc0485d2b509
+  metadata.gz: f56f2af0cfeec590f12172b55f424593b2eeefa9
+  data.tar.gz: 4ce34552f09fc64a8f27a61f341f6be7e3ac0360
 SHA512:
-  metadata.gz: c4a102df223ea3d82587ea183b9d5dcd4db457ebed2bb8943a3179709533c9cbf644de3f8f7472ce60e8690a99f80870b1bea63c4f8811d0628bd3e34956698b
-  data.tar.gz: 4885e2f4d9785d442887fcd871823f707320b226d3bf2fde27052bed4ce4804629d3f0a9d6cba0ea676358e648fcfaaf3cf3e5bf3a7aa1d88813e52039f4bdb0
+  metadata.gz: c3aaf48b5c09b0d0801e5ef5fcee9c3962fa4600ea08b2d4de164eb8abaa5691ec4c5dc2be7c233c9310604ab8289e24bc292d2f81f8185765069bc5de33f56d
+  data.tar.gz: fc2de1fe451d96aa6d6680f957be61eb77dcc3527c40e77ee9d08e25f24868d3e1bb0ed37df228b7022820ede299decc9ea31826e4e792eac4bc9b6dd58e3372

data/lib/kitchen/provisioner/dsc.rb

@@ -43,40 +43,48 @@ module Kitchen
 
       def create_sandbox
         super
-        FileUtils.mkdir_p(sandbox_path)
+        module_path = File.join(config[:kitchen_root], config[:modules_path])
+        sandbox_module_path = File.join(sandbox_path, 'modules')
+        configuration_script_path = File.join(config[:kitchen_root], config[:configuration_script])
+        sandbox_configuration_script_path = File.join(sandbox_path, config[:configuration_script])
 
         info('Staging DSC Resource Modules for copy to the SUT')
-        FileUtils.cp_r(File.join(config[:kitchen_root], config[:modules_path]), File.join(sandbox_path, 'modules'))
-        FileUtils.cp(File.join(config[:kitchen_root], config[:configuration_script]), File.join(sandbox_path, 'dsc_configuration.ps1'))
+        debug("Moving #{module_path} to #{sandbox_module_path}")
+        FileUtils.cp_r(module_path, sandbox_module_path)
+
+        debug("Moving #{configuration_script_path} to #{sandbox_configuration_script_path}")
+        FileUtils.cp(configuration_script_path, sandbox_configuration_script_path)
       end
 
       def prepare_command
         info('Moving DSC Resources onto PSModulePath')
         info("Generating the MOF script for the configuration #{current_configuration}")
-
         stage_resources_and_generate_mof_script = <<-EOH
-
           dir ( join-path #{config[:root_path]} 'modules/*') -directory |
             copy-item -destination $env:programfiles/windowspowershell/modules/ -recurse -force
 
           mkdir 'c:/configurations' | out-null
-          . #{remote_path_join( config[:root_path], config[:configuration_script])}
+          $ConfigurationScriptPath = Join-path #{config[:root_path]} #{config[:configuration_script]}
+          if (-not (test-path $ConfigurationScriptPath))
+          {
+            throw "Failed to find $ConfigurationScriptPath"
+          }
+          invoke-expression (get-content $ConfigurationScriptPath -raw)
           #{current_configuration} -outputpath c:/configurations | out-null
-
         EOH
-
+        debug("Shelling out: #{stage_resources_and_generate_mof_script}")
         wrap_shell_code(stage_resources_and_generate_mof_script)
       end
 
       def run_command
         info("Running the configuration #{current_configuration}")
         run_configuration_script = <<-EOH
-
           $job = start-dscconfiguration -Path c:/configurations/
           $job | wait-job
           $job.childjobs[0].verbose
-
         EOH
+
+        debug("Shelling out: #{run_configuration_script}")
         wrap_shell_code(run_configuration_script)
       end
 

data/lib/kitchen-dsc/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Dsc
-    VERSION = '0.1.0'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dsc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Steven Murawski