cem_acpt 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4936d14749b4fc458a1eb938299c091e45c28c69a838efe947edb1510a10f151
-  data.tar.gz: 52b205f0be2bffa478a474c50bd0686e4ba32f2cec69d710b2a89ecde94c45c3
+  metadata.gz: 1c774f50c327fab457a1047b30f5155cbe3afb8d55c630ddeb0525dde147304b
+  data.tar.gz: 134d1d6cdb6b9de6b7d77a8e634aad01809b2b9fbeb7ddd72f283b32cbcdc292
 SHA512:
-  metadata.gz: 96d81ee34960856f0accf22efec6aa3a12f34abf6b9137c43f886102d8a210eca2e907ff2cd2d0d01f6ce37026f9bf6b70c1ba07fd495ff3ad247ae6c3f713fb
-  data.tar.gz: 46a2f685ede232a010f26e8968666011c8ddfdf690f26df1fc11d3aa3e062d021db56df42854964a8b114b2a2d046127c47dba9b1f87334dd18160aeb2ff7367
+  metadata.gz: 65d80bccfc97735e653a01d067efac47c292c432ffd8ade7d4257d89b8a6553a7e5a3b8a3d762e9687c0f2695af0a7cbd9337baef6c6afd65ab2baf0d4c221f4
+  data.tar.gz: 3dd0bf49d2d71ca3a18150c1182d0a2b8255981be71653e86e8d1a19bfd4b190348bfce153d244bb6dc35cd0f0b6f2db9edf8d5f8b8f7b40f3231869994ecf25

data/.github/workflows/spec.yml

@@ -15,14 +15,22 @@ jobs:
   tests:
     name: RSpec tests
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 3.2
     steps:
       - name: Checkout Source
         uses: actions/checkout@v3
 
+      - name: Delete Gemfile.lock
+        run: rm -f Gemfile.lock
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
       - name: Run RSpec

data/Gemfile.lock

@@ -1,17 +1,13 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.6.0)
+    cem_acpt (0.6.1)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
-      concurrent-ruby (>= 1.1, < 2.0)
       deep_merge (>= 1.2, < 2.0)
       ed25519 (>= 1.2, < 2.0)
-      net-ssh (>= 7.1, < 7.2)
-      parallel (~> 1.22)
       puppet-modulebuilder (>= 0.0.1)
       ruby-terraform (~> 1.7)
-      serverspec (~> 2.42)
 
 GEM
   remote: https://rubygems.org/
@@ -52,11 +48,6 @@ GEM
       open4 (~> 1.3)
     method_source (1.0.0)
     minitar (0.9)
-    multi_json (1.15.0)
-    net-scp (4.0.0)
-      net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.1.0)
-    net-telnet (0.1.1)
     open4 (1.3.4)
     parallel (1.22.1)
     parser (3.2.1.1)
@@ -88,9 +79,6 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.12.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
@@ -111,17 +99,6 @@ GEM
     ruby-terraform (1.7.0)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
-    serverspec (2.42.2)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
-    specinfra (2.85.0)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
     timers (4.3.5)
     traces (0.9.1)
     unicode-display_width (2.4.2)

data/cem_acpt.gemspec

@@ -26,17 +26,13 @@ Gem::Specification.new do |spec|
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  #spec.platform = Gem::Platform.local
+  # spec.platform = Gem::Platform.local
   spec.add_runtime_dependency 'async-http', '>= 0.60', '< 0.70'
-  spec.add_runtime_dependency 'concurrent-ruby', '>= 1.1', '< 2.0'
+  spec.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
   spec.add_runtime_dependency 'deep_merge', '>= 1.2', '< 2.0'
   spec.add_runtime_dependency 'ed25519', '>= 1.2', '< 2.0'
-  spec.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
-  spec.add_runtime_dependency 'net-ssh', '>= 7.1', '< 7.2'
-  spec.add_runtime_dependency 'parallel', '~> 1.22'
   spec.add_runtime_dependency 'puppet-modulebuilder', '>= 0.0.1'
   spec.add_runtime_dependency 'ruby-terraform', '~> 1.7'
-  spec.add_runtime_dependency 'serverspec', '~> 2.42'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop'
 end

data/lib/cem_acpt/config.rb

@@ -118,10 +118,6 @@ module CemAcpt
     end
     alias to_h config
 
-    def user_config_dir
-      @user_config_dir ||= @config.dget('user_config.dir')
-    end
-
     def explain
       explanation = {}
       %i[defaults env_vars user_config config_from_file options].each do |source|
@@ -297,6 +293,7 @@ module CemAcpt
 
       conf_file = find_option('config_file')
       return {} if conf_file.nil? || conf_file.empty?
+
       unless conf_file
         warn "Invalid config_file type '#{conf_file.class}'. Must be a String."
         return {}
@@ -321,11 +318,19 @@ module CemAcpt
     def load_config_file(config_file)
       return {} if config_file.nil? || config_file.empty? || !File.exist?(File.expand_path(config_file))
 
-      loaded = YAML.safe_load_file(File.expand_path(config_file), permitted_classes: [Regexp])
+      loaded = load_yaml(config_file)
       loaded.format!
       loaded
     end
 
+    def load_yaml(config_file)
+      if YAML.respond_to?(:safe_load_file) # Ruby 3.0+
+        YAML.safe_load_file(File.expand_path(config_file), permitted_classes: [Regexp])
+      else
+        YAML.safe_load(File.read(File.expand_path(config_file)), permitted_classes: [Regexp])
+      end
+    end
+
     def validate_config!
       @config.each do |key, _value|
         warn "Unknown config key: #{key}" unless KEYS.include?(key)

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/cem_acpt.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'cem_acpt/config'
-require_relative 'cem_acpt/logging'
-require_relative 'cem_acpt/test_runner'
-require_relative 'cem_acpt/version'
-
 module CemAcpt
+  require_relative 'cem_acpt/config'
+  require_relative 'cem_acpt/logging'
+  require_relative 'cem_acpt/test_runner'
+  require_relative 'cem_acpt/version'
+
   class << self
     include CemAcpt::Logging
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - puppetlabs
@@ -31,12 +31,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.70'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -90,60 +90,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.22'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
@@ -172,20 +118,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: serverspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.42'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.42'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement