opswalrus 1.0.37 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab53631e63fd44c1825e7a38721905420b063e4480ace3cb48c9d5aad922dc14
-  data.tar.gz: aecd03aadaab772dfae1e8379036038ed17e0c57b78c75c178f70c4b3a65afeb
+  metadata.gz: 413ca26075395f1e533a83af05aae8522f66fb91b96de13d8932f5856053222d
+  data.tar.gz: cf99aa4a8e71dba2a36129ed3ca2cb51b603d106fd240a0d1d39784e53e6806c
 SHA512:
-  metadata.gz: af2a6bc851e53a1bee7e2b1d9d7dd57f2f953661223d464f57c7e7e8157b4ab725c9db90cc835380c12c6a9f5438a515e435cf4009e753492c6304e7a3b2a750
-  data.tar.gz: 15fbd461e6c794325bee7def61a517b91c840318348b83e83639c175d3efb5f1a5cbd424b6a8634bfdc20c2b2805af383aee3ce1d7870a1dd222e843ef9ed509
+  metadata.gz: 5ba6764a3018cc959a075b9616d14116ae28c565a53f557864fb6d9ce1b922d75439e79b1563fedd7a4a5cd2a17277243ee8b1d47d5f82c30f6898d08b4088bc
+  data.tar.gz: f8985876bbc10366839f871818a50d4578728d63f5234ec13479a54801b5771fc8f5e7f9a5c3328c58a508997cd5e12b581b45de1aae759e1a6a71dedeb33118

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.37)
+    opswalrus (1.0.39)
       amazing_print (~> 1.5)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/host.rb

@@ -224,7 +224,15 @@ module OpsWalrus
     end
 
     def desc(msg)
-      puts msg.mustache(2)
+      puts msg.mustache(2)    # we use two here, because one stack frame accounts for the call from the ops script into HostProxy#desc
+    end
+
+    def env(*args, **kwargs)
+      @ops_file_script.env(*args, **kwargs)
+    end
+
+    def params(*args, **kwargs)
+      @ops_file_script.params(*args, **kwargs)
     end
 
     def host_prop(name)
@@ -360,6 +368,10 @@ module OpsWalrus
       @runtime_env = runtime_env
     end
 
+    def set_ops_file_script(ops_file_script)
+      @ops_file_script = ops_file_script
+    end
+
     def set_ssh_session_connection(sshkit_backend)
       @sshkit_backend = sshkit_backend
     end
@@ -370,6 +382,7 @@ module OpsWalrus
 
     def clear_ssh_session
       @runtime_env = nil
+      ops_file_script = nil
       @sshkit_backend = nil
       @tmp_bundle_root_dir = nil
       @tmp_ssh_key_files.each {|tmpfile| tmpfile.close() rescue nil; File.unlink(tmpfile) rescue nil }

data/lib/opswalrus/ops_file_script.rb

@@ -141,12 +141,11 @@ module OpsWalrus
         def _invoke(runtime_env, hashlike_params)
           @runtime_env = runtime_env
           @params = InvocationParams.new(hashlike_params)
-          params = @params
           #{ruby_script}
         end
       INVOKE_METHOD
 
-      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 4
+      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 3
       klass.module_eval(invoke_method_definition, ops_file.ops_file_path.to_s, ops_file.script_line_offset - invoke_method_line_count_prior_to_ruby_script_from_ops_file)
 
       klass
@@ -161,6 +160,7 @@ module OpsWalrus
       @ops_file = ops_file
       @script = ruby_script
       @runtime_env = nil    # this is set at the very first line of #_invoke
+      @params = nil         # this is set at the very first line of #_invoke
     end
 
     def backend
@@ -184,6 +184,15 @@ module OpsWalrus
       raise "Not implemented in base class."
     end
 
+    def params(*keys, default: nil)
+      keys = keys.map(&:to_s)
+      if keys.empty?
+        @params
+      else
+        @params.dig(*keys) || default
+      end
+    end
+
     def to_s
       @script
     end

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -107,7 +107,7 @@ module OpsWalrus
       hosts = inventory(*args, **kwargs).map {|host| host_proxy_class.new(runtime_env, host) }
       sshkit_hosts = hosts.map(&:sshkit_host)
       sshkit_host_to_ops_host_map = sshkit_hosts.zip(hosts).to_h
-      local_host = self
+      ops_file_script = local_host = self
       # bootstrap_shell_script = BootstrapLinuxHostShellScript
       # on sshkit_hosts do |sshkit_host|
       SSHKit::Coordinator.new(sshkit_hosts).each(in: kwargs[:in] || :parallel) do |sshkit_host|
@@ -116,6 +116,7 @@ module OpsWalrus
 
         begin
           host.set_runtime_env(runtime_env)
+          host.set_ops_file_script(ops_file_script)
           host.set_ssh_session_connection(self)  # self is an instance of one of the subclasses of SSHKit::Backend::Abstract, e.g. SSHKit::Backend::Netssh
 
           host._bootstrap_host
@@ -162,7 +163,7 @@ module OpsWalrus
 
     def exit(exit_status, message = nil)
       if message
-        puts message.mustache(3)
+        puts message.mustache(1)
       end
       result = if exit_status == 0
         Invocation::Success.new(nil)
@@ -172,15 +173,6 @@ module OpsWalrus
       throw :exit_now, result
     end
 
-    def env(*keys)
-      keys = keys.map(&:to_s)
-      if keys.empty?
-        @runtime_env.env
-      else
-        @runtime_env.env.dig(*keys)
-      end
-    end
-
     # currently, import may only be used to import a package that is referenced in the script's package file
     # I may decide to extend this to work with dynamic package references
     #
@@ -198,17 +190,17 @@ module OpsWalrus
       # invocation_context._invoke(*args, **kwargs)
     end
 
-    # def params(*keys, default: nil)
-    #   keys = keys.map(&:to_s)
-    #   if keys.empty?
-    #     @params
-    #   else
-    #     @params.dig(*keys) || default
-    #   end
-    # end
-
     def desc(msg)
-      puts msg.mustache(2)
+      puts msg.mustache(1)
+    end
+
+    def env(*keys)
+      keys = keys.map(&:to_s)
+      if keys.empty?
+        @runtime_env.env
+      else
+        @runtime_env.env.dig(*keys)
+      end
     end
 
     # runs the given command

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.37"
+  VERSION = "1.0.39"
 end

data/lib/opswalrus/walrus_lang.rb

@@ -74,8 +74,10 @@ class String
     WalrusLang.render(self, hash)
   end
 
-  def mustache(bindings_from_stack_frame_offset = 2)
-    WalrusLang.eval(self, bindings_from_stack_frame_offset)
+  # bindings_from_stack_frame_offset is a count relative to the stack from from which #mustache is called
+  def mustache(bindings_from_stack_frame_offset = 0)
+    base_offset = 2
+    WalrusLang.eval(self, base_offset + bindings_from_stack_frame_offset)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.39
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print