opswalrus 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9504aa3c2b2bb9cb90f0623261750dcf956be5d1ea227b82851260d0fdd425ca
-  data.tar.gz: cc36a65d93bb507cdf5b6041d5c3228f2a3f84acb78bcc8489d9fb925e86b13a
+  metadata.gz: d9c838dbf7a64b90664fa94e0b6579508e0967d20a2fa8d8779616fa36cf9b8f
+  data.tar.gz: 9787c55859ab6ed5f5ceb50803c72df06f9d021e25dcbe7dc917db4f2f30b2ab
 SHA512:
-  metadata.gz: f0ff218c83c59ecb04149ec050ab607421aa7f73f566adf079ac55d71748e853d8c8d5606b088bf1a52419cd50fe54da3053eb9ad31bd86131f3afa163a6bbc8
-  data.tar.gz: 64d394b48755699addc20e1528a8806c6e38c4baf7e406ecf39d760a18b04c4a13d6554d0e5955c734c15e04fb18b5ea5e7d51bd29df66674f789e31b8203d28
+  metadata.gz: 644d62c00d36280d5be184f8408c0fc8d5da05d02bae7207b6899d819c98c3f6456be34bb50db1ebfd4012419e6710e193d278c6065bdf2a5b5cc6025b291606
+  data.tar.gz: a0a2f5663a4bc748feba02bf4609de61347a8ef5519420ba578dfade18c5fdb877f9aada5332bc705c3714db3284b0e137844fa43a56718c3a99d23ceda8b613

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.11)
+    opswalrus (1.0.12)
       bcrypt_pbkdf (~> 1.1)
       citrus (~> 3.0)
       ed25519 (~> 1.3)

data/lib/opswalrus/app.rb

@@ -239,25 +239,6 @@ module OpsWalrus
 
         ops_file_path, operation_kv_args = find_entry_point_ops_file_in_dir(destination_package_path, package_operation_and_args)
 
-        # ops_file_path = nil
-        # base_path = Pathname.new(destination_package_path)
-        # path_parts = 0
-        # package_operation_and_args.each do |candidate_path_arg|
-        #   candidate_base_path = base_path.join(candidate_path_arg)
-        #   candidate_ops_file = candidate_base_path.sub_ext(".ops")
-        #   if candidate_ops_file.exist?
-        #     path_parts += 1
-        #     ops_file_path = candidate_ops_file
-        #     break
-        #   elsif candidate_base_path.exist?
-        #     path_parts += 1
-        #   else
-        #     raise Error, "Operation not found in #{repo_url}: #{candidate_base_path}"
-        #   end
-        #   base_path = candidate_base_path
-        # end
-        # operation_kv_args = package_operation_and_args.drop(path_parts)
-
         # for an original package_operation_and_args of ["github.com/davidkellis/my-package", "operation1", "arg1:val1", "arg2:val2", "arg3:val3"]
         # we return: [ "#{pwd}/#{Bundler::BUNDLE_DIR}/github-com-davidkellis-my-package/operation1.ops", ["arg1:val1", "arg2:val2", "arg3:val3"] ]
         [ops_file_path, operation_kv_args, tmp_dir]

data/lib/opswalrus/bundler.rb

@@ -109,38 +109,74 @@ module OpsWalrus
       package_url = package_reference.package_uri
       version = package_reference.version
 
-      destination_package_path = @bundle_dir.join(package_reference.dirname)
+      destination_package_path = @bundle_dir.join(package_reference.import_resolution_dirname)
       FileUtils.remove_dir(destination_package_path) if destination_package_path.exist?
 
-      case
-      when package_url =~ /\.git/                               # git reference
-        download_git_package(package_url, version, destination_package_path)
-      when package_url.start_with?("file://")                   # local path
-        path = package_url.sub("file://", "")
-        path = path.to_pathname
-        package_path_to_download = if path.relative?            # relative path
-          package_file.containing_directory.join(path)
-        else                                                    # absolute path
-          path.realpath
-        end
+      download_package_contents(package_file, local_name, package_url, version, destination_package_path)
+      # case
+      # when package_url =~ /\.git/                               # git reference
+      #   download_git_package(package_url, version, destination_package_path)
+      # when package_url.start_with?("file://")                   # local path
+      #   path = package_url.sub("file://", "")
+      #   path = path.to_pathname
+      #   package_path_to_download = if path.relative?            # relative path
+      #     package_file.containing_directory.join(path)
+      #   else                                                    # absolute path
+      #     path.realpath
+      #   end
+
+      #   raise Error, "Package not found: #{package_path_to_download}" unless package_path_to_download.exist?
+      #   FileUtils.cp_r(package_path_to_download, destination_package_path)
+      # when package_url.to_pathname.exist? || package_file.containing_directory.join(package_url).exist?     # local path
+      #   path = package_url.to_pathname
+      #   package_path_to_download = if path.relative?            # relative path
+      #     package_file.containing_directory.join(path)
+      #   else                                                    # absolute path
+      #     path.realpath
+      #   end
+
+      #   raise Error, "Package not found: #{package_path_to_download}" unless File.exist?(package_path_to_download)
+      #   FileUtils.cp_r(package_path_to_download, destination_package_path)
+      # else                                                      # git reference
+      #   download_git_package(package_url, version, destination_package_path)
+      # end
+
+      destination_package_path
+    end
 
-        raise Error, "Package not found: #{package_path_to_download}" unless package_path_to_download.exist?
-        FileUtils.cp_r(package_path_to_download, destination_package_path)
-      when package_url.to_pathname.exist? || package_file.containing_directory.join(package_url).exist?     # local path
-        path = package_url.to_pathname
-        package_path_to_download = if path.relative?            # relative path
-          package_file.containing_directory.join(path)
-        else                                                    # absolute path
-          path.realpath
+    def download_package_contents(package_file, local_name, package_url, version, destination_package_path)
+      package_path = package_url.to_pathname
+      package_path = package_path.to_s.gsub(/^~/, Dir.home).to_pathname
+      if package_path.absolute? && package_path.exist?                                   # absolute path reference
+        return case
+        when package_path.directory?
+          package_path_to_download = package_path.realpath
+          FileUtils.cp_r(package_path_to_download, destination_package_path)
+        when package_path.file?
+          raise Error, "Package reference must be a directory, not a file:: #{local_name}: #{package_path}"
+        else
+          raise Error, "Unknown package reference for absolute path: #{local_name}: #{package_path}"
         end
+      end
+      if package_path.relative?                                                          # relative path reference
+        rebased_path = package_file.containing_directory.join(package_path)
+        if rebased_path.exist?
+          return case
+          when rebased_path.directory?
+            package_path_to_download = rebased_path.realpath
+            FileUtils.cp_r(package_path_to_download, destination_package_path)
+          when rebased_path.file?
+            raise Error, "Package reference must be a directory, not a file:: #{local_name}: #{package_path}"
+          else
+            raise Error, "Unknown package reference for relative path: #{local_name}: #{package_path}"
+          end
+        end
+      end
 
-        raise Error, "Package not found: #{package_path_to_download}" unless File.exist?(package_path_to_download)
-        FileUtils.cp_r(package_path_to_download, destination_package_path)
-      else                                                      # git reference
+      package_uri = package_url
+      if Git.repo?(package_uri)                                                          # git repo
         download_git_package(package_url, version, destination_package_path)
       end
-
-      destination_package_path
     end
 
     def download_git_package(package_url, version = nil, destination_package_path = nil)

data/lib/opswalrus/host.rb

@@ -22,10 +22,7 @@ module OpsWalrus
         # 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 = "--script"
-
-        remote_run_command_args << " "
-        remote_run_command_args << @method_chain.join(" ")
+        remote_run_command_args = @method_chain.join(" ")
 
         unless args.empty?
           remote_run_command_args << " "
@@ -44,7 +41,7 @@ module OpsWalrus
           end.join(" ")
         end
 
-        @host_proxy.run_ops(:run, remote_run_command_args)
+        @host_proxy.run_ops(:run, "--script", remote_run_command_args)
       end
     end
   end
@@ -164,13 +161,15 @@ module OpsWalrus
     # end
 
     # runs the specified ops command with the specified command arguments
-    def run_ops(command, command_arguments, in_bundle_root_dir: true, verbose: false)
+    def run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, verbose: false)
       # e.g. /home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops bundle unzip tmpops.zip
       # e.g. /home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops run echo.ops args:foo args:bar
 
+      # cmd = "/home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops"
       cmd = "/home/linuxbrew/.linuxbrew/bin/gem exec -g opswalrus ops"
       cmd << " -v" if verbose
-      cmd << " #{command.to_s}"
+      cmd << " #{ops_command.to_s}"
+      cmd << " #{ops_command_options.to_s}" if ops_command_options
       cmd << " #{@tmp_bundle_root_dir}" if in_bundle_root_dir
       cmd << " #{command_arguments}" unless command_arguments.empty?
 

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -157,11 +157,11 @@ module OpsWalrus
           # puts retval.inspect
 
           # cleanup
-          if tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
-            host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip", tmp_bundle_root_dir)
-          else
-            host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip")
-          end
+          # if tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
+          #   host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip", tmp_bundle_root_dir)
+          # else
+          #   host.execute(:rm, "-rf", "tmpopsbootstrap.sh", "tmpops.zip")
+          # end
 
           retval
         rescue SSHKit::Command::Failed => e

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.11"
+  VERSION = "1.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - David Ellis