beaker_puppet_helpers 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf5abd7cf85873a9544f42d9da34d59700f196fe7cf1665449dec6b04bf6c8c7
-  data.tar.gz: cc3bfe5d7108fb7ce5bc33103afb2d842592f959012c86d70c32cd4647458c30
+  metadata.gz: fa0f4a5c8f1fdf3af5e5d2e70344d6a66eb57dccea809afa8874d0c2042a9909
+  data.tar.gz: 2b8869cdffac42895c8d45f2f7efed1a49acf0333208fde932fab6c779790667
 SHA512:
-  metadata.gz: 7cffd9b821bb8a83af7409fe0ed0eae04f764b696545baa06896ad493a833c037ee83d3952e151bfed51415b2eb53794e6d74440e11245d7cde4721d095f80c2
-  data.tar.gz: fd5402a62aacbb30b8a9534ed19b4f4a42e50295494adeecb4ee42277a1ea1679416264ec48ce4d0d9361323865ac1d0f1eb7bda1d50e810bbec2b4408f478b3
+  metadata.gz: d00617272c372496bf6c6512f05b6efc3800c8bac1618d3b5e30dfa91f808fd8c940dadceea9283a37104c2c63e2e7c6beb9c5e0bd62b5a228424d72c700043e
+  data.tar.gz: 4f6556760ce3963f0502fe55f03f9881f4b86d39e623089cc8a767abdcef53010161ad7b533442745174c021d6e865e69f101136d4464c71c323c4f0f8a4563f

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [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)
+
+**Fixed bugs:**
+
+- puppet-modulebuilder: Allow 1.x [\#25](https://github.com/voxpupuli/beaker_puppet_helpers/pull/25) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.0.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.0.0) (2023-05-05)
 
 [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/5cc9e2e0e2a6a3541502bb1aae961071a8b96157...1.0.0)

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/ci.yml/badge.svg)](https://github.com/voxpupuli/beaker_puppet_helpers/actions/workflows/ci.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.0'
+  s.version     = '1.1.0'
   s.authors     = ['Vox Pupuli']
   s.email       = ['voxpupuli@groups.io']
   s.homepage    = 'https://github.com/voxpupuli/beaker_puppet_helpers'
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '>= 4', '< 6'
-  s.add_runtime_dependency 'puppet-modulebuilder', '~> 0.3', '< 2'
+  s.add_runtime_dependency 'puppet-modulebuilder', '>= 0.3', '< 2'
 end

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/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.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -34,7 +34,7 @@ dependencies:
   name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
     - - "<"
@@ -44,7 +44,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
     - - "<"