opswalrus 1.0.33 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030db97da3b6d068117676d69923976f0813583cb95a8e5a7e7d9eb500992a33
-  data.tar.gz: dd14df25bd90ac123ad064d10ed3d32a18079766d74e97344c9c0998263a3669
+  metadata.gz: afddda8670c4bf29ab120d6f80d89f13d6eaa1764f4068fa8fd9cd33b4e6a4a9
+  data.tar.gz: eeac298ab64e7f77e5e589288fe4a69397d7a321ef3887ac378f25aa3060ffee
 SHA512:
-  metadata.gz: fa3ca11fec12097b0deb614829f4e5919c9e64b8ccf8602d0f4faa3969105cc1768129d839120a81a88dff1242e4106951d059782f500bef1a59689ea90a5d0d
-  data.tar.gz: b93688cb0fdd43b19581b5bae68e113aea68e67e6ccfd62704d05d868a250fb6224b36d39aeda2c06a467d6a1900967f2c7c4b095fa6a40b01a1c52d10017955
+  metadata.gz: f904e63bcef6b3eb970bb3ef162186268f6e95371655cab071dcb8a7c0a1c655c1f7ade92be63fe387b676d4af80e2de985909ce7a8a1e6f0a032475041eb4f4
+  data.tar.gz: c2d9efb14e0d063d5861e7cafa2a3a44fbeed4ca07a8e748928bfdf16cdf46dda9aabb08f3f5e259e6fbfc5a5d11ffa2254da58140fbfb40e2146214c8df27ec

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.33)
+    opswalrus (1.0.35)
       amazing_print (~> 1.5)
       bcrypt_pbkdf (~> 1.1)
+      binding_of_caller (~> 1.0)
       citrus (~> 3.0)
       ed25519 (~> 1.3)
       git (~> 1.18)
@@ -21,8 +22,11 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     amazing_print (1.5.0)
     bcrypt_pbkdf (1.1.0)
+    binding_of_caller (1.0.0)
+      debug_inspector (>= 0.0.1)
     citrus (3.0.2)
     concurrent-ruby (1.2.2)
+    debug_inspector (1.1.0)
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
     git (1.18.0)

data/README.md

@@ -22,7 +22,7 @@ You have two options:
 The path to whatever directory you store your age identity files in should be used in place of `$HOME/.secrets/age` in the following shell alias:
 
 ```shell
-❯ alias ops='docker run --rm -it -v $HOME/.secrets/age:/root/.secrets -e OPSWALRUS_AGE_IDS="/root/.secrets/*" -v $HOME/.ssh:/root/.ssh -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workdir ghcr.io/opswalrus/ops'
+❯ alias ops='docker run --rm -it -v $HOME/.secrets/age:/root/.secrets -e OPSWALRUS_AGE_IDS="/root/.secrets/*.priv" -v $HOME/.ssh:/root/.ssh -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workdir ghcr.io/opswalrus/ops'
 
 ❯ ops version
 1.0.13

data/lib/opswalrus/bundler.rb

@@ -116,6 +116,8 @@ module OpsWalrus
 
       destination_package_path = @bundle_dir.join(package_reference.import_resolution_dirname)
 
+      App.instance.log("Downloading #{package_reference} referenced in #{package_file.package_file_path} to #{destination_package_path}")
+
       # we return early here under the assumption that an already downloaded package/version combo will not
       # differ if we download it again multiple times to the same location
       if destination_package_path.exist?

data/lib/opswalrus/cli.rb

@@ -72,7 +72,7 @@ module OpsWalrus
 
       desc 'Edit hosts in inventory'
       long_desc 'Edit the hosts in the inventory and their secrets'
-      # arg_name 'hosts_file', :optional
+      # arg 'hosts_file', :optional
       c.command :edit do |edit|
         edit.action do |global_options, options, args|
           file_path = global_options[:hosts].first || HostsFile::DEFAULT_FILE_NAME
@@ -87,7 +87,7 @@ module OpsWalrus
 
       desc 'Encrypt secrets in inventory file'
       long_desc 'Encrypt secrets in inventory file'
-      arg_name 'encrypted_host_file_path', :optional
+      arg 'encrypted_host_file_path', :optional
       c.command :encrypt do |encrypt|
         encrypt.action do |global_options, options, args|
           file_path = global_options[:hosts].first || HostsFile::DEFAULT_FILE_NAME
@@ -104,7 +104,7 @@ module OpsWalrus
 
       desc 'Decrypt secrets in inventory file'
       long_desc 'Decrypt secrets in inventory file'
-      arg_name 'decrypted_host_file_path', :optional
+      arg 'decrypted_host_file_path', :optional
       c.command :decrypt do |decrypt|
         decrypt.action do |global_options, options, args|
           file_path = global_options[:hosts].first || HostsFile::DEFAULT_FILE_NAME
@@ -154,7 +154,7 @@ module OpsWalrus
 
     desc 'Run an operation from a package'
     long_desc 'Run the specified operation found within the specified package'
-    arg_name 'args', :multiple
+    arg 'args', :multiple
     command :run do |c|
       c.flag [:u, :user], desc: "Specify the user that the operation will run as"
       c.switch :pass, desc: "Prompt for a sudo password"

data/lib/opswalrus/host.rb

@@ -124,12 +124,20 @@ module OpsWalrus
 
 
   module HostDSL
+    # runs the given command
     # returns the stdout from the command
     def sh(desc_or_cmd = nil, cmd = nil, input: nil, &block)
       out, err, status = *shell!(desc_or_cmd, cmd, block, input: input)
       out
     end
 
+    # runs the given command
+    # returns true if the exit status was success; false otherwise
+    def sh?(desc_or_cmd = nil, cmd = nil, input: nil, &block)
+      out, err, status = *shell!(desc_or_cmd, cmd, block, input: input)
+      status == 0
+    end
+
     # returns the tuple: [stdout, stderr, exit_status]
     def shell(desc_or_cmd = nil, cmd = nil, input: nil, &block)
       shell!(desc_or_cmd, cmd, block, input: input)
@@ -146,7 +154,19 @@ module OpsWalrus
       cmd = block.call if block
       cmd ||= desc_or_cmd
 
-      cmd = WalrusLang.render(cmd, block.binding) if block && cmd =~ /{{.*}}/
+      cmd = if cmd =~ /{{.*}}/
+        if block
+          WalrusLang.render(cmd, block.binding)
+        else
+          offset = 3    # 3, because 1 references the stack frame corresponding to the caller of WalrusLang.eval,
+                        # 2 references the stack frame corresponding to the caller of shell!,
+                        # and 3 references the stack frame corresponding to teh caller of either sh/sh?/shell
+          WalrusLang.eval(cmd, offset)
+        end
+      else
+        cmd
+      end
+      # cmd = WalrusLang.render(cmd, block.binding) if block && cmd =~ /{{.*}}/
 
       #cmd = Shellwords.escape(cmd)
 
@@ -203,6 +223,14 @@ module OpsWalrus
       shell!(cmd)
     end
 
+    def desc(msg)
+      puts msg.mustache
+    end
+
+    def host_prop(name)
+      @props[name]
+    end
+
   end
 
   class Host

data/lib/opswalrus/operation_runner.rb

@@ -37,22 +37,47 @@ module OpsWalrus
         key, value = str_value.split(":", 2)
         if pre_existing_value = memo[param_name]
           memo[param_name] = if value    # we're dealing with a Hash parameter value
-                               pre_existing_value.merge(key => value)
+                               pre_existing_value.merge(key => try_convert(value))
                              else        # we're dealing with an Array parameter value or a scalar parameter value
                                array = pre_existing_value.is_a?(Array) ? pre_existing_value : [pre_existing_value]
-                               array << str_value
+                               array << try_convert(str_value)
                              end
         else
           memo[param_name] = if value    # we're dealing with a Hash parameter value
-                               {key => value}
+                               {key => try_convert(value)}
                              else        # we're dealing with an Array parameter value or a scalar parameter value
-                               str_value
+                               try_convert(str_value)
                              end
         end
         memo
       end
     end
 
+    def try_convert(value)
+      case value.downcase
+      when 'true'
+        true
+      when 'false'
+        false
+      when /^[0-9]+$/
+        value.to_i
+      when /^[0-9]+\.[0-9]+$/
+        value.to_f
+      else
+        value
+      end
+    end
+
+    # def try_convert(value)
+    #   if value.is_a? String
+    #     JSON.parse(value)
+    #   else
+    #     value
+    #   end
+    # rescue JSON::ParserError => e
+    #   value
+    # end
+
     # runtime_kv_args is an Array(String) of the form: ["arg1:val1", "arg1:val2", ...]
     # params_json_hash is a Hash representation of a JSON string
     def run(runtime_kv_args, params_json_hash: nil)

data/lib/opswalrus/ops_file_script.rb

@@ -55,9 +55,9 @@ module OpsWalrus
       @params[key]
     end
 
-    def dig(*keys)
+    def dig(*keys, default: nil)
       # keys = keys.map {|key| key.is_a?(Integer) ? key : key.to_s }
-      @params.dig(*keys)
+      @params.dig(*keys) || default
     end
 
     def method_missing(name, *args, **kwargs, &block)
@@ -141,6 +141,7 @@ module OpsWalrus
         def _invoke(runtime_env, hashlike_params)
           @runtime_env = runtime_env
           @params = InvocationParams.new(hashlike_params)
+          params = @params
           #{ruby_script}
         end
       INVOKE_METHOD

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -162,7 +162,7 @@ module OpsWalrus
 
     def exit(exit_status, message = nil)
       if message
-        puts message
+        puts message.mustache(3)
       end
       result = if exit_status == 0
         Invocation::Success.new(nil)
@@ -198,21 +198,33 @@ 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
+    # 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
     end
 
+    # runs the given command
     # returns the stdout from the command
     def sh(desc_or_cmd = nil, cmd = nil, input: nil, &block)
       out, err, status = *shell!(desc_or_cmd, cmd, block, input: input)
       out
     end
 
+    # runs the given command
+    # returns true if the exit status was success; false otherwise
+    def sh?(desc_or_cmd = nil, cmd = nil, input: nil, &block)
+      out, err, status = *shell!(desc_or_cmd, cmd, block, input: input)
+      status == 0
+    end
+
     # returns the tuple: [stdout, stderr, exit_status]
     def shell(desc_or_cmd = nil, cmd = nil, input: nil, &block)
       shell!(desc_or_cmd, cmd, block, input: input)
@@ -229,7 +241,20 @@ module OpsWalrus
       cmd = block.call if block
       cmd ||= desc_or_cmd
 
-      cmd = WalrusLang.render(cmd, block.binding) if block && cmd =~ /{{.*}}/
+      cmd = if cmd =~ /{{.*}}/
+        if block
+          WalrusLang.render(cmd, block.binding)
+        else
+          offset = 3    # 3, because 1 references the stack frame corresponding to the caller of WalrusLang.eval,
+                        # 2 references the stack frame corresponding to the caller of shell!,
+                        # and 3 references the stack frame corresponding to teh caller of either sh/sh?/shell
+          WalrusLang.eval(cmd, offset)
+        end
+      else
+        cmd
+      end
+      # cmd = WalrusLang.eval(cmd) if !block && cmd =~ /{{.*}}/
+      # cmd = WalrusLang.render(cmd, block.binding) if block && cmd =~ /{{.*}}/
 
       #cmd = Shellwords.escape(cmd)
 

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.33"
+  VERSION = "1.0.35"
 end

data/lib/opswalrus/walrus_lang.rb

@@ -1,3 +1,4 @@
+require "binding_of_caller"
 require "citrus"
 require "ostruct"
 require "stringio"
@@ -61,12 +62,21 @@ module WalrusLang
     ast = WalrusLang::Parser.parse(template)
     ast.render(binding_obj)
   end
+
+  def self.eval(template_string, bindings_from_stack_frame_offset = 1)
+    binding_from_earlier_stack_frame = binding.of_caller(bindings_from_stack_frame_offset)
+    template_string =~ /{{.*}}/ ? WalrusLang.render(template_string, binding_from_earlier_stack_frame) : template_string
+  end
 end
 
 class String
   def render_template(hash)
     WalrusLang.render(self, hash)
   end
+
+  def mustache(bindings_from_stack_frame_offset = 2)
+    WalrusLang.eval(self, bindings_from_stack_frame_offset)
+  end
 end
 
 class Hash
@@ -81,11 +91,6 @@ class Binding
   end
 end
 
-def mustache(&block)
-  template_string = block.call
-  template_string =~ /{{.*}}/ ? WalrusLang.render(template_string, block.binding) : template_string
-end
-
 
 # foo = 1
 # bar = 2
@@ -95,4 +100,11 @@ end
 # # puts m.dump
 # puts m.render(binding)
 
-# puts(mustache { "abc {{ 1 + 2 }} def" })
+# puts("abc {{ 1 + 2 }} def".mustache)
+
+# irb(main):096:0> a=5
+# => 5
+# irb(main):097:0> b=8
+# => 8
+# irb(main):098:0> "abc {{ a + b }} def".mustache
+# => "abc 13 def"

data/opswalrus.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
 
   # gem dependencies
   spec.add_dependency "amazing_print", "~> 1.5"
+  spec.add_dependency "binding_of_caller", "~> 1.0"
   spec.add_dependency "citrus", "~> 3.0"
   spec.add_dependency "gli", "~> 2.21"
   spec.add_dependency "git", "~> 1.18"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.35
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement