kitchen-puppet 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaaf505d44b0beca6c1398a004a5983ce18b7d64
-  data.tar.gz: 4efa248faa26035455a980df8fe1a23de2dc901e
+  metadata.gz: 8e18d3fcba9a242b12c3bd80aa220de2e9e0ed9d
+  data.tar.gz: 566d0b947d629763020bbea5c1ab6c38fec41ea6
 SHA512:
-  metadata.gz: 5086f304113bb2b462a6f5495972e4c7164fde3f68b2a4b6b7a93145fbe97cc65c5677302802a2a4fe89aa20f7545efab7bc7aec8af8bfe2225dc929c39a5148
-  data.tar.gz: 4abe8e0662d5decc1731b55e3801d67955e04a800a26640bcaa23304931d787c328639a4c46f45dc4af9327f0cf8e8f0c78195242c3d7baf01d8a6c40cbf2ad5
+  metadata.gz: 7008968bc7ae46297e5269565f5060f7683bd23be92ff3c3c1d62a19e9a970f43cab86d5ab8c25fb4c6f8cc68396a7395ec671fdd40dff4d4fb006a2089f2cb8
+  data.tar.gz: 7ea4d0e28a5c9f22bf97ef0fc0dd989a122a94b19b1f7b971f8300eda6e6ba2b4d51a1a30821bca447d32ed5cabea8d41063eec3ff948ec8d75e2ecf2e7a9ebb

data/README.md

@@ -24,35 +24,9 @@ This provider has been tested against the Ubuntu 1204 and Centos 6.5 boxes runni
 * https://www.cedric-meury.ch/2016/10/test-driven-infrastructure-with-puppet-docker-test-kitchen-and-serverspec-yury-tsarev-gooddata
 * https://docs.puppet.com/puppet/latest/puppet_platform.html
 
-## Windows Workstation Install
-You need to download the puppet msi and install it and run everything inside the puppet window.
+## Install
 
-1. Download and install puppet from the windows msi file from https://downloads.puppetlabs.com/windows
-  * I recommend the using the 64 bit version now.
-  * Don't do a 'gem install puppet' !!!.
-
-2. Select "Start Command Prompt with Puppet" to go to a Command Window.
-
-3. Install the Ruby DevKit:
-   * Download and install devkit from http://rubyinstaller.org/downloads
-     * (Use the 32 or 64 bit version that matches version of the puppet install)
-   * In the devkit directory run “ruby dk.rb init”.
-   * Edit the config.yml generated and add the the path of the ruby install for puppet
-     * (it will be <install dir of puppet>/sys/ruby).
-   * Run “ruby dk.rb install” to bind it to the puppet ruby installation.
-
-4. From a Command prompt:
-  * gem install librarian-puppet
-  * gem install test-kitchen
-  * gem install kitchen-puppet
-
-## Mac-OSX Workstation Install
-
-1. Download and install the mac packages from https://downloads.puppetlabs.com/mac/
-  * The most recent Facter package (facter-<VERSION>.dmg)
-  * The most recent Hiera package (hiera-<VERSION>.dmg)
-  * The most recent Puppet package (puppet-<VERSION>.dmg)
-  * See [How to Install Software from DMG Files on a Mac](http://www.ofzenandcomputing.com/how-to-install-dmg-files-mac/) for details.
+1. install the latest Ruby on your workstations (for windows see https://rubyinstaller.org/downloads/)
 
 2. From a Command prompt:
   * gem install librarian-puppet

data/kitchen-puppet.gemspec

@@ -16,7 +16,11 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.rubyforge_project = '[none]'
-  s.add_dependency 'test-kitchen', '~> 1.4'
+  if RUBY_VERSION < '2.3'
+    s.add_dependency 'test-kitchen', '<= 1.16.0', '>= 1.4'
+  else
+    s.add_dependency 'test-kitchen', '>= 1.17.0'
+  end
   if RUBY_VERSION >= '2.0'
     s.add_dependency 'net-ssh', '>= 3'
   else

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.1.1'.freeze
+    VERSION = '3.1.2'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_agent.rb

@@ -22,6 +22,7 @@
 #
 
 require 'json'
+require 'kitchen'
 require 'kitchen/provisioner/base'
 require 'kitchen/provisioner/puppet/librarian'
 
@@ -42,6 +43,7 @@ module Kitchen
       default_config :require_puppet_omnibus, false
       # TODO: use something like https://github.com/fnichol/omnibus-puppet
       default_config :puppet_omnibus_url, nil
+      default_config :puppet_environment, nil
       default_config :puppet_omnibus_remote_path, '/opt/puppet'
       default_config :puppet_version, nil
       default_config :facter_version, nil
@@ -236,15 +238,20 @@ module Kitchen
           puppet_onetime_flag,
           puppet_no_daemonize_flag,
           puppet_noop_flag,
+          puppet_environment_flag,
           puppet_verbose_flag,
           puppet_debug_flag
-        ].join(' ')
+        ].compact.join(' ')
       end
 
       protected
 
       def load_needed_dependencies!; end
 
+      def puppet_environment_flag
+        config[:puppet_environment] ? "--environment=\"#{config[:puppet_environment]}\"" : nil
+      end
+
       def puppet_config
         config[:puppet_config_path]
       end

data/provisioner_options.md

@@ -34,7 +34,7 @@ custom_pre_install_command | nil | Custom shell command to be used at beginning
 custom_install_command | nil | Custom shell command to be used at end of install stage. Can be multiline. See examples below.
 custom_pre_apply_command | nil | Custom shell command to be used before the puppet apply stage. Can be multiline. See examples below.
 custom_post_apply_command | nil | Custom shell command to be used after the puppet apply stage. Can be multiline. See examples below.
-facter_file | nil | yaml file of custom facter_files to be provided to the puppet-apply command
+facter_file | nil | custom facter_file to be provided to the puppet-apply command
 facter_version | "latest"| desired version, affects apt installs.
 files_path | | directory to place at /tmp/kitchen/files
 fileserver_config_path | | file to place fileserver.conf
@@ -219,6 +219,7 @@ puppet_omnibus_remote_path | "/opt/puppet" | Server Installation location of an
 puppet_detailed_exitcodes | nil | Provide transaction information via exit codes.
 puppet_logdest | nil | Where to send messages. Choose between syslog, the console, and a log file.
 puppet_masterport | nil | The port on which to contact the puppet master.
+puppet_environment | nil | The puppet environment to run the agent under
 puppet_test | false | Enable the most common options used for testing.
 puppet_onetime | true | Run the configuration once.
 puppet_no_daemonize | true | Do not send the process into the background.
@@ -346,4 +347,3 @@ provisioner:
     - 0
     - 2
 ```
-

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement