entangler 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede22d7fd84575aa02eea914dc7eef35eb35bce727db9b03bbcd25f6b975a30d
-  data.tar.gz: c71f387c5a1859fc2c2931d4d4acbc5c7251d87491a604d7ac157f8a67b4cef2
+  metadata.gz: caeaeab73f12f452f171a80fc4c202f4e3bfcafea5f7c1509057175e6bec0c1f
+  data.tar.gz: 950085ffeb8d56d5d5d23163f5024ee09ae173ae5d95dbb5981ee2274e24189d
 SHA512:
-  metadata.gz: 34a0de48ff67103ff238d2fae9aad59b90fe86b5999b36b6d73dbe2372b4dc9afc1d47ecbaa6798818d94cc00770a73d16b148c1451d588c4cd136a0ee215844
-  data.tar.gz: f4f1664744f0b8647cc4f94bbf9cc106879c71950acaddf0a1836a100f74961251604caef3540a44a73d05a1e0ad28836e8e00a3ecc33745a4f82a037c69407b
+  metadata.gz: 9ccbc2db0d327844b0a78f52468bb11582d55c53a986ddb7158102017d229448cdb34b7ed4c16449338eb2d00f231b44ff949edebb2b40eaa0fa52d8f896b87c
+  data.tar.gz: 6f89e593575e7120bfc897f213219c1174eef54dcdc16c8a5a125cd363fceecd4fc6cd820abca981da4e9d7f1bf974a16cac0e0a2a55217194040094631485b1

data/entangler.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
   spec.add_dependency 'listen', '~> 3.7'
   spec.add_dependency 'to_regexp', '~> 0.2.1'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/exe/entangler

@@ -18,12 +18,15 @@ def value_opt(options, opts, key, *args)
 end
 
 options = {}
+# rubocop:disable Metrics/BlockLength
 OptionParser.new do |opts|
-  opts.banner = %(Entangler v#{Entangler::VERSION}
+  opts.banner = <<~BANNER
+    Entangler v#{Entangler::VERSION}
 
-Usage:
-   entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
-   entangler master <base_dir> <other_synced_base_dir> [options])
+    Usage:
+      entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
+      entangler master <base_dir> <other_synced_base_dir> [options]
+  BANNER
 
   opts.separator ''
   opts.separator 'Options:'
@@ -36,8 +39,14 @@ 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, :force_polling, '--force-polling',
+           'Forces the use of the listen polling adapter (works cross-platform, generally slower)')
+
   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")
 
   opts.on_tail('--version', 'Show version number') do
@@ -50,6 +59,7 @@ Usage:
     exit
   end
 end.parse!
+# rubocop:enable Metrics/BlockLength
 
 mode = ARGV.shift
 unless mode && %w[master slave].include?(mode)
@@ -102,17 +112,18 @@ end
 
 if options[:ignore]
   opts[:ignore] = options[:ignore].map do |opt|
-    opt = opt[1..-2] if opt.start_with?('"') && opt.end_with?('"') || opt.start_with?("'") && opt.end_with?("'")
+    opt = opt[1..-2] if (opt.start_with?('"') && opt.end_with?('"')) || (opt.start_with?("'") && opt.end_with?("'"))
 
     if ToRegexp::String.literal? opt
       source, *rest = opt.as_regexp(detect: true)
-      ::Regexp.new "^#{source}(?:/[^/]+)*$", *rest
+      Regexp.new "^#{source}(?:/[^/]+)*$", *rest
     else
       opt.to_regexp(detect: true)
     end
   end
 end
 
+opts[:force_polling] = options[:force_polling]
 opts[:no_rvm] = options[:no_rvm]
 opts[:quiet] = options[:quiet]
 opts[:verbose] = options[:verbose]

data/lib/entangler/entangled_file.rb

@@ -18,10 +18,6 @@ module Entangler
       Entangler.executor.generate_abs_path(@path)
     end
 
-    def not_a_directory?
-      !File.directory?(full_path)
-    end
-
     def file_exists?
       File.exist?(full_path)
     end
@@ -51,7 +47,7 @@ module Entangler
 
     def write_contents
       delete_file if file_exists? && File.directory?(full_path)
-      File.open(full_path, 'w') { |f| f.write(contents) }
+      File.write(full_path, contents)
       File.utime(File.atime(full_path), desired_modtime, full_path)
     end
 
@@ -60,7 +56,7 @@ module Entangler
     end
 
     def marshal_dump
-      if file_exists? && not_a_directory? && (action == :create || action == :update)
+      if file_exists? && (action == :create || action == :update)
         @desired_modtime = File.mtime(full_path).to_i
         @contents = File.read(full_path)
       end

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

@@ -42,12 +42,12 @@ module Entangler
         private
 
         def listener
-          @listener ||= begin
-            Listen::Listener.new(base_dir, ignore!: @opts[:ignore]) do |modified, added, removed|
-              process_local_changes(generate_entangled_files(added, :create) +
-                                        generate_entangled_files(modified, :update) +
-                                        generate_entangled_files(removed, :delete))
-            end
+          @listener ||= Listen::Listener.new(base_dir,
+                                             ignore!: @opts[:ignore],
+                                             force_polling: @opts[:force_polling]) do |modified, added, removed|
+            process_local_changes(generate_entangled_files(added, :create) +
+                                  generate_entangled_files(modified, :update) +
+                                  generate_entangled_files(removed, :delete))
           end
         end
 

data/lib/entangler/executor/base.rb

@@ -11,6 +11,9 @@ module Entangler
       include Entangler::Executor::Background::Base
       include Entangler::Executor::Validation::Base
 
+      GIT_IGNORE_REGEX = %r{^\.git(?:/[^/]+)*$}.freeze
+      ENTANGLER_IGNORE_REGEX = /^\.entangler.*/.freeze
+
       attr_reader :base_dir
 
       def initialize(base_dir, opts = {})
@@ -19,8 +22,9 @@ module Entangler
         @recently_received_paths = []
         @listener_pauses = [false, false]
         @opts = opts
-        @opts[:ignore] = [%r{^\.git(?:/[^/]+)*$}] unless @opts.key?(:ignore)
-        @opts[:ignore] << /^\.entangler.*/
+        @opts[:ignore] = [GIT_IGNORE_REGEX] unless @opts.key?(:ignore)
+        @opts[:ignore] << ENTANGLER_IGNORE_REGEX
+        @opts[:force_polling] ||= false
 
         validate_opts
         Entangler::Logger.create_log_dir(base_dir)
@@ -56,6 +60,8 @@ module Entangler
         @logger ||= Entangler::Logger.new(log_outputs, verbose: @opts[:verbose])
       end
 
+      private
+
       def log_outputs
         [Entangler::Logger.log_file_path(base_dir)]
       end

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

@@ -51,8 +51,8 @@ module Entangler
 
           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.'
+            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
 
@@ -60,8 +60,8 @@ module Entangler
           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}."
+          msg = 'Entangler version too far apart, please update either local or remote Entangler. ' \
+                "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.3.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Dave Allie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,8 @@ files:
 homepage: https://github.com/daveallie/entangler
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: