beaker_puppet_helpers 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ff13e8fb03a324201a2a00459816f96fb65b4ee3b658bd685f4d820fd7f36b6
-  data.tar.gz: 38ad4707104592a508f9a8a0635ab099cd7fe72490dc530eebbc545db33502fe
+  metadata.gz: d28abba553fcbffcbb66b9a3c822f7b287489ea2f6178b99f2a39b074cda9bf2
+  data.tar.gz: 252d2c337b2d98674bb4e1c9ad7738db7026de09c257a4e198b782489f585e6c
 SHA512:
-  metadata.gz: 28bf14e5400707a070dff651528a6914bc10514f561f25704b884feba002c5ed9e14d95cd6cf03f5dc628351f40643bc560938ea897405cde13cea978018f9ff
-  data.tar.gz: 22c07ea4a35af6bb391966b5a24e3e4afcb30e53e6fd6d546aaec898f67993350d5e6f6df18e6c1c89dda45c6675ffeec1c59b3957629913e236861ee14452f7
+  metadata.gz: 673fca50dfbe74636f9742007806293adda15db06ce871a654f0d8a7325c182eefc08737a7dfd98222a5ead19d13ad17ff15646ba2e44a12a58f8aba7b9ac03c
+  data.tar.gz: 3819be2fbf16501df9229a7d6b3b727643fbf4a7c9de2b20b6214855f4d866d173951f841badf63fa651287901cd23153783ab2d65fce874068c668e2d7da693

data/.github/workflows/test.yml

@@ -1,6 +1,10 @@
 name: CI
 
-on: pull_request
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
 
 env:
   BEAKER_HYPERVISOR: docker

data/CHANGELOG.md

@@ -2,7 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.0.1](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.0.1) (2023-05-09)
+## [1.1.1](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.1.1) (2023-06-16)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.1.0...1.1.1)
+
+**Fixed bugs:**
+
+- fix typo in EL package selection [\#32](https://github.com/voxpupuli/beaker_puppet_helpers/pull/32) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- CI: Run on PRs+merges to master [\#33](https://github.com/voxpupuli/beaker_puppet_helpers/pull/33) ([bastelfreak](https://github.com/bastelfreak))
+- README.md: Correct link to CI jobs [\#30](https://github.com/voxpupuli/beaker_puppet_helpers/pull/30) ([bastelfreak](https://github.com/bastelfreak))
+- GCG: Add faraday-retry dep [\#29](https://github.com/voxpupuli/beaker_puppet_helpers/pull/29) ([bastelfreak](https://github.com/bastelfreak))
+
+## [1.1.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.1.0) (2023-06-01)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.0.1...1.1.0)
+
+**Implemented enhancements:**
+
+- Add support for `--show_diff` [\#27](https://github.com/voxpupuli/beaker_puppet_helpers/pull/27) ([smortex](https://github.com/smortex))
+
+## [1.0.1](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.0.1) (2023-05-10)
 
 [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.0.0...1.0.1)
 

data/Gemfile

@@ -28,5 +28,6 @@ when 'vagrant', 'vagrant_libvirt'
 end
 
 group :release do
+  gem 'faraday-retry', require: false
   gem 'github_changelog_generator', require: false
 end

data/README.md

@@ -1,5 +1,11 @@
 # Beaker Puppet Helpers
 
+[![License](https://img.shields.io/github/license/voxpupuli/beaker_puppet_helpers.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/blob/master/LICENSE)
+[![Test](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/test.yml)
+[![Release](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/beaker_puppet_helpers.svg)](https://rubygems.org/gems/beaker_puppet_helpers)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/beaker_puppet_helpers.svg)](https://rubygems.org/gems/beaker_puppet_helpers)
+
 The purpose of this library is to hold Puppet-specific info & DSL methods.
 This includes all helper & installer methods.
 

data/beaker_puppet_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'beaker_puppet_helpers'
-  s.version     = '1.0.1'
+  s.version     = '1.1.1'
   s.authors     = ['Vox Pupuli']
   s.email       = ['voxpupuli@groups.io']
   s.homepage    = 'https://github.com/voxpupuli/beaker_puppet_helpers'

data/lib/beaker_puppet_helpers/dsl.rb

@@ -89,10 +89,15 @@ module BeakerPuppetHelpers
     #
     # @option opts [String]   :hiera_config The path of the hiera.yaml configuration.
     #
-    # @option opts [String]   :debug (false) If this option exists,
+    # @option opts [Boolean]  :debug (false) If this option exists,
     #                         the "--debug" command line parameter
     #                         will be passed to the 'puppet apply' command.
-    # @option opts [Boolean] :run_in_parallel Whether to run on each host in parallel.
+    #
+    # @option opts [Boolean]  :run_in_parallel Whether to run on each host in parallel.
+    #
+    # @option opts [Boolean]  :show_diff (false) If this option exists,
+    #                         the "--show_diff=true" command line parameter
+    #                         will be passed to the 'puppet apply' command.
     #
     # @param [Block] block This method will yield to a block of code passed
     #                      by the caller; this can be used for additional
@@ -118,6 +123,7 @@ module BeakerPuppetHelpers
         puppet_apply_opts[:modulepath] = opts[:modulepath] if opts[:modulepath]
         puppet_apply_opts[:hiera_config] = opts[:hiera_config] if opts[:hiera_config]
         puppet_apply_opts[:noop] = nil if opts[:noop]
+        puppet_apply_opts[:show_diff] = nil if opts[:show_diff]
 
         # From puppet help:
         # "... an exit code of '2' means there were changes, an exit code of

data/lib/beaker_puppet_helpers/install_utils.rb

@@ -78,7 +78,7 @@ module BeakerPuppetHelpers
     # @return [String] The Puppet package name
     def self.puppet_package_name(host, prefer_aio: true)
       case host['packaging_platform'].split('-', 3).first
-      when /el-|fedora|sles|cisco_|debian|ubuntu/
+      when /el|fedora|sles|cisco_|debian|ubuntu/
         prefer_aio ? 'puppet-agent' : 'puppet'
       when /freebsd/
         'sysutils/puppet'

data/spec/beaker_puppet_helpers/dsl_spec.rb

@@ -166,6 +166,14 @@ describe BeakerPuppetHelpers::DSL do
 
       dsl.apply_manifest_on(agent, 'class { "boo": }', debug: true)
     end
+
+    it 'can set the --show_diff flag' do
+      expect(dsl).to receive(:create_remote_file).and_return(true)
+      expect(Beaker::PuppetCommand).to receive(:new).with('apply', anything, include(show_diff: nil)).and_return('puppet_command')
+      expect(dsl).to receive(:on).with(agent, 'puppet_command', acceptable_exit_codes: [0])
+
+      dsl.apply_manifest_on(agent, 'class { "boo": }', show_diff: true)
+    end
   end
 
   describe '#apply_manifest' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker_puppet_helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker