opswalrus 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee2d0af10d38f7722a8af82b44af64f3c0d906de21b4425d472d4e27b9495b0
-  data.tar.gz: e42c56ffcdf0c1cf1b08e68771dcf46364439c057393ed325b5325964816d1a8
+  metadata.gz: f6d990ac1fac1a918ebca3eac342377ee61702f0864e635e378ad8e69d7ec0d5
+  data.tar.gz: 900661d04774a42b0a960624fd7fc51b9690c23ad15fba5aaf94f8a3e1241de6
 SHA512:
-  metadata.gz: 39a22eed3d76788bb6d70ad4f4700d512a4e9612614508e407ee9d0187bd2f0aab3593845f5f6a8adb91020d330bd7d955bbe21c869c3aa7e6c1185af4204b6a
-  data.tar.gz: 63e635e997cead804423e1c966e7e429538e625532277b98178c19186345455b469222d5eabd4b7829998690753ba8d95d09788248b167e706d3512d05ece6de
+  metadata.gz: 88e94b27da26afb8b925f1b363c6ccf889f3e105d28e3f7d2ccfd1d2d8fe1b61d443d64dc1829c42b8644216e19bad1c4e384757246414b62dc18104421cb8fe
+  data.tar.gz: 3e5b2b2062a592102bed054b7bae779a66b676ca8d47beb42cbab0a6cc6096e191129b3fd9a2c6fc815f8964bf78270b15687cbba99787c0323fb51c87e82c9c

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.14)
+    opswalrus (1.0.16)
+      amazing_print (~> 1.5)
       bcrypt_pbkdf (~> 1.1)
       citrus (~> 3.0)
       ed25519 (~> 1.3)
       git (~> 1.18)
       gli (~> 2.21)
+      ougai (~> 2.0)
       rubyzip (~> 2.3)
       sshkit (~> 1.21)
 
@@ -15,6 +17,7 @@ GEM
   specs:
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
+    amazing_print (1.5.0)
     bcrypt_pbkdf (1.1.0)
     citrus (3.0.2)
     diff-lcs (1.5.0)
@@ -26,6 +29,9 @@ GEM
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.2.0)
+    oj (3.16.0)
+    ougai (2.0.0)
+      oj (~> 3.10)
     public_suffix (5.0.3)
     rake (13.0.6)
     rchardet (1.8.0)

data/lib/opswalrus/app.rb

@@ -1,8 +1,9 @@
 require "citrus"
 require "io/console"
 require "json"
-require "logger"
+# require "logger"
 require "random/formatter"
+require "ougai"
 require "shellwords"
 require "socket"
 require "stringio"
@@ -31,7 +32,9 @@ module OpsWalrus
     attr_reader :local_hostname
 
     def initialize(pwd = Dir.pwd)
-      @logger = Logger.new($stdout, level: Logger::INFO)
+      @logger = Ougai::Logger.new($stdout, level: Logger::INFO)    # Logger.new($stdout, level: Logger::INFO)
+      @logger.formatter = Ougai::Formatters::Readable.new
+
 
       @verbose = false
       @sudo_user = nil
@@ -117,6 +120,10 @@ module OpsWalrus
       @logger.debug(msg)
     end
 
+    def trace(msg)
+      @logger.trace(msg)
+    end
+
     def set_pwd(pwd)
       @pwd = pwd.to_pathname
       @bundler = Bundler.new(@pwd)

data/lib/opswalrus/host.rb

@@ -6,94 +6,8 @@ require_relative "invocation"
 
 module OpsWalrus
 
-  class HostProxyOpsFileInvocationBuilder
-    def initialize(host_proxy, is_invocation_a_call_to_package_in_bundle_dir = false)
-      @host_proxy = host_proxy
-      @is_invocation_a_call_to_package_in_bundle_dir = is_invocation_a_call_to_package_in_bundle_dir
-      @method_chain = []
-    end
-
-    def method_missing(method_name, *args, **kwargs)
-      @method_chain << method_name.to_s
-
-      if args.empty? && kwargs.empty?   # when there are no args and no kwargs, we are just drilling down through another namespace
-        self
-      else
-        # when there are args or kwargs, then the method invocation represents an attempt to run an OpsFile on a remote host,
-        # 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
-
-        remote_run_command_args = @method_chain.join(" ")
-
-        unless args.empty?
-          remote_run_command_args << " "
-          remote_run_command_args << args.join(" ")
-        end
-
-        unless kwargs.empty?
-          remote_run_command_args << " "
-          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, "--script", remote_run_command_args)
-      end
-    end
-  end
-
   # the subclasses of HostProxy will define methods that handle method dispatch via HostProxyOpsFileInvocationBuilder objects
   class HostProxy
-    # def self.define_host_proxy_class(ops_file)
-    #   klass = Class.new(HostProxy)
-
-    #   methods_defined = Set.new
-
-    #   # define methods for every import in the script
-    #   ops_file.local_symbol_table.each do |symbol_name, import_reference|
-    #     unless methods_defined.include? symbol_name
-    #       # puts "1. defining: #{symbol_name}(...)"
-    #       klass.define_method(symbol_name) do |*args, **kwargs, &block|
-    #         invocation_builder = case import_reference
-    #         # we know we're dealing with a package dependency reference, so we want to run an ops file contained within the bundle directory,
-    #         # therefore, we want to reference the specified ops file with respect to the bundle dir
-    #         when PackageDependencyReference
-    #           HostProxyOpsFileInvocationBuilder.new(self, true)
-
-    #         # we know we're dealing with a directory reference or OpsFile reference outside of the bundle dir, so we want to reference
-    #         # the specified ops file with respect to the root directory, and not with respect to the bundle dir
-    #         when DirectoryReference, OpsFileReference
-    #           HostProxyOpsFileInvocationBuilder.new(self, false)
-    #         end
-
-    #         invocation_builder.send(symbol_name, *args, **kwargs, &block)
-    #       end
-    #       methods_defined << symbol_name
-    #     end
-    #   end
-
-    #   # define methods for every Namespace or OpsFile within the namespace that the OpsFile resides within
-    #   sibling_symbol_table = Set.new
-    #   sibling_symbol_table |= ops_file.dirname.glob("*.ops").map {|ops_file_path| ops_file_path.basename(".ops").to_s }   # OpsFiles
-    #   sibling_symbol_table |= ops_file.dirname.glob("*").select(&:directory?).map {|dir_path| dir_path.basename.to_s }    # Namespaces
-    #   sibling_symbol_table.each do |symbol_name|
-    #     unless methods_defined.include? symbol_name
-    #       # puts "2. defining: #{symbol_name}(...)"
-    #       klass.define_method(symbol_name) do |*args, **kwargs, &block|
-    #         invocation_builder = HostProxyOpsFileInvocationBuilder.new(self, false)
-    #         invocation_builder.invoke(symbol_name, *args, **kwargs, &block)
-    #       end
-    #       methods_defined << symbol_name
-    #     end
-    #   end
-
-    #   klass
-    # end
 
     def self.define_host_proxy_class(ops_file)
       klass = Class.new(HostProxy)
@@ -122,21 +36,6 @@ module OpsWalrus
 
             invocation_context._invoke(*args, **kwargs)
 
-
-
-            # invocation_builder = case import_reference
-            # # we know we're dealing with a package dependency reference, so we want to run an ops file contained within the bundle directory,
-            # # therefore, we want to reference the specified ops file with respect to the bundle dir
-            # when PackageDependencyReference
-            #   HostProxyOpsFileInvocationBuilder.new(self, true)
-
-            # # we know we're dealing with a directory reference or OpsFile reference outside of the bundle dir, so we want to reference
-            # # the specified ops file with respect to the root directory, and not with respect to the bundle dir
-            # when DirectoryReference, OpsFileReference
-            #   HostProxyOpsFileInvocationBuilder.new(self, false)
-            # end
-
-            # invocation_builder.send(symbol_name, *args, **kwargs, &block)
           end
           methods_defined << symbol_name
         end
@@ -150,9 +49,6 @@ module OpsWalrus
         unless methods_defined.include? symbol_name
           # puts "2. defining: #{symbol_name}(...)"
           klass.define_method(symbol_name) do |*args, **kwargs, &block|
-            # invocation_builder = HostProxyOpsFileInvocationBuilder.new(self, false)
-            # invocation_builder.invoke(symbol_name, *args, **kwargs, &block)
-
             invocation_context = RemoteImportInvocationContext.new(@runtime_env, self, namespace_or_ops_file, false)
             invocation_context._invoke(*args, **kwargs)
           end
@@ -202,6 +98,7 @@ module OpsWalrus
       return ["", "", 0] if !desc_or_cmd && !cmd && !block    # we were told to do nothing; like hitting enter at the bash prompt; we can do nothing successfully
 
       description = desc_or_cmd if cmd || block
+      description = WalrusLang.render(description, block.binding) if description && block
       cmd = block.call if block
       cmd ||= desc_or_cmd
 

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -264,6 +264,7 @@ module OpsWalrus
       return ["", "", 0] if !desc_or_cmd && !cmd && !block    # we were told to do nothing; like hitting enter at the bash prompt; we can do nothing successfully
 
       description = desc_or_cmd if cmd || block
+      description = WalrusLang.render(description, block.binding) if description && block
       cmd = block.call if block
       cmd ||= desc_or_cmd
 

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.14"
+  VERSION = "1.0.16"
 end

data/opswalrus.gemspec

@@ -32,9 +32,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # gem dependencies
+  spec.add_dependency "amazing_print", "~> 1.5"
   spec.add_dependency "citrus", "~> 3.0"
   spec.add_dependency "gli", "~> 2.21"
   spec.add_dependency "git", "~> 1.18"
+  spec.add_dependency "ougai", "~> 2.0"
   spec.add_dependency "rubyzip", "~> 2.3"
 
   spec.add_dependency "bcrypt_pbkdf", "~> 1.1"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: amazing_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: citrus
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: ougai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement