entangler 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f98e12ff87f2be01e5370bc2142b4bed7154535481d33a95c6f43591e47de4
-  data.tar.gz: 27868bae2c5fd085b4f28466e26934d57c84d37ed1f70aeb44899636fd39e14c
+  metadata.gz: 76ca4b85c0742a19215092fb199905604789027d5545d96cea9fea72e330b5aa
+  data.tar.gz: 8b77263b425f8deae8c0d32236545797e6a0e473264304112b138f7996ffd459
 SHA512:
-  metadata.gz: 8d02e37d871284a999f90a0f93e94a4235317c4adb5d3a222e6c53187d8c2503e32af6aabc3118e95700df768c745e6924ee53672c47f956698b80a52513e6b1
-  data.tar.gz: ebeccb202a07a95e63160aca13d08e3533a5e92470b7d3b1c14ead7acd405f6a4a6d82b4ee3f7c8d1a7fc60b46bbc8ff5b099f8eabbeca80aaa531e1ce4a9f4d
+  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.2
+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/errors.rb

@@ -4,4 +4,5 @@ module Entangler
   class EntanglerError < StandardError; end
   class ValidationError < EntanglerError; end
   class VersionMismatchError < EntanglerError; end
+  class NotInstalledOnRemoteError < EntanglerError; end
 end

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,13 +49,19 @@ 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.'
+            raise Entangler::NotInstalledOnRemoteError, msg
+          end
+
           remote_version = Gem::Version.new(res.strip)
           local_version = Gem::Version.new(Entangler::VERSION)
           return unless major_version_mismatch?(local_version, remote_version)
 
           msg = 'Entangler version too far apart, please update either local or remote Entangler.' \
-              " Local version is #{local_version} and remote version is #{remote_version}."
+                " Local version is #{local_version} and remote version is #{remote_version}."
           raise Entangler::VersionMismatchError, msg
         end
 

data/lib/entangler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Dave Allie
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,7 @@ homepage: https://github.com/daveallie/entangler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Two way file syncer using platform native notify.
 test_files: []