opswalrus 1.0.17 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ce759171a0342644a1e3e2c94555299b093095b1684a69e11142fe29292da4
-  data.tar.gz: 75f4cab88e00038c73df02d69718b5cd067f3ed69150c192335894128ef912d0
+  metadata.gz: c0ff652415da76b83b423422356b87d8745396a130589a5b6eca43c29f5ef5ca
+  data.tar.gz: 6d61f7b4e9f12887ee5477331090ef91a6d080f39fc5aaf748ea613b5f6a228f
 SHA512:
-  metadata.gz: 6d47f83ae4dde1c9007f0d4591da7d6d9501218b15dfed542bdf9eda8538cfca14e22baa0d0a9e7dd244ef0db3fc683f862f296e296f713f500a3b084de02dac
-  data.tar.gz: 96877f5975e10dd6415194f5f130f3b7b31fcee66199c354cee93386116b4c0e918749c4158ec6da4a9fe64d9414410032c47d5c78c41caf2a36683cab259a03
+  metadata.gz: cbbb9c27cb16fdc2d57aa0d17ee359133a3340df01de204f26c990bb0fc09cd8c3675e69ebfb8c21fc08823b2489c85012e2bcd6c1c9f6d2acb12e1ac3d22bd4
+  data.tar.gz: 891cc95c97be369ee25c4e83fe761db15842f96f210fd1d2ab9ac73ee74fd084a5952e333cb86beb16d150a188efbf3f8bd23f3c2c9aeacdf5a572c3fa48697f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.17)
+    opswalrus (1.0.19)
       amazing_print (~> 1.5)
       bcrypt_pbkdf (~> 1.1)
       citrus (~> 3.0)

data/lib/opswalrus/app.rb

@@ -1,3 +1,4 @@
+require "amazing_print"
 require "citrus"
 require "io/console"
 require "json"

data/lib/opswalrus/host.rb

@@ -18,9 +18,9 @@ module OpsWalrus
       ops_file.local_symbol_table.each do |symbol_name, import_reference|
         unless methods_defined.include? symbol_name
           klass.define_method(symbol_name) do |*args, **kwargs, &block|
-            # puts "resolving local symbol table entry: #{symbol_name}"
+            App.instance.trace "resolving local symbol table entry: #{symbol_name}"
             namespace_or_ops_file = @runtime_env.resolve_import_reference(ops_file, import_reference)
-            # puts "namespace_or_ops_file=#{namespace_or_ops_file.to_s}"
+            App.instance.trace "namespace_or_ops_file=#{namespace_or_ops_file.to_s}"
 
             invocation_context = 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,
@@ -49,6 +49,10 @@ module OpsWalrus
         unless methods_defined.include? symbol_name
           # puts "2. defining: #{symbol_name}(...)"
           klass.define_method(symbol_name) do |*args, **kwargs, &block|
+            App.instance.trace "resolving implicit import: #{symbol_name}"
+            namespace_or_ops_file = @runtime_env.resolve_sibling_symbol(ops_file, symbol_name)
+            App.instance.trace "namespace_or_ops_file=#{namespace_or_ops_file.to_s}"
+
             invocation_context = RemoteImportInvocationContext.new(@runtime_env, self, namespace_or_ops_file, false, prompt_for_sudo_password: !!ssh_password)
             invocation_context._invoke(*args, **kwargs)
           end

data/lib/opswalrus/invocation.rb

@@ -30,7 +30,12 @@ module OpsWalrus
       @initial_namespace_or_ops_file = @namespace_or_ops_file = namespace_or_ops_file
       @is_invocation_a_call_to_package_in_bundle_dir = is_invocation_a_call_to_package_in_bundle_dir
 
-      initial_method_name = @namespace_or_ops_file.dirname.basename
+      initial_method_name = case @namespace_or_ops_file
+      when Namespace
+        @namespace_or_ops_file.dirname.basename
+      when OpsFile
+        @namespace_or_ops_file.basename
+      end
       @method_chain = [initial_method_name]
       @prompt_for_sudo_password = prompt_for_sudo_password
     end

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -126,7 +126,7 @@ module OpsWalrus
         rescue => e
           puts e.class
           puts e.message
-          # puts e.backtrace.join("\n")
+          puts e.backtrace.join("\n")
         ensure
           host.clear_ssh_session
         end
@@ -173,7 +173,11 @@ module OpsWalrus
       raise Error, "Unknown package reference: #{local_package_name}" unless package_reference
       import_reference = PackageDependencyReference.new(local_package_name, package_reference)
       # puts "import: #{import_reference.inspect}"
-      @runtime_env.resolve_import_reference(ops_file, import_reference)
+      namespace_or_ops_file = @runtime_env.resolve_import_reference(ops_file, import_reference)
+      raise SymbolResolutionError, "Import reference '#{import_reference.summary}' not in load path for #{ops_file.ops_file_path}" unless namespace_or_ops_file
+      invocation_context = LocalImportInvocationContext.new(@runtime_env, namespace_or_ops_file)
+      # invocation_context = LocalImportInvocationContext.new(@runtime_env, namespace_or_ops_file)
+      # invocation_context._invoke(*args, **kwargs)
     end
 
     def params(*keys, default: nil)

data/lib/opswalrus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.19
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print