opswalrus 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf572dd5c13457782bb8256a38f4572ba897a7bb37ab4da0220fd3a69866b8ad
-  data.tar.gz: 6ebc7681b98c3bc745b310eee40f866b8d6d328c37b50552b409ca1362b07889
+  metadata.gz: fa4d06b1bc87888397e4509eda913a1a5ad0cf4f069762852282de9c1cd7c6a0
+  data.tar.gz: 605d4b7e09d3fe47b2fa5106d5cd27e8255ba5265dff1bcfe8fbda3fb380195d
 SHA512:
-  metadata.gz: 2be383a35f09b51d6e42be8280eaf3760d8735aea0b747406e9258b237dc38b55594a56000a88d2a1c398ae7de56d1391903eed0d1c542850f9bd4f167348c9c
-  data.tar.gz: 71f1f58d4dda0533fdbd8fd35612daae8f2ad8390ae215d2d437432b6ab801c9ed87f614eb54c018db3ccbe72806625f38471d16b7edbff72ddfed376530437b
+  metadata.gz: cce83e3128b0d19d7ccec3d0fe85411d19959229fc8cd3ad9fdf47b40c739e598f3dd2020078492361df9d309b15e0c82824901ff2511b434adea09c9484d246
+  data.tar.gz: 7bc58a62f322c543e2aa57b5a75611d4984c3b72454c4ac52fbd91bfa074efde217fa8355bfc38718d13b0ac839fbe13c8c567307e0c1516e3067cea351f4594

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.1)
+    opswalrus (1.0.3)
       bcrypt_pbkdf
       citrus
       ed25519

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

@@ -15,10 +15,10 @@ module OpsWalrus
 
     # this is invoked on an unhandled exception or a call to exit_now!
     on_error do |exception|
-      puts "*" * 80
-      puts "catchall exception handler:"
-      puts exception.message
-      puts exception.backtrace.join("\n")
+      # puts "*" * 80
+      # puts "catchall exception handler:"
+      # puts exception.message
+      # puts exception.backtrace.join("\n")
       false   # disable built-in exception handling
     end
 
@@ -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"
@@ -132,6 +137,7 @@ module OpsWalrus
 
       c.default_command :status
     end
+
   end
 end
 

data/lib/opswalrus/host.rb

@@ -54,13 +54,17 @@ module OpsWalrus
     # end
 
     # runs the specified ops command with the specified command arguments
-    def run_ops(command, command_arguments, in_bundle_root_dir: true)
-      if in_bundle_root_dir
-        # e.g. /home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops bundle unzip tmpops.zip
-        shell!("/home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops #{command} #{@tmp_bundle_root_dir} #{command_arguments}")
-      else
-        shell!("/home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops #{command} #{command_arguments}")
-      end
+    def run_ops(command, command_arguments, in_bundle_root_dir: true, verbose: false)
+      # e.g. /home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops bundle unzip tmpops.zip
+      # e.g. /home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops run echo.ops args:foo args:bar
+
+      cmd = "/home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops"
+      cmd << " -v" if verbose
+      cmd << " #{command.to_s}"
+      cmd << " #{@tmp_bundle_root_dir}" if in_bundle_root_dir
+      cmd << " #{command_arguments}" unless command_arguments.empty?
+
+      shell!(cmd)
     end
 
   end
@@ -82,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.rb

@@ -27,6 +27,10 @@ module OpsWalrus
       @yaml || (load_file && @yaml)
     end
 
+    def script_line_offset
+      @script_line_offset || (load_file && @script_line_offset)
+    end
+
     def script
       @script || (load_file && @script)
     end
@@ -35,6 +39,7 @@ module OpsWalrus
       yaml, ruby_script = if @ops_file_path.exist?
         parse(File.read(@ops_file_path))
       end || ["", ""]
+      @script_line_offset = yaml.lines.size + 1   # +1 to account for the ... line
       @yaml = YAML.load(yaml) || {}     # post_invariant: @yaml is a Hash
       @script = OpsFileScript.new(self, ruby_script)
     end

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
@@ -475,7 +477,7 @@ module OpsWalrus
 
     def evaluate
       # catch(:exit_now) do
-        eval(@ops_file_script.script)
+        eval(@ops_file_script.script, nil, @ops_file_script.ops_file.ops_file_path.to_s, @ops_file_script.ops_file.script_line_offset)
       # end
     end
 

data/lib/opswalrus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus