facter 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 353d24b45ac4083ff9a2f7de05702a93e8701487cc6020de93ed974d527e7f53
-  data.tar.gz: c02329462e40922777fac34fab775ea1d68b884b7d4d8f8e99544bdb737f57e8
+  metadata.gz: ee51134133739cd64ee9fb160993ddd8ec683af8a2893aa98744709398d7ffce
+  data.tar.gz: d5bf29fc2338094cc267949431222af0cfa186f25998413dc6d50d14af5aafaa
 SHA512:
-  metadata.gz: 1ccd6eb8e93836cf558c7ed12c943d8c30d14bad521f2de821b014ceb30b3d1f4fc92cc3c54690ff853b5d62dd4c3521293127f87d08fe6525d5ff2f317e3637
-  data.tar.gz: d4a75033160dac87a2244855c7a2ff8d34fb733b527cc8ffd45279c3e2821b0860f3b1982ab1e0e4182c9c75cf45129ebe0c68738eeb605b9e435b5d460da309
+  metadata.gz: 71a0943be14cca0cfc2a1cde31f10deae26fad0c2cc845dec8ba981e86c33b97278adc424a92b301b868fddb6213024431fec51a44f090913de58937865906ed
+  data.tar.gz: 13fbe6fc74dccb348d67c274861bf89fce18d4e792801546b63c4b1f260c270afc338fddf355166b27e1bef5c5484541655c70e4c8e7bfcc39468d94ae247d8e

data/lib/facter/custom_facts/util/loader.rb

@@ -141,13 +141,13 @@ module LegacyFacter
           # Skip anything that doesn't match our regex.
           next unless name =~ /^facter_?(\w+)$/i
 
-          env_name = Regexp.last_match(1)
+          env_name = Regexp.last_match(1).downcase
 
           # If a fact name was specified, skip anything that doesn't
           # match it.
           next if fact && (env_name != fact)
 
-          LegacyFacter.add(Regexp.last_match(1), fact_type: :external, is_env: true) do
+          LegacyFacter.add(env_name, fact_type: :external, is_env: true) do
             has_weight 1_000_000
             setcode { value }
           end

data/lib/facter/resolvers/aix/disks.rb

@@ -34,7 +34,7 @@ module Facter
 
             return if stdout.empty?
 
-            info_size = Facter::Util::Aix::InfoExtractor.extract(stdout, /PP SIZE:|TOTAL PPs:|FREE PPs:|PV STATE:/)
+            info_size = Facter::Util::Aix::InfoExtractor.extract(stdout, :lspv)
 
             return unless info_size['PV STATE']
 

data/lib/facter/resolvers/aix/mountpoints.rb

@@ -19,7 +19,7 @@ module Facter
             @fact_list[:mountpoints] = {}
             output = Facter::Core::Execution.execute('mount', logger: log)
             output.split("\n").map do |line|
-              next if line =~ /node|---|procfs|ahafs/
+              next if line =~ /\s+node\s+|---|procfs|ahafs/
 
               elem = line.split("\s")
 

data/lib/facter/resolvers/aix/partitions.rb

@@ -40,7 +40,7 @@ module Facter
 
             return if stdout.empty?
 
-            info_hash =  Facter::Util::Aix::InfoExtractor.extract(stdout, /PPs:|PP SIZE|TYPE:|LABEL:|MOUNT/)
+            info_hash =  Facter::Util::Aix::InfoExtractor.extract(stdout, :lslv)
             size_bytes = compute_size(info_hash)
 
             part_info = {

data/lib/facter/resolvers/macosx/{processor.rb → processors.rb}

@@ -29,42 +29,42 @@ module Facter
 
           def read_processor_data(fact_name)
             output = Facter::Core::Execution.execute("sysctl #{ITEMS.values.join(' ')}", logger: log)
-            build_fact_list(output.split("\n"))
+            processors_hash = Hash[*output.split("\n").collect { |v| [v.split(': ')[0], v.split(': ')[1]] }.flatten]
+            build_fact_list(processors_hash)
             @fact_list[fact_name]
           end
 
-          def build_fact_list(processors_data)
-            build_logical_count(processors_data[0])
-            build_physical_count(processors_data[1])
-            build_models(processors_data[2])
-            build_speed(processors_data[3])
-            build_cores_per_socket(processors_data[4])
-            build_threads_per_core(processors_data[5], processors_data[4])
+          def build_fact_list(hash)
+            build_logical_count(hash)
+            build_physical_count(hash)
+            build_models(hash)
+            build_speed(hash)
+            build_cores_per_socket(hash)
+            build_threads_per_core(hash)
           end
 
-          def build_logical_count(count)
-            @fact_list[:logicalcount] = count.split(': ')[1].to_i
+          def build_logical_count(hash)
+            @fact_list[:logicalcount] = hash[ITEMS[:logical_count]].to_i
           end
 
-          def build_physical_count(count)
-            @fact_list[:physicalcount] = count.split(': ')[1].to_i
+          def build_physical_count(hash)
+            @fact_list[:physicalcount] = hash[ITEMS[:physical_count]].to_i
           end
 
-          def build_models(model)
-            brand = model.split(': ').fetch(1)
-            @fact_list[:models] = Array.new(@fact_list[:logicalcount].to_i, brand)
+          def build_models(hash)
+            @fact_list[:models] = Array.new(@fact_list[:logicalcount].to_i, hash[ITEMS[:brand]])
           end
 
-          def build_speed(value)
-            @fact_list[:speed] = value.split(': ')[1].to_i
+          def build_speed(hash)
+            @fact_list[:speed] = hash[ITEMS[:speed]].to_i
           end
 
-          def build_cores_per_socket(count)
-            @fact_list[:cores_per_socket] = count.split(': ')[1].to_i
+          def build_cores_per_socket(hash)
+            @fact_list[:cores_per_socket] = hash[ITEMS[:cores_per_socket]].to_i
           end
 
-          def build_threads_per_core(number_of_threads, number_of_cores)
-            @fact_list[:threads_per_core] = number_of_threads.split(': ')[1].to_i / number_of_cores.split(': ')[1].to_i
+          def build_threads_per_core(hash)
+            @fact_list[:threads_per_core] = hash[ITEMS[:threads_per_core]].to_i / hash[ITEMS[:cores_per_socket]].to_i
           end
         end
       end

data/lib/facter/util/aix/info_extractor.rb

@@ -6,17 +6,68 @@ module Facter
       module InfoExtractor
         MEGABYTES_EXPONENT = 1024**2
         GIGABYTES_EXPONENT = 1024**3
+        PROPERTIES = {
+          lslv: [
+            'LOGICAL VOLUME:',
+            'VOLUME GROUP:',
+            'LV IDENTIFIER:',
+            'PERMISSION:',
+            'VG STATE:',
+            'LV STATE:',
+            'TYPE:',
+            'WRITE VERIFY:',
+            'MAX LPs:',
+            'PP SIZE:',
+            'COPIES:',
+            'SCHED POLICY:',
+            'LPs:',
+            'PPs:',
+            'STALE PPs:',
+            'BB POLICY:',
+            'INTER-POLICY:',
+            'RELOCATABLE:',
+            'INTRA-POLICY:',
+            'UPPER BOUND:',
+            'MOUNT POINT:',
+            'LABEL:',
+            'MIRROR WRITE CONSISTENCY:',
+            'EACH LP COPY ON A SEPARATE PV ?:',
+            'Serialize IO ?:'
+          ],
+          lspv: [
+            'PHYSICAL VOLUME:',
+            'VOLUME GROUP:',
+            'PV IDENTIFIER:',
+            'VG IDENTIFIER',
+            'PV STATE:',
+            'STALE PARTITIONS:',
+            'ALLOCATABLE:',
+            'PP SIZE:',
+            'LOGICAL VOLUMES:',
+            'TOTAL PPs:',
+            'VG DESCRIPTORS:',
+            'FREE PPs:',
+            'HOT SPARE:',
+            'USED PPs:',
+            'MAX REQUEST:',
+            'FREE DISTRIBUTION:',
+            'USED DISTRIBUTION:',
+            'MIRROR POOL:'
+          ]
+        }.freeze
 
-        def self.extract(content, regex)
-          content = content.each_line.map do |line|
-            next unless regex =~ line
-
-            line.split(/:\s*|\s{2,}/)
+        def self.extract(content, cmd)
+          property_hash = {}
+          properties = PROPERTIES[cmd]
+          properties.each do |property|
+            str = (properties - [property]).join('|')
+            matcher = content.match(/#{Regexp.escape(property)}([^\n]*?)(#{str}|\n|$)/s)
+            if matcher
+              value = matcher[1].strip
+              property_hash[property.split(':').first] = value
+            end
           end
-
-          content.flatten!.reject!(&:nil?)
-
-          Hash[*content]
+          property_hash
         end
       end
     end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.2.3' unless defined?(VERSION)
+  VERSION = '4.2.4' unless defined?(VERSION)
 end

data/lib/facter.rb

@@ -390,7 +390,7 @@ module Facter
     #
     # @api public
     def value(user_query)
-      user_query = user_query.to_s
+      user_query = user_query.to_s.downcase
       resolve_fact(user_query)
 
       @already_searched[user_query]&.value
@@ -407,7 +407,7 @@ module Facter
     #
     # @api public
     def fact(user_query)
-      user_query = user_query.to_s
+      user_query = user_query.to_s.downcase
       resolve_fact(user_query)
 
       @already_searched[user_query]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -964,7 +964,7 @@ files:
 - lib/facter/resolvers/macosx/filesystems.rb
 - lib/facter/resolvers/macosx/load_averages.rb
 - lib/facter/resolvers/macosx/mountpoints.rb
-- lib/facter/resolvers/macosx/processor.rb
+- lib/facter/resolvers/macosx/processors.rb
 - lib/facter/resolvers/macosx/swap_memory.rb
 - lib/facter/resolvers/macosx/system_memory.rb
 - lib/facter/resolvers/macosx/system_profiler.rb