beaker-puppet_install_helper 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05e4a9ea911a1bb8e396daf86a75ab4dc1edfba2
-  data.tar.gz: fc51b63f1cd730c17eadd8d010f705c8d8e2b13c
+  metadata.gz: 20829314eda3f99470fb31a9e0bf418d92ea85da
+  data.tar.gz: a0d6e6fcdc62f4fc234455663e37eaddd8564107
 SHA512:
-  metadata.gz: b017170abbb33e3e9245c55185ba6631b28629fd2be41fea7a169a5d0006e653b3f2b74aca1c046d2a4b4cd588fab0137289593813aafcdfce989d85341f6b74
-  data.tar.gz: 51c4f620b8dab296df32bb58effe69d51c4edd5ed20af8456add07e39b7c42a58dfacd7067723348814430e31202c87e4dbdedbec0a8f664ffe20309e91ea10d
+  metadata.gz: ec38831264c4cc35343a235b29a2481912b9066b82905ce557207c33b13f956883ec315e318629f0369a614821f6cff6a5ad529638e6d2477e5cb5320a4587a4
+  data.tar.gz: 12ffdc72c008212caa521fb41d077a7a01dcb0116ccab875acd0cd857aee777db4af5f6e71481e09f9ff61e49d73fa1a45f61d187294464800b40a0ff2c344a2

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 group :test do
   gem 'beaker', '= 2.52.0' if RUBY_VERSION <= '2.1.6'
-  gem 'beaker' if RUBY_VERSION > '2.1.6'
+  gem 'beaker', '~> 4' if RUBY_VERSION > '2.1.6'
   gem 'bundler', '~> 1.9'
   gem 'rake', '~> 10.0'
   gem 'rspec', '~> 3'

data/README.md

@@ -6,7 +6,7 @@ This gem is simply an abstraction for the various ways that we install puppet fr
 
 The way to use this is to declare either `run_puppet_install_helper()` or `run_puppet_install_helper_on(hosts)` and set environment variables `BEAKER_PUPPET_AGENT_VERSION` and/or `BEAKER_PUPPET_COLLECTION` in the following combinations to have puppet installed on the desired hosts. The nodeset should be configured with `type: pe` or `type: aio` to control the type of install.
 
-- `BEAKER_PUPPET_COLLECTION=<puppet collection>` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6-nightly` etc. This may change with time.
+- `BEAKER_PUPPET_COLLECTION=<puppet collection>` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6`, `puppet6-nightly` etc. This may change with time.
 - `BEAKER_PUPPET_AGENT_VERSION=<version>` to specify
 - `BEAKER_IS_PE=<yes or no>` may be used to force a nodeset to be PE or not, regardless of the nodeset `type` or absence thereof.
 - `BEAKER_PE_VER=<pe version>` may be used to specify the PE version for masters. Eg: `BEAKER_PE_VER=2017.3.5`

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,10 @@
+# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'beaker-puppet_install_helper/version'
+
 Gem::Specification.new do |s|
   s.name        = 'beaker-puppet_install_helper'
-  s.version     = '0.9.4'
+  s.version     = Beaker::PuppetInstallHelper::VERSION
   s.authors     = ['Puppetlabs']
   s.email       = ['hunter@puppet.com']
   s.homepage    = 'https://github.com/puppetlabs/beaker-puppet_install_helper'
@@ -17,5 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '>= 2.0'
+  s.add_runtime_dependency 'beaker', '~> 4.0'
+  s.add_runtime_dependency 'beaker-pe', '~> 2.0'
 end

data/lib/beaker-puppet_install_helper/version.rb

@@ -0,0 +1,5 @@
+module Beaker
+  module PuppetInstallHelper
+    VERSION = "0.9.6"
+  end
+end

data/lib/beaker/puppet_install_helper.rb

@@ -1,4 +1,5 @@
 require 'beaker'
+require 'beaker-pe'
 require 'beaker/ca_cert_helper'
 
 module Beaker::PuppetInstallHelper
@@ -20,7 +21,8 @@ module Beaker::PuppetInstallHelper
     # BEAKER_PUPPET_COLLECTION=pc1 <-- for latest 4.x
     # BEAKER_PUPPET_COLLECTION=puppet5 <-- for latest 5.x
     # BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_PUPPET_AGENT_VERSION=5.3.1 <-- for specific version
-    # BEAKER_PUPPET_COLLECTION=puppet6-nightly <-- for latest nightly build
+    # BEAKER_PUPPET_COLLECTION=puppet6 <-- for latest 6.x
+    # BEAKER_PUPPET_COLLECTION=puppet-nightly <-- for latest nightly build
     # BEAKER_PUPPET_AGENT_SHA=0ed2bbc918326263da9d97d0361a9e9303b52938 <-- for specific dev build
 
     # Ensure windows 2003 is always set to 32 bit
@@ -91,7 +93,7 @@ module Beaker::PuppetInstallHelper
       end
 
       agent_sha = find_agent_sha
-      if agent_sha.nil?
+      if agent_sha.nil? || agent_sha.empty?
         install_puppet_agent_on(hosts, options.merge(version: version))
       else
         # If we have a development sha, assume we're testing internally

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -103,6 +103,7 @@ describe 'Beaker::PuppetInstallHelper' do
         before :each do
           allow(subject).to receive(:master).and_return(hosts[1])
           allow(subject).to receive(:sign_certificate_for)
+          allow(subject).to receive(:run_agent_on)
           allow(subject).to receive(:puppet_agent)
           allow(subject).to receive(:puppet).with('resource', 'service', 'puppetserver', 'ensure=running')
           allow(subject).to receive(:puppet).with('resource', 'host', 'puppet', 'ensure=present', 'ip=1.2.3.4')
@@ -161,7 +162,7 @@ describe 'Beaker::PuppetInstallHelper' do
             subject.run_puppet_install_helper_on(hosts)
           end
         end
-        ['puppet5', 'puppet6-nightly'].each do |collection|
+        ['puppet5', 'puppet6-nightly', 'puppet6'].each do |collection|
           context "with #{collection} collection" do
             it "installs puppet-agent from #{collection} repo" do
               ENV['BEAKER_PUPPET_COLLECTION'] = collection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,14 +28,28 @@ dependencies:
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: beaker-pe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Provides a unified external interface to choosing which version of puppet
@@ -56,6 +70,7 @@ files:
 - README.md
 - Rakefile
 - beaker-puppet_install_helper.gemspec
+- lib/beaker-puppet_install_helper/version.rb
 - lib/beaker/ca_cert_helper.rb
 - lib/beaker/puppet_install_helper.rb
 - spec/spec_helper.rb
@@ -81,11 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Puppet install helper for Beaker
-test_files:
-- spec/spec_helper.rb
-- spec/unit/beaker/ca_cert_helper_spec.rb
-- spec/unit/beaker/puppet_install_helper_spec.rb
+test_files: []