kitchen-pester 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dddeb9336a48f2b8364c7607c86e207542bd380
-  data.tar.gz: 57520a56f46c998d8479238551a27956ff3ec0f5
+  metadata.gz: 4dbf63f215a50c4c8967508ec8d056dece21fc1c
+  data.tar.gz: 2bb6d1f3dc6f9ce753c26e2100b6d071bc741ee8
 SHA512:
-  metadata.gz: e19683ce4b827519da06bd09affe39c9e4fb3c92c8d4a3cad60d8c6dbadaab66a2bef7152477428b97f496bfee1d25eb6a2a44e077818c87d4a57b098db6a886
-  data.tar.gz: 259f79974c57f8d16e292cd2cf37716c384460f66a6ea73af604f5ebe912bf6a57fcfadbe5ef36d88f1bff762c97c26c6c3aff9fb19b19a0c5cbb244c384fff4
+  metadata.gz: 3c3904c11133c0decd0628d4a30f8852f48515338637ea189d917fd224285a62b7f4fc625a3f49d5470008b60fa125c8f01b13a66d02fdde1c21cbf5e8047649
+  data.tar.gz: d2912889a105b9c067cdd2a58977b7a967f385f4e3413383e3d5e0188bfea6ee863654895842ae45b8b7e9c90b399c63f55831c1e413e386f608882ef159aced

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in kitchen-pester.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in kitchen-pester.gemspec
+gemspec

data/LICENSE

@@ -1,22 +1,22 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Steven Murawski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+The MIT License (MIT)
+
+Copyright (c) 2015 Steven Murawski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -1,31 +1,36 @@
-[![Gem Version](https://badge.fury.io/rb/kitchen-pester.svg)](http://badge.fury.io/rb/kitchen-pester)
-# Kitchen::Pester
-
-Execute [Pester](https://github.com/pester/Pester) tests right from Test-Kitchen, without having to transit the Busser layer.
-
-## Usage
-
-Either
-```
-gem install kitchen-pester
-```
-or include
-```
-gem 'kitchen-pester'
-```
-in your Gemfile.
-
-In your .kitchen.yml include
-```
-verifier:
-  name: pester
-```
-This can be a top-level declaration, a per-node declaration, or a per-suite declaration.
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/kitchen-pester/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+[![Gem Version](https://badge.fury.io/rb/kitchen-pester.svg)](http://badge.fury.io/rb/kitchen-pester)
+# Kitchen::Pester
+
+Execute [Pester](https://github.com/pester/Pester) tests right from Test-Kitchen, without having to transit the Busser layer.
+
+## Usage
+
+Either
+```
+gem install kitchen-pester
+```
+or include
+```
+gem 'kitchen-pester'
+```
+in your Gemfile.
+
+In your .kitchen.yml include
+```
+verifier:
+  name: pester
+```
+This can be a top-level declaration, a per-node declaration, or a per-suite declaration.
+
+### Options
+
+* `restart_winrm` - boolean, default is false.  This is primarily to support powershell v2 scenarios.  If Pester is not being found, enable this option.
+* `test_folder` - string, default is nil.  `test-folder` allows you to specify a custom path (the default is ./test/integration/) for your integration tests.  This can be an absolute path or relative to the root of the folder kitchen is running from.  This path must exist.
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/kitchen-pester/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/lib/kitchen/verifier/pester.rb

@@ -16,7 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/verifier/base"
+require 'pathname'
+require 'kitchen/verifier/base'
 require 'kitchen/verifier/pester_version'
 
 module Kitchen
@@ -30,6 +31,7 @@ module Kitchen
       plugin_version Kitchen::Verifier::PESTER_VERSION
 
       default_config :restart_winrm, false
+      default_config :test_folder
 
       # Creates a new Verifier object using the provided configuration data
       # which will be merged with any default configuration.
@@ -73,11 +75,17 @@ module Kitchen
         cmd = <<-CMD
           set-executionpolicy unrestricted -force
           if (-not (get-module -list pester)) {
-            if (-not (get-module PsGet)){
-              iex (new-object Net.WebClient).DownloadString('http://bit.ly/GetPsGet')
+            if (get-module -list PowerShellGet){
+              import-module PowerShellGet -force
+              install-module Pester -force
+            }
+            else {
+              if (-not (get-module -list PsGet)){
+                iex (new-object Net.WebClient).DownloadString('http://bit.ly/GetPsGet')
+              }
+              import-module psget -force
+              Install-Module Pester
             }
-            Import-Module PsGet
-            Install-Module Pester
           }
         CMD
         wrap_shell_code(Util.outdent!(cmd))
@@ -110,9 +118,9 @@ module Kitchen
       def run_command
         return if local_suite_files.empty?
         wrap_shell_code(Util.outdent!(<<-CMD
-          cd "#{File.join(config[:root_path],'suites/pester/' )}"
           $global:ProgressPreference = 'SilentlyContinue'
-          import-module Pester -force; invoke-pester -enableexit
+          $TestPath = "#{File.join(config[:root_path], 'suites')}"
+          import-module Pester -force; invoke-pester -path $testpath -enableexit
         CMD
         ))
       end
@@ -120,8 +128,12 @@ module Kitchen
       #private
 
       def restart_winrm_service
+
+        cmd = 'schtasks /Create /TN restart_winrm /TR ' /
+              '"powershell -command restart-service winrm" ' /
+              '/SC ONCE /ST 00:00 '
         wrap_shell_code(Util.outdent!(<<-CMD
-          schtasks /Create /TN restart_winrm /TR "powershell -command restart-service winrm" /SC ONCE /ST 00:00
+          #{cmd}
           schtasks /RUN /TN restart_winrm
         CMD
         ))
@@ -135,9 +147,12 @@ module Kitchen
       # @api private
 
       def local_suite_files
-        base = File.join(config[:test_base_path], config[:suite_name])
-        glob = File.join(base, "*/**/*")
-        Dir.glob(glob).reject do |f|
+        base = File.join(test_folder, config[:suite_name])
+        top_level_glob = File.join(base, "*")
+        folder_glob = File.join(base, "*/**/*")
+        top = Dir.glob(top_level_glob)
+        nested = Dir.glob(folder_glob)
+        (top << nested).flatten!.reject do |f|
           File.directory?(f)
         end
       end
@@ -146,12 +161,14 @@ module Kitchen
       #
       # @api private
       def prepare_pester_tests
-        base = File.join(config[:test_base_path], config[:suite_name])
+        base = File.join(test_folder, config[:suite_name])
+        info("Preparing to copy files from #{base} to the SUT.")
 
         local_suite_files.each do |src|
           dest = File.join(sandbox_suites_dir, src.sub("#{base}/", ""))
+          debug("Copying #{src} to #{dest}")
           FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(src, dest, :preserve => true)
+          FileUtils.cp(src, dest, preserve: true)
         end
       end
 
@@ -161,6 +178,18 @@ module Kitchen
         File.join(sandbox_path, "suites")
       end
 
+      def test_folder
+        return config[:test_base_path] if config[:test_folder].nil?
+        absolute_test_folder
+      end
+
+      def absolute_test_folder
+        path = (Pathname.new config[:test_folder]).realpath
+        integration_path = File.join(path, 'integration')
+        return path unless Dir.exist?(integration_path)
+        integration_path
+      end
+
     end
   end
-end
+end

data/lib/kitchen/verifier/pester_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Verifier
-    PESTER_VERSION = '0.3.0'
+    PESTER_VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-pester
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Test-Kitchen verifier for Pester.