choria-mcorpc-support 2.20.7 → 2.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '069a8ceae281b1be5fc39b924c2b95c3fddb8242'
-  data.tar.gz: 97d52bf4968e7acc2c3534c74bc84e2ff75c0f27
+  metadata.gz: fe21f29a02c82194f42269a70b3bbcf8d93a8cd6
+  data.tar.gz: c1ce8445e163f31010ad687d8e26c527fe27ee64
 SHA512:
-  metadata.gz: 2d5810c5b35911eba73e85086caa5764efbfb0d9b77aa504bf64ad538a35da7a0f40552d6dc3a6e43e6f41420684f83f27922b1f8d33018b8b439ac0ecaee670
-  data.tar.gz: a69247825c9d2cc0c598f01ac46832ef02508522ca69a6fc886bed37866ad8652562b683a3f25901c5a8ea6feadf38a3af93d7a948ae018e96050a03c93541a4
+  metadata.gz: 0acc8d8acffecf2185a7486cf7772e66bc4c1662541b2f2795cc3ac2f2eee32cc2511787730ce7c2464da21423fe30dddee891c95eefef86082e7747afc953d1
+  data.tar.gz: 3c08ae6ce075e9953a68db9c40439ce448cf555a0e0cc6be30f42a806a065efd6e5a4d0b7bf2a957976e2751f63a996157f46d973279caef26dafdfbbd469924

data/lib/mcollective.rb

@@ -54,7 +54,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
 
-  VERSION = "2.20.7".freeze
+  VERSION = "2.22.1".freeze
 
   def self.version
     VERSION

data/lib/mcollective/application/facts.rb

@@ -12,6 +12,8 @@ class MCollective::Application::Facts<MCollective::Application
   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)
@@ -28,6 +30,12 @@ class MCollective::Application::Facts<MCollective::Application
     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

data/lib/mcollective/applications.rb

@@ -10,7 +10,7 @@ module MCollective
 
       begin
         load_application(appname)
-      rescue Exception # rubocop:disable Lint/RescueException
+      rescue Exception => e # rubocop:disable Lint/RescueException
         e.backtrace.first << Util.colorize(:red, "  <----")
         STDERR.puts "Application '%s' failed to load:" % appname
         STDERR.puts
@@ -98,6 +98,7 @@ module MCollective
 
       # avoid option parsers own internal version handling that sux
       parser.on("-v", "--verbose")
+      parser.on("--version")
 
       if original_extra_opts
         begin

data/lib/mcollective/config.rb

@@ -39,14 +39,6 @@ module MCollective
 
           begin
             case key
-            when "registration"
-              @registration = val.capitalize
-            when "registration_collective"
-              @registration_collective = val
-            when "registerinterval"
-              @registerinterval = Integer(val)
-            when "registration_splay"
-              @registration_splay = Util.str_to_bool(val)
             when "collectives"
               @collectives = val.split(",").map(&:strip)
             when "main_collective"
@@ -128,7 +120,7 @@ module MCollective
               @default_batch_size = Integer(val)
             when "default_batch_sleep_time"
               @default_batch_sleep_time = Float(val)
-            when "topicprefix", "topicsep", "queueprefix", "rpchelptemplate", "helptemplatedir"
+            when "topicprefix", "topicsep", "queueprefix", "rpchelptemplate", "helptemplatedir", "registration_splay", "registerinterval", "registration_collective", "registration"
               Log.warn("Use of deprecated '#{key}' option.  This option is ignored and should be removed from '#{configfile}'")
             else
               raise("Unknown config parameter '#{key}'")

data/lib/mcollective/ddl/base.rb

@@ -149,7 +149,7 @@ module MCollective
 
         return true
       rescue => e
-        raise DDLValidationError, "Cannot validate input %s: %s" % [key, e.to_s]
+        raise DDLValidationError, "Cannot validate input %s: %s" % [key, e.to_s], e.backtrace
       end
 
       # Registers an input argument for a given action

data/lib/mcollective/pluginpackager/agent_definition.rb

@@ -20,7 +20,9 @@ module MCollective
         @mcversion = mcdependency[:mcversion] || mcversion
         @metadata[:version] = (configuration[:version] || @metadata[:version])
         @dependencies << {:name => "#{@mcname}-common", :version => @mcversion}
+        @agent_name = @metadata[:name].downcase
         @metadata[:name] = (configuration[:pluginname] || @metadata[:name]).downcase.gsub(/\s+|_/, "-")
+
         identify_packages
       end
 
@@ -52,7 +54,7 @@ module MCollective
         agent[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common", :version => @metadata[:version], :revision => @revision}
 
         if @metadata[:provider] == "external"
-          agent[:executable_files] << File.join(agentdir, @metadata[:name])
+          agent[:executable_files] << File.join(agentdir, @agent_name)
         end
 
         agent
@@ -60,9 +62,11 @@ module MCollective
 
       # Obtain client package files and dependencies.
       def client
-        client = {:files => [],
-                  :dependencies => @dependencies.clone,
-                  :description => "Client plugin for #{@metadata[:name]}"}
+        client = {
+          :files => [],
+          :dependencies => @dependencies.clone,
+          :description => "Client plugin for #{@metadata[:name]}"
+        }
 
         clientdir = File.join(@path, "application")
         aggregatedir = File.join(@path, "aggregate")

data/lib/mcollective/util.rb

@@ -169,6 +169,7 @@ module MCollective
       else
         config_paths << "/etc/puppetlabs/mcollective/client.cfg"
         config_paths << "/etc/mcollective/client.cfg"
+        config_paths << "/usr/local/etc/mcollective/client.cfg"
       end
 
       config_paths
@@ -188,22 +189,25 @@ module MCollective
         config_paths << File.join(choria_windows_prefix, "etc", "client.conf")
       else
         config_paths << "/etc/choria/client.conf"
+        config_paths << "/usr/local/etc/choria/client.conf"
       end
 
       config_paths
     end
 
-    # Picks the default user config file, pririties are first Choria ones then old MCollective ones
+    # Picks the default user config file, priorities are first Choria ones then old MCollective ones
     #
     # In roughly this order, first to exist is used:
     #
     # - ~/.choriarc
     # - APPData/ChoriaIO/choria/etc/client.conf on windows
-    # - /etc/choria/client.conf on unix
+    # - /etc/choria/client.conf then
+    # - /usr/local/etc/choria/client.conf on unix
     # - ~/.mcollective
     # - APPData/PuppetLabs/mcollective/etc/client.cfg on windows
     # - /etc/puppetlabs/mcollective/client.cfg
     # - /etc/mcollective/client.cfg
+    # - /usr/local/etc/mcollective/client.cfg
     def self.config_file_for_user
       config_paths = choria_config_paths_for_user + mcollective_config_paths_for_user
       found = config_paths.find_index { |file| File.readable?(file) } || 0

data/lib/mcollective/validator.rb

@@ -57,7 +57,7 @@ module MCollective
       Validator.load_validators
 
       begin
-        if [:integer, :boolean, :float, :number, :string].include?(validation)
+        if [:integer, :boolean, :float, :number, :string, :array, :hash].include?(validation)
           Validator.typecheck(validator, validation)
 
         else
@@ -76,7 +76,7 @@ module MCollective
           end
         end
       rescue => e
-        raise ValidatorError, e.to_s
+        raise ValidatorError, e.to_s, e.backtrace
       end
     end
   end

data/lib/mcollective/validator/typecheck_validator.rb

@@ -19,6 +19,10 @@ module MCollective
           validator.is_a?(String)
         when :boolean
           [TrueClass, FalseClass].include?(validator.class)
+        when :array
+          validator.is_a?(Array)
+        when :hash
+          validator.is_a?(Hash)
         else
           false
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.20.7
+  version: 2.22.1
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.6'
 description: Libraries enabling Ruby support for the Choria Orchestration Server
 email: rip@devco.net
 executables: