beaker-hiera 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f452d3f2513e4aba4d980f029222044b4f899d92c68ae02f71f8c25bbfd531a
-  data.tar.gz: b03bc1cf07161dbe89c7915c7b3f489a7f37b471aee548f8d26438a39e9bb46f
+  metadata.gz: 6fa301c34061f47569899cb912a65ef2445800aa858aeb73bd409a2c458b9032
+  data.tar.gz: 3b9fe6eefd16dcee3a9ddfc40c157047b832e870728ef8c14996e37566102cd3
 SHA512:
-  metadata.gz: 17e9609cbf693def9d87ecfb7c51df255a143cbdbf3e03dd791b5cd44520d6861495d06c4292403c9240391aba7ddaeb3dafc696b6b5c570e65e359fad18e000
-  data.tar.gz: 8bfb95f9b8331d10c3185760425668898ab445c46889ddf8e4b857f2149e6d5973ae3e686859bb2d7544e81496b257525fbfa1e0ee79a54426110dc30f062874
+  metadata.gz: 2cbb692a5db729f93a2564a46cdaa756cb703698ef864eec4e0e596101092b02b70def1b09b228894e30c6ed329c22220132249a80b59b21d1e6e57bc1f9c35e
+  data.tar.gz: dd46816d6f16cb699db0413d17d514494ef0c9cbfea3757f8af6dd69fb8ee86a17b9e29297a5d8ddd219911997e9e4c5d75c5bdf20fe5fce50ec1c85f69b5667

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+# raise PRs for gem updates
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'voxpupuli/beaker-hiera'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Ruby 2.7
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/test.yml

@@ -1,27 +1,57 @@
 name: Test
 
 on:
-  - pull_request
-  - push
+  pull_request: {}
+  push:
+    branches:
+      - master
+
+env:
+  BUNDLE_WITHOUT: release
 
 jobs:
-  test:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
+          bundler-cache: true
+      - name: Run Rubocop
+        run: bundle exec rake rubocop
+  spec:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.4"
-          - "2.5"
-          - "2.6"
-          - "2.7"
-    name: Ruby ${{ matrix.ruby }}
+        include:
+          - ruby: "2.7"
+            coverage: "yes"
+          - ruby: "3.0"
+          - ruby: "3.1"
+          - ruby: "3.2"
+    env:
+      COVERAGE: ${{ matrix.coverage }}
+    name: RSpec - Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - name: Run tests
+      - name: spec tests
         run: bundle exec rake test
+      - name: Build gem
+        run: gem build *.gemspec
+
+  tests:
+    needs:
+      - spec
+      - rubocop
+    runs-on: ubuntu-latest
+    name: Test suite
+    steps:
+      - run: echo Test suite completed

data/.rubocop.yml

@@ -0,0 +1,5 @@
+---
+inherit_from: .rubocop_todo.yml
+
+inherit_gem:
+  beaker: rubocop.yml

data/.rubocop_todo.yml

@@ -0,0 +1,73 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-03-27 16:34:12 UTC using RuboCop version 1.48.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/beaker-hiera.rb'
+
+# Offense count: 1
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/beaker-hiera/helpers_spec.rb'
+
+# Offense count: 6
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 2
+RSpec/MultipleExpectations:
+  Max: 2
+
+# Offense count: 11
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/beaker-hiera/helpers_spec.rb'
+
+# Offense count: 2
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/beaker-hiera/helpers_spec.rb'
+
+# Offense count: 6
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/beaker-hiera/helpers_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: .
+# SupportedStyles: constant, string
+RSpec/VerifiedDoubleReference:
+  EnforcedStyle: string
+
+# Offense count: 10
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - '.simplecov'
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'beaker-hiera.gemspec'
+    - 'bin/beaker-hiera'
+    - 'lib/beaker-hiera.rb'
+    - 'lib/beaker-hiera/helpers.rb'
+    - 'lib/beaker-hiera/version.rb'
+    - 'spec/beaker-hiera/helpers_spec.rb'
+    - 'spec/spec_helper.rb'

data/CHANGELOG.md

@@ -0,0 +1,74 @@
+# Changelog
+
+## [0.5.0](https://github.com/voxpupuli/beaker-hiera/tree/0.5.0) (2023-03-28)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hiera/compare/0.4.0...0.5.0)
+
+**Breaking changes:**
+
+- update to beaker 5; Drop Ruby 2.4/2.5/2.6 support [\#19](https://github.com/voxpupuli/beaker-hiera/pull/19) ([rwaffen](https://github.com/rwaffen))
+
+**Closed issues:**
+
+- update to beaker 5 [\#18](https://github.com/voxpupuli/beaker-hiera/issues/18)
+
+**Merged pull requests:**
+
+- Bump actions/checkout from 2 to 3 [\#23](https://github.com/voxpupuli/beaker-hiera/pull/23) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Implement rubocop & fix violations [\#22](https://github.com/voxpupuli/beaker-hiera/pull/22) ([bastelfreak](https://github.com/bastelfreak))
+- dependabot: check for github actions and gems [\#21](https://github.com/voxpupuli/beaker-hiera/pull/21) ([bastelfreak](https://github.com/bastelfreak))
+
+## [0.4.0](https://github.com/voxpupuli/beaker-hiera/tree/0.4.0) (2021-05-19)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hiera/compare/0.3.0...0.4.0)
+
+**Implemented enhancements:**
+
+- Support Ruby 3 [\#16](https://github.com/voxpupuli/beaker-hiera/pull/16) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- Handle an array of hosts in copy\_hiera\_data\_to [\#15](https://github.com/voxpupuli/beaker-hiera/pull/15) ([ekohl](https://github.com/ekohl))
+
+## [0.3.0](https://github.com/voxpupuli/beaker-hiera/tree/0.3.0) (2021-05-18)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hiera/compare/0.2.0...0.3.0)
+
+**Merged pull requests:**
+
+- Release 0.3.0 [\#14](https://github.com/voxpupuli/beaker-hiera/pull/14) ([ekohl](https://github.com/ekohl))
+- Update Github actions [\#13](https://github.com/voxpupuli/beaker-hiera/pull/13) ([ekohl](https://github.com/ekohl))
+- Update the authors, email and homepage to VP [\#12](https://github.com/voxpupuli/beaker-hiera/pull/12) ([ekohl](https://github.com/ekohl))
+- Require Ruby ~\> 2.4 [\#11](https://github.com/voxpupuli/beaker-hiera/pull/11) ([ekohl](https://github.com/ekohl))
+- Use ruby/setup-ruby action [\#10](https://github.com/voxpupuli/beaker-hiera/pull/10) ([ekohl](https://github.com/ekohl))
+- Correct documentation strings [\#9](https://github.com/voxpupuli/beaker-hiera/pull/9) ([ekohl](https://github.com/ekohl))
+- Clean up specs [\#8](https://github.com/voxpupuli/beaker-hiera/pull/8) ([ekohl](https://github.com/ekohl))
+- Indicate the project is not EOL and add example [\#7](https://github.com/voxpupuli/beaker-hiera/pull/7) ([ekohl](https://github.com/ekohl))
+- Always prefer codedir for hieradata [\#6](https://github.com/voxpupuli/beaker-hiera/pull/6) ([ekohl](https://github.com/ekohl))
+- Do not shadow a variable & inline hash definition [\#5](https://github.com/voxpupuli/beaker-hiera/pull/5) ([ekohl](https://github.com/ekohl))
+- Add Github actions for CI + clean up gem deps [\#4](https://github.com/voxpupuli/beaker-hiera/pull/4) ([ekohl](https://github.com/ekohl))
+
+## [0.2.0](https://github.com/voxpupuli/beaker-hiera/tree/0.2.0) (2020-11-10)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hiera/compare/0.1.1...0.2.0)
+
+**Merged pull requests:**
+
+- Release 0.2.0 before moving the repo to Vox Pupuli [\#3](https://github.com/voxpupuli/beaker-hiera/pull/3) ([lucywyman](https://github.com/lucywyman))
+- \(BKR-1500\) Mothball beaker-hiera [\#2](https://github.com/voxpupuli/beaker-hiera/pull/2) ([Dakta](https://github.com/Dakta))
+
+## [0.1.1](https://github.com/voxpupuli/beaker-hiera/tree/0.1.1) (2015-10-14)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hiera/compare/0.1.0...0.1.1)
+
+**Merged pull requests:**
+
+- \(BKR-562\) removed leftover spec lines [\#1](https://github.com/voxpupuli/beaker-hiera/pull/1) ([kevpl](https://github.com/kevpl))
+
+## [0.1.0](https://github.com/voxpupuli/beaker-hiera/tree/0.1.0) (2015-09-08)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hiera/compare/84dbbc6be29c41e74d862665fe9aa9dd7bbacb18...0.1.0)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -1,3 +1,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
+
+group :release do
+  gem 'github_changelog_generator', require: false
+end

data/Rakefile

@@ -14,3 +14,31 @@ RSpec::Core::RakeTask.new(:coverage) do |t|
 end
 
 task default: :test
+
+begin
+  require 'rubygems'
+  require 'github_changelog_generator/task'
+rescue LoadError
+  # github_changelog_generator is an optional release
+else
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.exclude_labels = %w[duplicate question invalid wontfix wont-fix skip-changelog]
+    config.user = 'voxpupuli'
+    config.project = 'beaker-hiera'
+    gem_version = Gem::Specification.load("#{config.project}.gemspec").version
+    config.future_release = gem_version
+  end
+end
+
+begin
+  require 'rubocop/rake_task'
+rescue LoadError
+  # RuboCop is an optional group
+else
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    # These make the rubocop experience maybe slightly less terrible
+    task.options = ['--display-cop-names', '--display-style-guide', '--extra-details']
+    # Use Rubocop's Github Actions formatter if possible
+    task.formatters << 'github' if ENV['GITHUB_ACTIONS']
+  end
+end

data/beaker-hiera.gemspec

@@ -12,16 +12,19 @@ Gem::Specification.new do |s|
   s.license     = 'Apache2'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '~> 2.4'
+  s.required_ruby_version = '>= 2.7', '< 4'
 
   # Testing dependencies
   s.add_development_dependency 'pry', '~> 0.10'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rubocop', '~> 1.48.1'
+  s.add_development_dependency 'rubocop-performance', '~> 1.10'
+  s.add_development_dependency 'rubocop-rake', '~> 0.2'
+  s.add_development_dependency 'rubocop-rspec', '>= 1.44'
   s.add_development_dependency 'simplecov'
 
   # Documentation dependencies
@@ -30,5 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '~> 4.0'
+  s.add_runtime_dependency 'beaker', '>= 4', '< 6'
 end

data/lib/beaker-hiera/helpers.rb

@@ -16,10 +16,10 @@ module Beaker
             hiera_config = {
               backends: 'yaml',
               yaml: {
-                datadir: hiera_datadir(hst)
+                datadir: hiera_datadir(hst),
               },
               hierarchy: hierarchy,
-              logger: 'console'
+              logger: 'console',
             }
             create_remote_file hst, hst.puppet['hiera_config'], hiera_config.to_yaml
           end
@@ -43,7 +43,9 @@ module Beaker
         # @param [String] source
         #   Directory containing the hiera data files.
         def copy_hiera_data_to(host, source)
-          scp_to host, File.expand_path(source), hiera_datadir(host)
+          block_on host do |hst|
+            scp_to hst, File.expand_path(source), hiera_datadir(hst)
+          end
         end
 
         # Copy hiera data files to the default host

data/lib/beaker-hiera/version.rb

@@ -4,7 +4,7 @@ module Beaker
       module Hiera
         module Version
           # Current version of beaker-hiera
-          STRING = '0.3.0'.freeze
+          STRING = '0.5.0'.freeze
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hiera
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -53,6 +53,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.48.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.48.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.44'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.44'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +169,22 @@ dependencies:
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: For use for the Beaker acceptance testing tool
 email:
 - voxpupuli@groups.io
@@ -131,13 +193,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
-- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
@@ -158,9 +223,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.7'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/HISTORY.md

@@ -1,34 +0,0 @@
-# default - History
-## Tags
-* [0.3.0 - 18 May, 2021](#0.2.1)
-* [0.2.0 - 10 Nov, 2020](#0.2.0)
-* [0.1.1 - 14 Oct, 2.05 (a23d45bc)](#0.1.1)
-* [0.1.0 - 8 Sep, 2.05 (7d1ef9b6)](#0.1.0)
-
-## Details
-
-### <a name = "0.3.0">0.3.0 - 18 May, 2021
-
-* Major update to work with Beaker 4
-
-### <a name = "0.2.0">0.2.0 - 10 Nov, 2020
-
-* Release before moving to Vox Pupuli
-
-### <a name = "0.1.1">0.1.1 - 14 Oct, 2.05 (a23d45bc)
-
-* (GEM) update beaker-hiera version to 0.1.1 (a23d45bc)
-
-* Merge pull request #1 from puppetlabs/bkr562_spec_audit (2693ec4f)
-
-
-```
-Merge pull request #1 from puppetlabs/bkr562_spec_audit
-
-(BKR-562) removed leftover spec lines
-```
-* (BKR-562) removed leftover spec lines (c348c5e9)
-
-### <a name = "0.1.0">0.1.0 - 8 Sep, 2.05 (7d1ef9b6)
-
-* Initial release.