abide_dev_utils 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b60da7a8a67908351bf5e2687c39e8ac76aad00cb71ad798ac0c0a195e07fe
-  data.tar.gz: 400a2593d83b24a0f970a52f4b6ae0434ff41975260b351c5dd5d0e52387f282
+  metadata.gz: b6af74f2a0eea495b7bf71fd843c668f556ee83cf45e3b6ebfafe4242278dcee
+  data.tar.gz: 6e9f6f60bc30f135bd4f2c6f35962626e81db410fc0c17631761c84e4551e1db
 SHA512:
-  metadata.gz: 3857661d49e0fd254fda83c58ac0363cad5df50342aa55eca44f05f8e1dd47214200ef8586bbec6c1f46767cd7d0528be8f089507e0a6699896971ffceaca2da
-  data.tar.gz: edaa3a7dc991292d51feba476cd49cf343e570ac87e0310957f4d55d43932fd3dc4ed6d72aa6f78fbc686063416e65ed0bbed03bf550fffcf63a135c3175d4af
+  metadata.gz: d61f39d043c94ab0ee2db46bd0374c99803fc720022606361f319e3b245c429700bffec7e9157ef11045cc7f5e25b21833b8bdc820ca1dcb32e7022ae7c89e3c
+  data.tar.gz: c2463568c53de7d0e0dfa0e4950484db5df6965888d2cae2b145f4dfba2816105f41aa413da4c07c9642da33c2a6b264a5cfd6504874db1de0f6de0eeef51675

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abide_dev_utils (0.14.1)
+    abide_dev_utils (0.14.2)
       amatch (~> 0.4)
       cmdparse (~> 3.0)
       facterdb (>= 1.21)
@@ -61,7 +61,7 @@ GEM
     diff-lcs (1.5.0)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
-    facter (4.2.14)
+    facter (4.3.0)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     facterdb (1.21.0)
@@ -85,7 +85,7 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-    google-apis-core (0.10.0)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -94,8 +94,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
@@ -103,7 +103,7 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
+    google-cloud-errors (1.3.1)
     google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -121,7 +121,7 @@ GEM
       signet (>= 0.16, < 2.a)
     hashdiff (1.0.1)
     hashie (5.0.0)
-    hiera (3.11.0)
+    hiera (3.12.0)
     hocon (1.3.1)
     httpclient (2.8.3)
     i18n (1.12.0)
@@ -143,7 +143,7 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.3.0)
     nio4r (2.5.8)
-    nokogiri (1.14.1-x86_64-darwin)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
     oauth (0.6.2)
       snaky_hash (~> 2.0)
@@ -168,7 +168,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
-    puppet (7.22.0-universal-darwin)
+    puppet (7.23.0-universal-darwin)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0, < 1.2.0)
       deep_merge (~> 1.0)
@@ -182,8 +182,8 @@ GEM
       semantic_puppet (~> 1.0)
     puppet-resource_api (1.8.14)
       hocon (>= 1.0)
-    puppet-strings (2.9.0)
-      rgen
+    puppet-strings (3.0.1)
+      rgen (~> 0.9.0)
       yard (~> 0.9.5)
     racc (1.6.2)
     rainbow (3.1.1)
@@ -229,7 +229,7 @@ GEM
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    ruby_parser (3.19.2)
+    ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
     sawyer (0.9.2)

data/lib/abide_dev_utils/cem/benchmark.rb

@@ -485,8 +485,6 @@ module AbideDevUtils
         raise AbideDevUtils::Errors::ResourceDataNotFoundError, facts if rdata_files.nil? || rdata_files.empty?
 
         YAML.load_file(rdata_files[0].path)
-      rescue StandardError => e
-        require 'pry'; binding.pry
       end
     end
   end

data/lib/abide_dev_utils/ppt/hiera.rb

@@ -236,12 +236,14 @@ module AbideDevUtils
           new_paths = []
           possible_fact_values.each do |pfv|
             new_path = path.dup
+            values = []
             pfv.each do |v|
               next unless v
 
+              values << v if v
               new_path.sub!(FACT_PATTERN, v)
             end
-            new_paths << EntryPathLocalFile.new(new_path, facts, possible_fact_values)
+            new_paths << EntryPathLocalFile.new(new_path, facts, values)
           end
           new_paths.uniq(&:path).select(&:exist?)
         end
@@ -249,16 +251,13 @@ module AbideDevUtils
 
       # Represents a local file derived from a Hiera path
       class EntryPathLocalFile
-        attr_reader :path, :facts
+        attr_reader :path, :facts, :values, :fact_values
 
-        def initialize(path, facts, possible_fact_values)
+        def initialize(path, facts, values)
           @path = File.expand_path(File.join(AbideDevUtils::Ppt::Hiera.default_datadir, path))
           @facts = facts
-          @possible_fact_values = possible_fact_values
-        end
-
-        def fact_values
-          @fact_values ||= fact_values_for_path
+          @values = values
+          @fact_values = @facts.zip(@values).to_h
         end
 
         def path_parts
@@ -279,22 +278,6 @@ module AbideDevUtils
             facts: facts
           }
         end
-
-        private
-
-        def fact_values_for_path
-          no_fext_path_parts = path_parts.map { |part| File.basename(part, '.yaml') }
-          valid_fact_values = @possible_fact_values.select do |pfv|
-            pfv.all? { |v| no_fext_path_parts.include?(v) }
-          end
-          valid_fact_values.uniq! # Removes duplicate arrays, not duplicate fact values
-          valid_fact_values.flatten!
-          return {} if valid_fact_values.empty?
-
-          fact_vals = {}
-          facts.each_index { |idx| fact_vals[facts[idx]] = valid_fact_values[idx] }
-          fact_vals
-        end
       end
     end
   end

data/lib/abide_dev_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AbideDevUtils
-  VERSION = "0.14.1"
+  VERSION = "0.14.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abide_dev_utils
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - abide-team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri