entangler 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4ebf4a24baaacd27607af53da80054873901c438a88fbc647521bf76183a6e
-  data.tar.gz: b5a56d17bf8a7d4cb251654c2be3929c9d4d6a4d5f31fe37b9ea41e81ab88bf3
+  metadata.gz: 53adde0b653345a289e273c891539863ae2346a85c2ac4431f30ff6b00557075
+  data.tar.gz: e20b0eca3371ddd0127b4b068becf5e8e0b0e430fa051b1c349a3d454a808fe0
 SHA512:
-  metadata.gz: 610b064643380a99c59fdfc61fb292c448d44f0b891da081fb39f34462f841e30e3be6a8094e4067e5878217ba0927ef7fbed812de40b92c55139d165a8b2916
-  data.tar.gz: 2d4d014f1df0606988281772c30e2674d7de057571f586953093448b7ce470cfc418b719fcbe058f57cbd9a289a49c3aa016508df86a882f58a52c106789c206
+  metadata.gz: 6132124e59b384d8220330d493001201166e01bf6d4a96ef67d9144c8b46cdb53ced4103688af82489e3e2df36031f0228725c8f66c7856794bc4ee05b474c57
+  data.tar.gz: a15dc33a5e5505cd0c965d96b142394be0daafaa4e820e81b90aac7130ee79c99a3a488bdbfc7449d8494b05c332c8fda7f5c904b43036ab7306810ceb777b1d

data/README.md

@@ -30,6 +30,8 @@ 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)
+    -c, --config PATH                Use a custom SSH config (usually $HOME/.ssh/config)
+                                     (doesn't do anything in slave mode)
         --force-polling              Forces the use of the listen polling adapter
                                      (works cross-platform, generally slower, doesn't do anything in slave mode)
         --no-rvm                     Skip attempting to load RVM on remote

data/exe/entangler

@@ -40,6 +40,9 @@ OptionParser.new do |opts|
   value_opt(options, opts, :port, '-p', '--port PORT', 'Overwrite the SSH port (usually 22)',
             "(doesn't do anything in slave mode)")
 
+  value_opt(options, opts, :config, '-c', '--config PATH', 'Use a custom SSH config (usually $HOME/.ssh/config)',
+            "(doesn't do anything in slave mode)")
+
   bool_opt(options, opts, :force_polling, '--force-polling',
            'Forces the use of the listen polling adapter',
            "(works cross-platform, generally slower, doesn't do anything in slave mode)")
@@ -124,6 +127,7 @@ if options[:ignore]
   end
 end
 
+opts[:config] = options[:config]
 opts[:force_polling] = options[:force_polling]
 opts[:no_rvm] = options[:no_rvm]
 opts[:quiet] = options[:quiet]

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

@@ -11,7 +11,8 @@ module Entangler
         def start_remote_slave
           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}"
+          entangler_cmd = +"entangler slave #{@opts[:remote_base_dir]} #{ignore_opts}"
+          entangler_cmd << ' --verbose' if @opts[:verbose]
           ssh_cmd = generate_ssh_command(entangler_cmd, source_rvm: true)
           full_cmd = @opts[:remote_mode] ? ssh_cmd : entangler_cmd
 

data/lib/entangler/executor/master.rb

@@ -65,7 +65,9 @@ module Entangler
             cmd
           end
 
-        "ssh -q #{remote_hostname} -p #{@opts[:remote_port]} -C \"#{prefixed_cmd}\""
+        ssh = "ssh -q #{remote_hostname} -p #{@opts[:remote_port]}"
+        ssh += " -F #{@opts[:config]}" if @opts[:config]
+        ssh + " -C \"#{prefixed_cmd}\""
       end
 
       def remote_hostname
@@ -83,7 +85,10 @@ module Entangler
         remote_path += "#{@opts[:remote_base_dir]}/"
 
         cmd = "rsync -azv --exclude-from #{rsync_ignores_file_path}"
-        cmd += " -e \"ssh -p #{@opts[:remote_port]}\"" if @opts[:remote_mode]
+        if @opts[:remote_mode]
+          config = @opts[:config] ? "-F #{@opts[:config]}" : ''
+          cmd += " -e \"ssh -p #{@opts[:remote_port]} #{config}\""
+        end
         cmd + " --delete #{base_dir}/ #{remote_path}"
       end
     end

data/lib/entangler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Dave Allie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler