opswalrus 1.0.15 → 1.0.17

data/lib/opswalrus/runtime_environment.rb

@@ -90,7 +90,7 @@ module OpsWalrus
       str = "Namespace: #{@dirname.to_s}\n"
       @symbol_table.each do |k, v|
         if v.is_a? Namespace
-          str << "#{'  ' * (indent)}|- #{k} : #{v.to_s(indent + 1)}\n"
+          str << "#{'  ' * (indent)}|- #{k} : #{v.to_s(indent + 1)}"
         else
           str << "#{'  ' * (indent)}|- #{k} : #{v.to_s}\n"
         end
@@ -106,31 +106,6 @@ module OpsWalrus
       @symbol_table[symbol_name.to_s]
     end
 
-    # # if this namespace contains an OpsFile of the same name as the namespace, e.g. pkg/install/install.ops, then this
-    # # method invokes the OpsFile of that same name and returns the result;
-    # # otherwise we return this namespace object
-    # def _invoke_if_namespace_has_ops_file_of_same_name(*args, **kwargs, &block)
-    #   resolved_symbol = resolve_symbol(@dirname.basename)
-    #   if resolved_symbol.is_a? OpsFile
-    #     params_hash = resolved_symbol.build_params_hash(*args, **kwargs)
-    #     resolved_symbol.invoke(runtime_env, params_hash)
-    #   else
-    #     self
-    #   end
-    # end
-
-    # def method_missing(name, *args, **kwargs, &block)
-    #   # puts "method_missing: #{name}"
-    #   # puts caller
-    #   resolved_symbol = resolve_symbol(name)
-    #   case resolved_symbol
-    #   when Namespace
-    #     resolved_symbol._invoke_if_namespace_has_ops_file_of_same_name(*args, **kwargs)
-    #   when OpsFile
-    #     params_hash = resolved_symbol.build_params_hash(*args, **kwargs)
-    #     resolved_symbol.invoke(runtime_env, params_hash)
-    #   end
-    # end
   end
 
   # the assumption is that we have a bundle directory with all the packages in it
@@ -147,16 +122,13 @@ module OpsWalrus
       @root_namespace = build_symbol_resolution_tree(@dir)
       @path_map = build_path_map(@root_namespace)
 
-      # puts "*" * 80
-      # puts "load path for #{@dir}"
-      # puts "-" * 80
-      # puts 'root namespace'
-      # puts @root_namespace.to_s
-      # puts "-" * 80
-      # puts 'path map'
-      # @path_map.each do |k,v|
-      #   puts "#{k.to_s}: #{v.to_s}"
-      # end
+      App.instance.trace "LoadPath for #{@dir} ************************************************************"
+      App.instance.trace 'root namespace ******************************************************************'
+      App.instance.trace @root_namespace.to_s
+      App.instance.trace 'path map ************************************************************************'
+      @path_map.each do |k,v|
+        App.instance.trace "#{k.to_s}: #{v.to_s}"
+      end
 
       @dynamic_package_additions_memo = {}
     end
@@ -268,9 +240,16 @@ module OpsWalrus
       @bundle_load_path = LoadPath.new(self, @app.bundle_dir)
       @app_load_path = LoadPath.new(self, @app.pwd)
 
-      @interaction_handler = ScopedMappingInteractionHandler.new({
-        /\[sudo\] password for .*?:\s*/ => "#{sudo_password}\n",
-      })
+      # we include this sudo password mapping by default because if a bundled script is being run on a remote host,
+      # then the remote command invocation will include the --pass flag when being run on the remote host, which will
+      # interactively prompt for a sudo password, and that will be the only opportunity for the command host
+      # that is running the bundled script on the remote host to interactively enter a sudo password for the remote context
+      # since the remote ops command will be running within a PTY, and the interactive prompts running on the remote
+      # host will be managed by the local ScopedMappingInteractionHandler running within the instance of the ops command
+      # process on the remote host, and the command host will not have any further opportunity to interactively enter
+      # any prompts on the remote host
+      interaction_handler_mapping_for_sudo_password = ScopedMappingInteractionHandler.mapping_for_sudo_password(sudo_password)
+      @interaction_handler = ScopedMappingInteractionHandler.new(interaction_handler_mapping_for_sudo_password)
 
       configure_sshkit
     end
@@ -291,6 +270,7 @@ module OpsWalrus
         # SSHKit.config.use_format :simpletext
         SSHKit.config.output_verbosity = :debug
       elsif app.verbose?
+        SSHKit.config.use_format :pretty
         # SSHKit.config.use_format :dot
         SSHKit.config.output_verbosity = :info
       end
@@ -344,8 +324,8 @@ module OpsWalrus
       end.run
     end
 
-    def invoke(ops_file, params_hash)
-      ops_file.invoke(self, params_hash)
+    def invoke(ops_file, hashlike_params)
+      ops_file.invoke(self, hashlike_params)
     end
 
     def find_load_path_that_includes_path(path)

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.15"
+  VERSION = "1.0.17"
 end

data/lib/opswalrus.rb

@@ -6,5 +6,5 @@ require_relative 'opswalrus/app'
 require_relative 'opswalrus/cli'
 require_relative 'opswalrus/version'
 
-module OpsWalrusWalrus
+module OpsWalrus
 end

data/opswalrus.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |spec|
   spec.license               = "EPL-2.0"
   spec.required_ruby_version = ">= 2.6.0"
 
-  # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server - https://example.com"
+  # spec.metadata["allowed_push_host"] = "Set to your gem server - https://example.com"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/opswalrus/opswalrus"
-  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  # spec.metadata["changelog_uri"] = "Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -37,7 +37,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gli", "~> 2.21"
   spec.add_dependency "git", "~> 1.18"
   spec.add_dependency "ougai", "~> 2.0"
+  spec.add_dependency "pastel", "~> 0.8"
   spec.add_dependency "rubyzip", "~> 2.3"
+  spec.add_dependency "tty-editor", "~> 0.7"
 
   spec.add_dependency "bcrypt_pbkdf", "~> 1.1"
   spec.add_dependency "ed25519", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 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
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: tty-editor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement