opswalrus 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31832ac2c06fb96c6abac86dacccce0f4fa280d679f2f12573eb37044d49b93
-  data.tar.gz: dc69618f8f83b0845f5e93a8e4699bcade24e37a3ce24fcecc49a427f2b471ff
+  metadata.gz: fa4d06b1bc87888397e4509eda913a1a5ad0cf4f069762852282de9c1cd7c6a0
+  data.tar.gz: 605d4b7e09d3fe47b2fa5106d5cd27e8255ba5265dff1bcfe8fbda3fb380195d
 SHA512:
-  metadata.gz: c107c7165daa8536b4831c7f84d34c662dcc86cad1da29334412460e2995adad5bb076f14ae48b90578e2c349ea55411e4f2794371d417e714bffb093dca4f3b
-  data.tar.gz: d6e0983ef2d59ed545370dd670753436026244b0cc5c84dadb3745b188931839f5edd57425f65fa4a607324b4d1e17bd4e0431bb5bb2cbb825e8a95e1f9eca6c
+  metadata.gz: cce83e3128b0d19d7ccec3d0fe85411d19959229fc8cd3ad9fdf47b40c739e598f3dd2020078492361df9d309b15e0c82824901ff2511b434adea09c9484d246
+  data.tar.gz: 7bc58a62f322c543e2aa57b5a75611d4984c3b72454c4ac52fbd91bfa074efde217fa8355bfc38718d13b0ac839fbe13c8c567307e0c1516e3067cea351f4594

data/lib/opswalrus/app.rb

@@ -64,6 +64,14 @@ module OpsWalrus
       ""  # return empty string because we won't want anyone accidentally printing or inspecting @sudo_password
     end
 
+    def emit_json_output!
+      @emit_json_output = true
+    end
+
+    def emit_json_output?
+      @emit_json_output
+    end
+
     def set_local_hostname(hostname)
       hostname = hostname.strip
       @local_hostname = hostname.empty? ? "localhost" : hostname
@@ -186,6 +194,10 @@ module OpsWalrus
         puts JSON.pretty_generate(result.value)
       end
 
+      if emit_json_output?
+        puts JSON.pretty_generate(result.value)
+      end
+
       exit_status
     ensure
       FileUtils.remove_entry(tmp_dir) if tmp_dir

data/lib/opswalrus/cli.rb

@@ -53,6 +53,7 @@ module OpsWalrus
       c.flag [:u, :user], desc: "Specify the user that the operation will run as"
       c.switch :pass, desc: "Prompt for a sudo password"
       c.flag [:p, :params], desc: "JSON string that represents the input parameters for the operation. The JSON string must conform to the params schema for the operation."
+      c.switch :json, desc: "Emit JSON output"
 
       c.action do |global_options, options, args|
         hosts = global_options[:hosts] || []
@@ -80,6 +81,10 @@ module OpsWalrus
           $app.prompt_sudo_password
         end
 
+        if options[:json]
+          $app.emit_json_output!
+        end
+
         # puts "verbose"
         # puts verbose.inspect
         # puts "user"

data/lib/opswalrus/host.rb

@@ -86,19 +86,26 @@ module OpsWalrus
         # so we want to build up a command and send it to the remote host via HostDSL#run_ops
         @method_chain.unshift(Bundler::BUNDLE_DIR) if @is_invocation_a_call_to_package_in_bundle_dir
 
-        # path_to_ops_file_basename = @method_chain.join(File::Separator)
-        # remote_run_command_args << path_to_ops_file_basename
+        remote_run_command_args = "--json"
 
-        remote_run_command_args = @method_chain.join(" ")
+        remote_run_command_args << " "
+        remote_run_command_args << @method_chain.join(" ")
 
         unless args.empty?
           remote_run_command_args << " "
           remote_run_command_args << args.join(" ")
         end
 
-        unless kvargs.empty?
+        unless kwargs.empty?
           remote_run_command_args << " "
-          remote_run_command_args << kvargs.map{|k,v| "#{k}=#{v}" }.join(" ") unless kvargs.empty?
+          remote_run_command_args << kwargs.map do |k, v|
+            case v
+            when Array
+              v.map {|v_element| "#{k}:#{v_element}" }
+            else
+              "#{k}:#{v}"
+            end
+          end.join(" ")
         end
 
         @host_proxy.run_ops(:run, remote_run_command_args)

data/lib/opswalrus/ops_file_script.rb

@@ -148,9 +148,11 @@ module OpsWalrus
           # we run the block in the context of the host, s.t. `self` within the block evaluates to `host`
           retval = host.instance_exec(local_host, &block)    # host is passed as the argument to the block
 
+          puts retval.inspect
+
           # cleanup
-          if tmp_bundle_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
-            host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip", tmp_bundle_dir)
+          if tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
+            host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip", tmp_bundle_root_dir)
           else
             host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip")
           end

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - David Ellis