simp-beaker-helpers 1.5.7 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dafff76be810af68e014763c28c3e863697a4de
-  data.tar.gz: 536ec8143f8abeee194340f891d14aea1712f2c5
+  metadata.gz: f423ccffba15fb59477037b489fc83e02828d546
+  data.tar.gz: 58ea1934ae1e074fee9f262160f9ba64fec60dfc
 SHA512:
-  metadata.gz: 323dc6287e75970853b2a1d835b350e61fbb2ad2a7f99b0c05c45c38646e180c9e2cdb9da8c14f7877b4a6646a57356dcfacad87b323377c922efe41a4eeff91
-  data.tar.gz: 1ac6b81ef47e313e8dfdcf0d5ca044eb39be0f0ce07f408af574eb32bba67c6fc4f3c11c8361cf24a2886baa3290c03d4cbb3eec4a018cd4e396fc0d8ae583c6
+  metadata.gz: cf58694581293b502b34acd99c8e1a15808ae8e5c282d81d37feb9b32a4252e2cd10866b385d874737cc41ffc929bfba769d337408d3afdd76a7a9ce928b3d34
+  data.tar.gz: 87db67f03c23e8cb1ae4578c6509fab397dd5e918d0b7817729f27a66300f122f282f9baff3c0d50ba75daac30aa51abf644667060d6438ac1b15edcff426488

data/.travis.yml

@@ -3,8 +3,7 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1.9
 
 env:
   - SIMP_SKIP_NON_SIMPOS_TESTS=1

data/README.md

@@ -29,8 +29,10 @@ Methods to assist beaker acceptance tests for SIMP.
     * [`BEAKER_spec_prep`](#beaker_spec_prep)
     * [`BEAKER_stringify_facts`](#beaker_stringify_facts)
     * [`BEAKER_use_fixtures_dir_for_modules`](#beaker_use_fixtures_dir_for_modules)
+    * [`PUPPET_VERSION`](#puppet_version)
 7. [Examples](#examples)
     * [Prep OS, Generate and copy PKI certs to each SUT](#prep-os-generate-and-copy-pki-certs-to-each-sut)
+    * [Specify the version of Puppet to run in the SUTs](#specify-the-version-of-puppet-to-run-in-the-suts)
 8. [License](#license)
 
 ## Overview
@@ -284,8 +286,15 @@ this will _not_ update modules that are already present under
 #### `BEAKER_stringify_facts`
 #### `BEAKER_use_fixtures_dir_for_modules`
 
+#### PUPPET_VERSION
+
+The `PUPPET_VERSION` environment variable will install the latest
+`puppet-agent` package that provides that version of Puppet.  This honors
+`Gemfile`-style expressions like `"~> 4.8.0"`
+
 ## Examples
 
+
 ### Prep OS, Generate and copy PKI certs to each SUT
 This pattern serves to prepare component modules that use PKI
 
@@ -331,5 +340,18 @@ RSpec.configure do |c|
 end
 ```
 
+### Specify the version of Puppet to run in the SUTs
+
+```bash
+# puppet-agent 1.8.3 will be installed in VMs
+PUPPET_VERSION="~> 4.8.0" bundle exec rake beaker:suites
+
+# puppet-agent 1.9.2 will be installed in VMs
+PUPPET_INSTALL_VERSION=1.9.2 bundle exec rake beaker:suites
+
+# puppet-agent 1.8.3 will be installed in VMs
+bundle exec rake beaker:suites
+```
+
 ## License
 See [LICENSE](LICENSE)

data/files/puppet-agent-versions.yaml

@@ -0,0 +1,28 @@
+---
+# `puppet` agent to `puppet-agent` version mappings
+version_mappings:
+  '4.9.2': '1.9.1'
+  '4.9.0': '1.9.0'
+  '4.8.2': '1.8.3'
+  '4.8.1': '1.8.2'
+  '4.8.0': '1.8.0'
+  '4.7.1': '1.7.2'
+  '4.7.0': '1.7.1'
+  '4.6.2': '1.6.2'
+  '4.6.1': '1.6.1'
+  '4.6.0': '1.6.0'
+  '4.5.2': '1.5.3'
+  '4.5.1': '1.5.1'
+  '4.5.0': '1.5.0'
+  '4.4.2': '1.4.2'
+  '4.4.1': '1.4.1'
+  '4.4.0': '1.4.0'
+  '4.3.2': '1.3.6'
+  '4.3.1': '1.3.2'
+  '4.3.0': '1.3.0'
+  '4.2.3': '1.2.7'
+  '4.2.2': '1.2.6'
+  '4.2.1': '1.2.2'
+  '4.2.0': '1.2.1'
+  '4.1.0': '1.1.1'
+  '4.0.0': '1.0.1'

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,8 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.5.7'
+  require 'simp/beaker_helpers/version'
+  DEFAULT_PUPPET_AGENT_VERSION = '1.8.3'
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)
@@ -545,4 +546,42 @@ done
       end
     end
   end
+
+
+  # Looks up latest `puppet-agent` version by the version of its `puppet` gem
+  #
+  # @param puppet_version [String] target Puppet gem version.  Works with
+  #   Gemfile comparison syntax (e.g., '4.0', '= 4.2', '~> 4.3.1')
+  #
+  # @return [String,Nil] the `puppet-agent` version or nil
+  #
+  def latest_puppet_agent_version_for( puppet_version )
+    return nil if puppet_version.nil?
+    require 'rubygems/requirement'
+    require 'rubygems/version'
+    require 'yaml'
+    @agent_version_table ||= YAML.load_file(
+                               File.expand_path(
+                                 '../../files/puppet-agent-versions.yaml',
+                                 File.dirname(__FILE__)
+                             )).fetch('version_mappings')
+    _pair = @agent_version_table.find do |k,v|
+      Gem::Requirement.new(puppet_version).satisfied_by?(Gem::Version.new(k))
+    end
+    result = _pair ? _pair.last : nil
+  end
+
+
+  # Replacement for `install_puppet` in spec_helper_acceptance.rb
+  def install_puppet
+    puppet_install_type = ENV.fetch('PUPPET_INSTALL_TYPE', 'agent')
+    puppet_agent_version = (
+      ENV.fetch('PUPPET_INSTALL_VERSION', nil) ||
+      latest_puppet_agent_version_for(ENV.fetch('PUPPET_VERSION',nil)) ||
+      DEFAULT_PUPPET_AGENT_VERSION
+    )
+    require 'beaker/puppet_install_helper'
+    run_puppet_install_helper(puppet_install_type,  puppet_agent_version)
+  end
+
 end

data/lib/simp/beaker_helpers/version.rb

@@ -0,0 +1,5 @@
+module Simp; end
+
+module Simp::BeakerHelpers
+  VERSION = '1.6.0'
+end

data/simp-beaker-helpers.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'simp/beaker_helpers.rb'
+require 'simp/beaker_helpers/version'
 require 'date'
 
 Gem::Specification.new do |s|
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
                  'issue_tracker' => 'https://simp-project.atlassian.net'
                }
   s.add_runtime_dependency 'beaker', '~> 2'
+  s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.6'
 
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.6.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: beaker-puppet_install_helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: "    Beaker helper methods to help scaffold SIMP acceptance tests\n"
 email: simp@simp-project.org
 executables: []
@@ -43,7 +57,9 @@ files:
 - files/pki/make.sh
 - files/pki/template_ca.cnf
 - files/pki/template_host.cnf
+- files/puppet-agent-versions.yaml
 - lib/simp/beaker_helpers.rb
+- lib/simp/beaker_helpers/version.rb
 - lib/simp/rake/beaker.rb
 - simp-beaker-helpers.gemspec
 - spec/acceptance/fixture_modules_spec.rb