beaker-rspec 6.2.1 → 6.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjMzOTU5OGJjMmVmNTBhZDMxZjc2YjQ1OWI4NTU2ZTJlZGE5NmExZg==
+    MjAxZThjODY5NWM2YTdjZjhmMDZkYmViNGI2OWUzMDRjZmJlNzNmZA==
   data.tar.gz: !binary |-
-    ZDUzYzExYTFmYTM4NzZkNmVlODA5MDcyMDZjYmM1Y2RhMTJiYzg0MQ==
+    ZmQ4YTM4YmIwNzg1YTgxNjhlMGY3NjM0YmJmZDZjMWFkNDRmMTk4ZA==
 SHA512:
   metadata.gz: !binary |-
-    MDJmMzEwNTJhOGE0YTFjOGM4YWM3ZDhjYjUzNmM4NDE1YzY4ODQzNWY5ZDM0
-    MTFlMmQwMjAzMmYzZjY2ODE1ZTQwYTczYjIzY2M2OTVhODk5ZjhjZjAyZmY5
-    ZGEzNGZlNjZlZTJlZGNmMDIyZTNmMmE3ZTgzN2NiNDk4NDgyOGQ=
+    NzBhNTgxOGUxMTAzYzY0MWYyZTQ3ODgwOWRkOGJlODIxYmExNWNhOGVlMTBk
+    OWQ5NmIwODFkNzEzZTQyNDVhNzkyNDA2ODRjNWZjZDE4MzBjODA4YzAzYTVl
+    MDA5NDMxMjk4Nzc5NWJhZmJjODQ1ZDY0YjM1YjA0MDBlZDRiMGY=
   data.tar.gz: !binary |-
-    OTdiMzg4MDI5NDdiZDI0MjYzZmQzMTRlMTc0NjNlMDA4NGEyMThkZTg1N2Y4
-    ZDk3OTVjYTZlMjcwOTAyYjA0MDIzNzBiMmFmZTNkZjYyMWYxOTA1NmZjY2Nh
-    YjRmNzgyOTExZDE0NTRmN2MxOGQ4ODdiNTg1YjgyNjM1ODlmM2Q=
+    NmM1Y2E5MTM3MjQ5NTQ0YTQzNjc0NGU4NzU2OTgwNTQxNDE1MmI2NmM0MjMy
+    Mzg2Nzg4MzljODZiYjI1ZWNiMTIxODUzNTZkNDFmZTkxMGE1ZWM2YTFiNDkx
+    YzE4YzlhMjRlZGMwNDRmMDg5ODdjNWRiNWEzMzlhYzJlN2JkN2E=

data/README.md

@@ -42,7 +42,8 @@ cd .vagrant/beaker_vagrant_files/default.yml ; vagrant destroy --force
 * `BEAKER_keyfile`: specify alternate SSH key to access the test VMs
 * `BEAKER_options_file`: set to the file path of the options file to be used as the default options for beaker.  Equivalent to the `--options-file` parameter.  
 * `BEAKER_provision`: set to `no` to skip provisioning boxes before testing, beaker will then assume that boxes are already provisioned and reachable
-* `BEAKER_set`: set to the name of the node file to be used during testing (exclude .yml file extension, it will be added by beaker-rspec). The file is assumed to be in module's spec/acceptance/nodesets directory.
+* `BEAKER_setdir`: change the directory with nodesets. Defaults to the module's `spec/acceptance/nodesets` directory.
+* `BEAKER_set`: set to the name of the node file to be used during testing (exclude .yml file extension, it will be added by beaker-rspec). The file is assumed to be in the `setdir` (see `BEAKER_setdir`).
 * `BEAKER_setfile` - set to the full path to a node file be used during testing (be sure to include full path and file extensions, beaker-rspec will use this path without editing/altering it in any way)
 
 For details on the specific mappings, the [setup code](https://github.com/puppetlabs/beaker-rspec/blob/2771b4b1864692690254a969680a57ff22ac0516/lib/beaker-rspec/spec_helper.rb#L26-L32) and the [beaker docs](https://github.com/puppetlabs/beaker/blob/master/docs/tutorials/the_command_line.md).
@@ -73,7 +74,7 @@ Then run
 
 ## Create node files
 
-These files indicate the nodes (or hosts) that the tests will be run on.  By default, any node file called `default.yml` will be used.  You can override this using the `BEAKER_set` environment variable to indicate an alternate file.  Do not provide full path or the '.yml' file extension to `BEAKER_set`, it is assumed to be located in 'spec/acceptance/nodesets/${NAME}.yml' by beaker-rspec.  If you wish to use a completely different file location use `BEAKER_setfile` and set it to the full path (including file extension) of your hosts file.
+These files indicate the nodes (or hosts) that the tests will be run on.  By default, any node file called `default.yml` will be used.  You can override this using the `BEAKER_set` environment variable to indicate an alternate file.  Do not provide full path or the '.yml' file extension to `BEAKER_set`, beaker-rspec expands the filename to '${DIR}/${NAME}.yml'.  The directory defaults to `spec/acceptance/nodesets` but can be overridden with the `BEAKER_setdir` variable.  `BEAKER_setdir` gives full control over the path (including file extension).
 
 Nodes are pulled from [Puppet Labs Vagrant Boxes](https://vagrantcloud.com/puppetlabs).
 

data/lib/beaker-rspec/spec_helper.rb

@@ -25,6 +25,7 @@ RSpec.configure do |c|
   env_vars = {
     :color       => ENV['BEAKER_color'] || ENV['RS_COLOR'],
     :nodeset     => ENV['BEAKER_set'] || ENV['RS_SET'],
+    :nodesetdir  => ENV['BEAKER_setdir'] || ENV['RS_SETDIR'],
     :nodesetfile => ENV['BEAKER_setfile'] || ENV['RS_SETFILE'],
     :provision   => ENV['BEAKER_provision'] || ENV['RS_PROVISION'],
     :keyfile     => ENV['BEAKER_keyfile'] || ENV['RS_KEYFILE'],
@@ -36,7 +37,8 @@ RSpec.configure do |c|
    options = defaults.merge(env_vars)
 
   # process options to construct beaker command string
-  nodesetfile = options[:nodesetfile] || File.join('spec/acceptance/nodesets',"#{options[:nodeset]}.yml")
+  nodesetdir = options[:nodesetdir] || dir.join('spec', 'acceptance', 'nodesets')
+  nodesetfile = options[:nodesetfile] || File.join(nodesetdir, "#{options[:nodeset]}.yml")
   fresh_nodes = options[:provision] == 'no' ? '--no-provision' : nil
   keyfile = options[:keyfile] ? ['--keyfile', options[:keyfile]] : nil
   debug = options[:debug] ? ['--log-level', 'debug'] : nil

data/lib/beaker-rspec/version.rb

@@ -1,5 +1,5 @@
 module BeakerRSpec
   module Version
-    STRING = '6.2.1'
+    STRING = '6.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-rspec
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RSpec bindings for beaker