choria-colt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87713c8d6906919afa9b79624fc72f0f353ecd276f4eac20f5c02466722cd4e6
-  data.tar.gz: b995ac965550cc9f9e244b26e2cf7d0a64dce8ab11fac81528cb8673658b845f
+  metadata.gz: 6a899af183eb44fcd18e470166a824da35e0ab2ed46ab25c9f001c716442edfe
+  data.tar.gz: 891b29051dacb1ca6e2fa801ae38f0800e8cdb7decc734590c3354bdb5d12dee
 SHA512:
-  metadata.gz: cdaa5c4f6250950ecbc674fd5d6ff03c72075b9e7b4c20dcb4f5a566ca5db3a7f8688e8c13d146e83a232349ddeefb05a2251cbe2603efe8013f35b8bebda885
-  data.tar.gz: 1c8ea277b331ae9f581cff8056da211b0ed8cb8c72421cd0d12043f096186702b802b661b4fc33228727c6b77a640c2f5686ba6a433295733c8c3b28d92b11a9
+  metadata.gz: 98a116297f7f1d4f4384042f43d0fc90b07e85ea4546a799391271dc2c2b2b0602a4e400754f795ee1c499c027b0861de3d713fea2dc132d1d8a88d6bab2f9ab
+  data.tar.gz: 51bd11e393b922ae49113fa6784fd24aeb31a592f093ba95b4de0e5a02973a004030233302ff401d58d01fbef411aa4c87ac98dd1a6e219c6219d61727c0181e

data/lib/choria/colt/cli.rb

@@ -31,7 +31,10 @@ module Choria
           targets = nil if options['targets'] == 'all'
 
           results = colt.run_bolt_task task_name, input: input, targets: targets
-          $stdout.puts JSON.pretty_generate(results)
+
+          File.write 'last_run.json', JSON.pretty_generate(results)
+
+          show_results(results)
         rescue Choria::Orchestrator::Error => e
           raise Thor::Error, "#{e.class}: #{e}"
         end
@@ -54,13 +57,12 @@ module Choria
           environment = options['environment']
           cache_directory = File.expand_path('.cache/colt/tasks')
           FileUtils.mkdir_p cache_directory
-          # TODO: Support multiple infrastructure
           cache = Cache.new(path: File.join(cache_directory, "#{environment}.yaml"))
 
           tasks = colt.tasks(environment: environment, cache: cache)
 
-          if tasks_names.nil?
-            show_tasks_summary
+          if tasks_names.empty?
+            show_tasks_summary(tasks)
           else
             tasks_names.each { |task_name| show_task_details(task_name, tasks) }
           end
@@ -96,9 +98,28 @@ module Choria
               Task: '#{task_name}'
                 #{metadata['metadata']['description']}
 
-                #{metadata}
+              Parameters:
+              #{JSON.pretty_generate(metadata['metadata']['parameters']).gsub(/^/, '  ')}
             OUTPUT
           end
+
+          def show_results(results)
+            results.each { |result| show_result(result) }
+          end
+
+          def show_result(result)
+            return show_generic_output(result) unless result.dig(:result, '_output').nil? || (result.dig(:result, 'exit_code') != 0)
+
+            $stdout.puts JSON.pretty_generate(result)
+          end
+
+          def show_generic_output(result)
+            target = result[:sender]
+
+            output = result.dig(:result, '_output')
+            $stdout.puts "'#{target}':"
+            output.split("\n").each { |line| $stdout.puts("  #{line}") }
+          end
         end
       end
 

data/lib/choria/colt/version.rb

@@ -2,6 +2,6 @@
 
 module Choria
   class Colt
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: choria-colt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Romuald Conty