entangler 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4ebf4a24baaacd27607af53da80054873901c438a88fbc647521bf76183a6e
-  data.tar.gz: b5a56d17bf8a7d4cb251654c2be3929c9d4d6a4d5f31fe37b9ea41e81ab88bf3
+  metadata.gz: 978f1befab614ac84fd5431a6f24c2b2340530e9d0b8af712adeefece83b15b2
+  data.tar.gz: 3dd669556077a5f0e2247d21c710081acc827160dc1cc13f76dedc5f36f87c93
 SHA512:
-  metadata.gz: 610b064643380a99c59fdfc61fb292c448d44f0b891da081fb39f34462f841e30e3be6a8094e4067e5878217ba0927ef7fbed812de40b92c55139d165a8b2916
-  data.tar.gz: 2d4d014f1df0606988281772c30e2674d7de057571f586953093448b7ce470cfc418b719fcbe058f57cbd9a289a49c3aa016508df86a882f58a52c106789c206
+  metadata.gz: 97a2687b985d9137ae8679596ffcbe2142ee81db16b390716e12e7dd767b31ccdd15e89b1e8d6a0561995a59e1abc75eb4f3e3c4316e42ed614baeeb67d60d4d
+  data.tar.gz: ff46e79a5d8d84308e610b64b04aeb754a846922522b6ff80ae6544c239fb120b865f9e8ec18f15ab746218a6d4bf1b5f6c66f9da9016b4672ed5bfbd3a1983c

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/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.5.1'
 end

metadata

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