choria-mcorpc-support 2.23.2 → 2.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec95c87d792aa11ef19070212ddb9c9a049b958
-  data.tar.gz: 6773d4503a617ffe984e536f789d8057f99794db
+  metadata.gz: 73c63dbc1dacba7b90acdba3141cfedd3731da11
+  data.tar.gz: 42cfc48d721f69b6ec805e71624a8b8cff0fc141
 SHA512:
-  metadata.gz: 9795fbdcaf8a5d765186a73b9fd7a6e015faea9738340a0e86b31bf199ef865d38b8e95fea9c3398da0ff6ba69ff11cef5480fa28a48639ed41074f9aea75c7e
-  data.tar.gz: 719dc3e9eb808fb6cd13b4b43124b9d83bcc15569b061c92f64b1905c639b37d0f86a2b56fa6f074671a3aaec647c995089d5bca26bce433ce93c5bd78dfeddb
+  metadata.gz: 2f5370f390815f5881473b6c0e482db4f821f88ecb2616e33af9aa29a91e1561f1306b24945b1df2fe9d7ad05f8f770908298cb9279ae6dedb90658906654454
+  data.tar.gz: 250ca8bb59baccda7324a4f21f7db4f938c6fc06cdfe968f46263e0fe11ba55214d237dda44a5db0243500007a8ffec856e336880334d5e0df3d2e53903499a9

data/lib/mcollective.rb

@@ -53,7 +53,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
 
-  VERSION = "2.23.2".freeze
+  VERSION = "2.23.3".freeze
 
   def self.version
     VERSION

data/lib/mcollective/application/facts.rb

@@ -1,71 +1,6 @@
 class MCollective::Application::Facts < MCollective::Application # rubocop:disable Style/ClassAndModuleChildren
   description "Reports on usage for a specific fact"
 
-  def post_option_parser(configuration)
-    configuration[:fact] = ARGV.shift unless ARGV.empty?
-  end
-
-  def validate_configuration(configuration)
-    raise "Please specify a fact to report for" unless configuration.include?(:fact)
-  end
-
-  def show_single_fact_report(fact, facts, verbose=false)
-    puts("Report for fact: #{fact}\n\n")
-
-    facts = stringify_facts_hash(facts)
-
-    field_size = MCollective::Util.field_size(facts.keys)
-    facts.keys.sort.each do |k|
-      printf("        %-#{field_size}s found %d times\n", k, facts[k].size)
-
-      next unless verbose
-
-      puts
-
-      facts[k].sort.each do |f|
-        puts("            #{f}")
-      end
-
-      puts
-    end
-  end
-
-  def stringify_facts_hash(facts)
-    res = Hash.new([])
-    facts.each { |k, v| res[k.to_s] += v }
-    res
-  end
-
-  def main
-    rpcutil = rpcclient("rpcutil")
-    rpcutil.progress = false
-
-    facts = {}
-
-    rpcutil.get_fact(:fact => configuration[:fact]) do |resp|
-      begin
-        value = resp[:body][:data][:value].to_s
-
-        if resp[:body][:data].include?(:value)
-          if facts.include?(value)
-            facts[value] << resp[:senderid]
-          else
-            facts[value] = [resp[:senderid]]
-          end
-        end
-      rescue Exception => e # rubocop:disable Lint/RescueException
-        warn "Could not parse facts for #{resp[:senderid]}: #{e.class}: #{e}"
-      end
-    end
-
-    if facts.empty?
-      puts "No values found for fact #{configuration[:fact]}\n"
-    else
-      show_single_fact_report(configuration[:fact], facts, options[:verbose])
-    end
-
-    printrpcstats
-
-    halt rpcutil.stats
-  end
+  external(:command => "choria", :args => ["facts"])
+  external_help(:command => "choria", :args => ["facts", "--help"])
 end

data/lib/mcollective/util/tasks_support.rb

@@ -283,6 +283,7 @@ module MCollective
           if pid.nil?
             Process.gid = Process.egid = u.gid
             Process.uid = Process.euid = u.uid
+            ENV.delete_if { |name| name !~ /^LC_/ }
             Process.exec(environment, command, options)
           end
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.23.2
+  version: 2.23.3
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu