kitchen-dsc 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d72d58d0319e21aff93818d1ef18619e54ed76ec
-  data.tar.gz: 732c13ad0c646ccd2f446e4f953f1821a7690774
+  metadata.gz: db8e9466934c88648b2716777580c81c8ac81f81
+  data.tar.gz: f9fdb9ac31e4ca3a375d76f9703aefec4091efeb
 SHA512:
-  metadata.gz: 3d5f65251c7829f715229a83328ee07ffe7bad6eaec69021cd293c6cbfe16ed73522ff76185e2cf52cc7e576785c2cc4363b4b24e0c9ca7f639d9ac949cce213
-  data.tar.gz: 7b7a308187d63be5a59e838d2592b7cb4371c338c398188d84ee6eda9a30c80b0eccc26265ff4c99303573c76d323bc142bb748f6d7581702ab90de095112717
+  metadata.gz: 4cd11a166f9c02099d9616e97b310c9be11b458687465f7bb42d379f2fe5964e19c148bdc2de1264c086417a0ea1d72ea118a0f73372d78bcc5dff3586edafe6
+  data.tar.gz: 04071da119ed739ef0cc4dffba8cc374102447b5fdaee609039074db00a4a51b7e0ebf87623a7642aa046162a871e4cd63be30b41a6671fe348bb9b95b44c618

data/README.md

@@ -62,6 +62,13 @@ You will see a delay in the return of the run details due to an difference in ho
   * Requires WMF 5
   * Takes a string (for one module) or an array (for multiple) to install from the gallery
 
+* gallery_name
+  * Custom PowerShell gallery name to install modules from.
+  * If there is no package source with this name registered on the machine, then gallery_uri must be configured as well.
+
+* gallery_uri
+  * URI for a custom PowerShell gallery feed.
+
 ### Specific to repository style testing
 * modules_path
   * Defaults to 'modules'.

data/kitchen-dsc.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name              = 'kitchen-dsc'
   s.version           = Kitchen::Dsc::VERSION
   s.authors           = ['Steven Murawski']
-  s.email             = ['steven.murawski@gmail.com']
+  s.email             = ['smurawski@chef.io']
   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']
@@ -26,16 +26,16 @@ DSC Provisioner for Test Kitchen
 TBD
 
 EOF
-  s.add_dependency "test-kitchen", "~> 1.4"
+  s.add_dependency 'test-kitchen', '~> 1.4'
 
-  s.add_development_dependency "countloc",  "~> 0.4"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec",     "~> 3.2"
-  s.add_development_dependency "simplecov", "~> 0.9"
+  s.add_development_dependency 'countloc', '~> 0.4'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec',     '~> 3.2'
+  s.add_development_dependency 'simplecov', '~> 0.9'
 
   # style and complexity libraries are tightly version pinned as newer releases
   # may introduce new and undesireable style choices which would be immediately
   # enforced in CI
-  s.add_development_dependency "finstyle",  "1.4.0"
-  s.add_development_dependency "cane",      "2.6.2"
+  s.add_development_dependency 'finstyle',  '1.4.0'
+  s.add_development_dependency 'cane',      '2.6.2'
 end

data/lib/kitchen/provisioner/dsc.rb

@@ -13,7 +13,6 @@ require 'kitchen/provisioner/base'
 require 'kitchen/util'
 
 module Kitchen
-
   module Provisioner
     class Dsc < Base
       kitchen_provisioner_api_version 2
@@ -31,6 +30,9 @@ module Kitchen
       default_config :configuration_data_variable, 'ConfigurationData'
       default_config :configuration_data
 
+      default_config :nuget_force_bootstrap, true
+      default_config :gallery_uri
+      default_config :gallery_name
       default_config :modules_from_gallery
 
       default_config :dsc_local_configuration_manager_version, 'wmf4'
@@ -61,13 +63,10 @@ module Kitchen
           configuration_mode: (resolve_lcm_setting 'configuration_mode', 'ApplyAndAutoCorrect'),
           debug_mode: (resolve_lcm_setting 'debug_mode', 'All'),
           reboot_if_needed: (resolve_lcm_setting 'reboot_if_needed', false),
-          refresh_mode: (resolve_lcm_setting 'refresh_mode' , 'PUSH')
+          refresh_mode: (resolve_lcm_setting 'refresh_mode', 'PUSH')
         }
       end
 
-
-      # Disable line length check, it is all embedded script.
-      # rubocop:disable Metrics/LineLength
       def install_command
         lcm_config = lcm_settings
         case config[:dsc_local_configuration_manager_version]
@@ -142,14 +141,34 @@ module Kitchen
 
       def powershell_modules
         Array(config[:modules_from_gallery]).map do |powershell_module|
-          "install-module '#{powershell_module}' -force | out-null"
+          info("Installing #{powershell_module} from #{psmodule_repository_name}.")
+          "install-module '#{powershell_module}' -Repository #{psmodule_repository_name} -force | out-null"
         end
       end
 
+      def nuget_force_bootstrap
+        return unless config[:nuget_force_bootstrap]
+        info('Bootstrapping the nuget package provider for PowerShell PackageManagement.')
+        'install-packageprovider nuget -force -forcebootstrap | out-null'
+      end
+
+      def psmodule_repository_name
+        return 'PSGallery' if config[:gallery_name].nil? && config[:gallery_uri].nil?
+        return 'testing'   if config[:gallery_name].nil?
+        config[:gallery_name]
+      end
+
+      def register_psmodule_repository
+        return if config[:gallery_uri].nil?
+        info("Registering a new PowerShellGet Repository - #{psmodule_repository_name}")
+        "register-packagesource -providername PowerShellGet -name '#{psmodule_repository_name}' -location '#{config[:gallery_uri]}' -force -trusted"
+      end
+
       def install_module_script
         return if config[:modules_from_gallery].nil?
-        script = <<-EOH
-  install-packageprovider nuget -force -forcebootstrap | out-null
+        <<-EOH
+  #{nuget_force_bootstrap}
+  #{register_psmodule_repository}
   #{powershell_modules.join("\n")}
         EOH
       end
@@ -179,8 +198,6 @@ module Kitchen
         prepare_configuration_script
       end
 
-      # Disable line length check, it is all logging and embedded script.
-      # rubocop:disable Metrics/LineLength
       def prepare_command
         info('Moving DSC Resources onto PSModulePath')
         info("Generating the MOF script for the configuration #{config[:configuration_name]}")
@@ -259,7 +276,7 @@ module Kitchen
       def list_files(path)
         base_directory_content = Dir.glob(File.join(path, '*'))
         nested_directory_content = Dir.glob(File.join(path, '*/**/*'))
-        all_directory_content =([base_directory_content, nested_directory_content]).flatten
+        all_directory_content = [base_directory_content, nested_directory_content].flatten
 
         ignore_files = ['Gemfile', 'Gemfile.lock', 'README.md', 'LICENSE.txt']
         all_directory_content.reject do |f|
@@ -290,10 +307,10 @@ module Kitchen
         sandbox_module_path = File.join(sandbox_path, 'modules')
 
         if Dir.exist?(module_path)
-            debug("Moving #{module_path} to #{sandbox_module_path}")
-            FileUtils.cp_r(module_path, sandbox_module_path)
+          debug("Moving #{module_path} to #{sandbox_module_path}")
+          FileUtils.cp_r(module_path, sandbox_module_path)
         else
-            debug("The modules path #{module_path} was not found. Not moving to #{sandbox_module_path}.")
+          debug("The modules path #{module_path} was not found. Not moving to #{sandbox_module_path}.")
         end
       end
 
@@ -302,19 +319,19 @@ module Kitchen
       end
 
       def pad(depth = 0)
-        " " * depth
+        ' ' * 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)}}")
+          obj.map do |k, v|
+            %(#{pad(depth + 2)}#{ps_hash(k)} = #{ps_hash(v, depth + 2)})
+          end.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(",")
+          array_string = obj.map { |v| ps_hash(v, depth + 4) }.join(',')
           "#{pad(depth)}@(\n#{array_string}\n)"
         else
-          %{"#{obj}"}
+          %("#{obj}")
         end
       end
 

data/lib/kitchen-dsc/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Dsc
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dsc
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -118,7 +118,7 @@ description: |+
   TBD
 
 email:
-- steven.murawski@gmail.com
+- smurawski@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []