entangler 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783a5b3ef9783c555695f78996ccd7708b336a7f6a96f3fed514d64b60c040aa
-  data.tar.gz: d91234cd85293e33d26551f78da5057ca7ee9c4f8c8a4279371d7291dc9c5168
+  metadata.gz: 76ca4b85c0742a19215092fb199905604789027d5545d96cea9fea72e330b5aa
+  data.tar.gz: 8b77263b425f8deae8c0d32236545797e6a0e473264304112b138f7996ffd459
 SHA512:
-  metadata.gz: 2765a50d87ff234c7b4311c80fbe9b58f20de55e46a60df8214145e43911948971e7b16bf9b25dc0bfadb5c24a2c909efc9b1b19e755d49b3a2488be72638994
-  data.tar.gz: 6ab807597be96dfea700b7bc517318003b035b3d64782ea2b6c6dd122dda44e5bc42e82f9df7a3798b7a5c795d326ab374d5568f4ecfef213a26fe1256e5e733
+  metadata.gz: 48dfe981b3a6b59983e543b43f54e9a211743d30889d81321eed3ec846b9533c716177ac8551780f278123ff5622854ef0b7a19c2007451bac2d3d7ac334b920
+  data.tar.gz: 6734874d44e9ce19de8b2f50d275fc2ab8ef246b968fcbfffe546b778428b50d6bef2dc1b02eb39ef883578181600a3766a3996623d8e5c5eda0f196631c2620

data/README.md

@@ -19,7 +19,7 @@ $ entangler master /some/base/path user@remote:/some/remote/path
 
 ```
 $ entangler -h
-Entangler v1.2.3
+Entangler v1.3.0
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
@@ -30,6 +30,7 @@ Options:
                                      All paths should be relative to the base sync directory.
     -p, --port PORT                  Overwrite the SSH port (usually 22)
                                      (doesn't do anything in slave mode)
+        --no-rvm                     Skip attempting to load RVM on remote
     -v, --verbose                    Log Debug lines
     -q, --quiet                      Don't log to stdout in master process
         --version                    Show version number

data/exe/entangler

@@ -36,6 +36,7 @@ Usage:
 
   value_opt(options, opts, :port, '-p', '--port PORT', 'Overwrite the SSH port (usually 22)',
             "(doesn't do anything in slave mode)")
+  bool_opt(options, opts, :no_rvm, '--no-rvm', 'Skip attempting to load RVM on remote')
   bool_opt(options, opts, :verbose, '-v', '--verbose', 'Log Debug lines')
   bool_opt(options, opts, :quiet, '-q', '--quiet', "Don't log to stdout in master process")
 
@@ -112,6 +113,7 @@ if options[:ignore]
   end
 end
 
+opts[:no_rvm] = options[:no_rvm]
 opts[:quiet] = options[:quiet]
 opts[:verbose] = options[:verbose]
 

data/lib/entangler/executor/background/master.rb

@@ -12,7 +12,7 @@ module Entangler
           logger.info('Starting - Entangler on remote')
           ignore_opts = @opts[:ignore].map { |regexp| "-i '#{regexp.inspect}'" }.join(' ')
           entangler_cmd = "entangler slave #{@opts[:remote_base_dir]} #{ignore_opts}"
-          ssh_cmd = generate_ssh_command("source ~/.rvm/environments/default && #{entangler_cmd}")
+          ssh_cmd = generate_ssh_command(entangler_cmd, source_rvm: true)
           full_cmd = @opts[:remote_mode] ? ssh_cmd : entangler_cmd
 
           @remote_writer, @remote_reader, remote_err, @remote_thread = Open3.popen3(full_cmd)

data/lib/entangler/executor/master.rb

@@ -57,8 +57,15 @@ module Entangler
         end.compact.uniq
       end
 
-      def generate_ssh_command(cmd)
-        "ssh -q #{remote_hostname} -p #{@opts[:remote_port]} -C \"#{cmd}\""
+      def generate_ssh_command(cmd, source_rvm: false)
+        prefixed_cmd =
+          if source_rvm && !@opts[:no_rvm]
+            "([[ -f ~/.rvm/environments/default ]] && source ~/.rvm/environments/default || true) && #{cmd}"
+          else
+            cmd
+          end
+
+        "ssh -q #{remote_hostname} -p #{@opts[:remote_port]} -C \"#{prefixed_cmd}\""
       end
 
       def remote_hostname

data/lib/entangler/executor/validation/master.rb

@@ -49,7 +49,7 @@ module Entangler
         def validate_remote_entangler_version
           return unless @opts[:remote_mode]
 
-          res = `#{generate_ssh_command('source ~/.rvm/environments/default && entangler --version')}`
+          res = `#{generate_ssh_command('entangler --version', source_rvm: true)}`
           if res.empty?
             msg = 'Entangler is not installed on the remote server.' \
                   ' Install Entangler on the remote server (SSH in, then `gem install entangler`), then try again.'

data/lib/entangler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Entangler
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Dave Allie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Two way file syncer using platform native notify.