choria-mcorpc-support 2.24.4 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707a3ec934abb7197a7eaaf95377c01149aa481f8320ffcfd7d07891094e6373
-  data.tar.gz: 6bdc5f52c104d5a10a3f06e5de1194c0633f20a4458d2bbf5b10064b0f153808
+  metadata.gz: 872d9ec79ab2ad9236e7d7d353dc57914b5b1f35bf9089c6cea13aa9580feb77
+  data.tar.gz: c2f616aee7f58388f69b7db4d0780ec287e1d57f95777597f0dc621b0cc6b6f6
 SHA512:
-  metadata.gz: 9bc9ea26a564281863c042abc4e1e652279c62833240d7281a17cdc04a9485efd54b932d578c29415bc829432a7848acece6ef6f82e8b935e65e26e5e75fc2b0
-  data.tar.gz: 8b0b97bc19f45c868b3052c20256cff43960f4b5804ec1fda4cff2f7e65fa427dd34495727ed5adaa01c6b8bc393ef823cec3d5edd14b450938f8c73ec142f32
+  metadata.gz: 30b8face825e23b87c694600d70a44f92ddd03ef9d8e62935e703d2ba7f62ce328b6a61352fff94214d9abf5944c2f6d09098de0751f6f6060d2c76f2ed7f208
+  data.tar.gz: 61ca3c642f3a6eae367d72572314c99183c983dab65560ba17056f967955b56518369415fad370916391e7c29c0d879a4fb0281900ba068b94d578d604b29af8

data/lib/mcollective/discovery/delegate.rb

@@ -10,6 +10,9 @@ module MCollective
 
         cmd = [binary_name, "discover", "-j", "--silent"]
 
+        config = client.options.fetch(:config)
+        cmd << "--config" << config if config
+
         cmd << "-T" << filter["collective"] if filter["collective"]
 
         filter.fetch("identity", []).each do |i|

data/lib/mcollective/util/tasks_support.rb

@@ -65,7 +65,7 @@ module MCollective
       # AIO path to binaries like wrappers etc
       def aio_bin_path
         if Util.windows?
-          'C:\Program Files\Puppet Labs\Puppet\bin'
+          'C:\Program Files\Puppet Labs\Puppet\puppet\bin'
         else
           "/opt/puppetlabs/puppet/bin"
         end
@@ -88,6 +88,13 @@ module MCollective
         end
       end
 
+      # Is this an AIO install?
+      #
+      # @return [Boolean]
+      def aio?
+        File.directory?(aio_bin_path)
+      end
+
       # Path to the task wrapper executable
       #
       # @return [String]
@@ -179,6 +186,8 @@ module MCollective
           "_choria_task_caller" => task_caller
         }
 
+        environment["PATH"] = "#{aio_bin_path}#{File::PATH_SEPARATOR}#{ENV['PATH']}" if aio?
+
         return environment unless task["input"]
         return environment unless ["both", "environment"].include?(task_input_method(task))
 
@@ -250,7 +259,7 @@ module MCollective
       # act on these tasks either by asking for their status or perhaps killing
       # them?
       #
-      # @param command [Array<String>] command to run
+      # @param command [String] command to run
       # @param environment [Hash] environment to run with
       # @param stdin [String] stdin to send to the command
       # @param spooldir [String] path to the spool for this specific request
@@ -291,7 +300,7 @@ module MCollective
             Process.exec(environment, command, options)
           end
         else
-          pid = Process.spawn(environment, command, options)
+          pid = Process.spawn(environment, [command, command], options)
         end
 
         sleep 0.1 until File.exist?(wrapper_stdout)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.24.4
+  version: 2.25.0
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-19 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 description: Libraries enabling Ruby support for the Choria Orchestration Server
 email: rip@devco.net
 executables: