entangler 1.1.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7664234684080baaf20298dfc18cb7ab65894387
-  data.tar.gz: e90330937c330a0967e086057d8e044785505e35
+SHA256:
+  metadata.gz: a4f98e12ff87f2be01e5370bc2142b4bed7154535481d33a95c6f43591e47de4
+  data.tar.gz: 27868bae2c5fd085b4f28466e26934d57c84d37ed1f70aeb44899636fd39e14c
 SHA512:
-  metadata.gz: da01d358c301ff60072b67b10e74703446ca0e24a4d70ba0bef1a9eb6a23be7ac16b021de7f768934ffce9e9262e410f619dbf02ab20b6886c88839324092c8c
-  data.tar.gz: 0824476a729ee980afd9ad8eb0d0c371c5b0bbe5f31b826678131027afc9b985341520f9f565e5a2ed3a282406d08c8b960c79eecaebf6898400b63d480467bd
+  metadata.gz: 8d02e37d871284a999f90a0f93e94a4235317c4adb5d3a222e6c53187d8c2503e32af6aabc3118e95700df768c745e6924ee53672c47f956698b80a52513e6b1
+  data.tar.gz: ebeccb202a07a95e63160aca13d08e3533a5e92470b7d3b1c14ead7acd405f6a4a6d82b4ee3f7c8d1a7fc60b46bbc8ff5b099f8eabbeca80aaa531e1ce4a9f4d

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in entangler.gemspec

data/README.md

@@ -1,4 +1,5 @@
-# Entangler
+<p align="center" style="width: 50px;"><img src="https://vignette1.wikia.nocookie.net/pokemon/images/e/ef/114Tangela_Dream.png/revision/latest/scale-to-width-down/185?cb=20141203054028"/></p>
+<h1 align="center">Entangler</h1>
 
 [![Build Status](https://travis-ci.org/daveallie/entangler.svg?branch=master)](https://travis-ci.org/daveallie/entangler)
 
@@ -18,7 +19,7 @@ $ entangler master /some/base/path user@remote:/some/remote/path
 
 ```
 $ entangler -h
-Entangler v1.1.1
+Entangler v1.2.2
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]

data/entangler.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'entangler/version'
 
@@ -18,11 +20,14 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = ['entangler']
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49.1'
-  spec.add_dependency 'listen', '~> 3.1'
-  spec.add_dependency 'to_regexp', '~> 0.2.0'
+  spec.add_development_dependency 'bundler', '>= 2.1'
+  spec.add_development_dependency 'rake', '>= 13.0.1'
+  spec.add_development_dependency 'rspec', '>= 3.9'
+  spec.add_development_dependency 'rubocop', '~> 1.6'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
+  spec.add_dependency 'listen', '~> 3.7'
+  spec.add_dependency 'to_regexp', '~> 0.2.1'
 end

data/exe/entangler

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'entangler'
 require 'optparse'
 require 'to_regexp'
@@ -99,9 +101,7 @@ end
 
 if options[:ignore]
   opts[:ignore] = options[:ignore].map do |opt|
-    if opt.start_with?('"') && opt.end_with?('"') || opt.start_with?("'") && opt.end_with?("'")
-      opt = opt[1..-2]
-    end
+    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)

data/lib/entangler/entangled_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Entangler

data/lib/entangler/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Entangler
   class EntanglerError < StandardError; end
   class ValidationError < EntanglerError; end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'listen'
 require 'entangler/entangled_file'
 require 'benchmark'
@@ -56,6 +58,7 @@ module Entangler
         def remove_recently_changed_files(entangled_files)
           @recently_received_paths.select! { |_, time| Time.now.to_f < time + 0.5 }
           paths = @recently_received_paths.map(&:first)
+          logger.debug("Skipping paths #{paths.join(', ')} as they have changed recently") if paths.any?
           entangled_files.reject { |ef| paths.include?(ef.path) }
         end
 
@@ -75,6 +78,7 @@ module Entangler
         def process_remote_changes(changes)
           with_listener_pause(1) do
             return if changes.nil?
+
             logger.info("Processing - #{changes.length} remote changes")
             logger.debug("File List:\n#{changes.map(&:path).join("\n")}")
             with_log_time("Completed - #{changes.length} remote changes") do
@@ -97,9 +101,9 @@ module Entangler
 
         def with_kill_threads_rescue
           yield
-        rescue => e
-          $stderr.puts e.message
-          $stderr.puts e.backtrace.join("\n")
+        rescue StandardError => e
+          warn e.message
+          warn e.backtrace.join("\n")
           kill_off_threads
         end
 
@@ -107,6 +111,7 @@ module Entangler
           @listener_pauses[idx] = true
           listener.pause
           yield
+        ensure
           @listener_pauses[idx] = false
           listener.start if @listener_pauses.none?
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open3'
 
 module Entangler
@@ -21,7 +23,7 @@ module Entangler
           super
           begin
             Process.wait @remote_thread[:pid]
-          rescue
+          rescue StandardError
             nil
           end
         end

data/lib/entangler/executor/base.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'fileutils'
-require 'thread'
 require_relative 'background/base'
 require_relative 'validation/base'
 
@@ -52,7 +53,7 @@ module Entangler
       end
 
       def logger
-        @logger ||= Entangler::Logger.new(log_outputs, @opts[:verbose])
+        @logger ||= Entangler::Logger.new(log_outputs, verbose: @opts[:verbose])
       end
 
       def log_outputs

data/lib/entangler/executor/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Entangler
   module Helper
     def self.with_temp_file(name: 'tmp_file', contents: nil)

data/lib/entangler/executor/master.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'helpers'
 require_relative 'background/master'
 require_relative 'validation/master'
@@ -21,7 +23,7 @@ module Entangler
 
       def log_outputs
         outs = [Entangler::Logger.log_file_path(base_dir)]
-        outs << STDOUT unless @opts[:quiet]
+        outs << $stdout unless @opts[:quiet]
       end
 
       def perform_initial_rsync

data/lib/entangler/executor/slave.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Entangler
   module Executor
     class Slave < Base
       def initialize(base_dir, opts = {})
         super(base_dir, opts)
-        STDIN.binmode
-        STDOUT.binmode
-        STDIN.sync = true
-        STDOUT.sync = true
+        $stdin.binmode
+        $stdout.binmode
+        $stdin.sync = true
+        $stdout.sync = true
 
-        @remote_reader = STDIN
-        @remote_writer = STDOUT
+        @remote_reader = $stdin
+        @remote_writer = $stdout
         $stderr.reopen(File.join(Entangler::Logger.log_file_path(base_dir, 'entangler.err')), 'w')
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Entangler
   module Executor
     module Validation

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Entangler
   module Executor
     module Validation
@@ -21,8 +23,10 @@ module Entangler
           unless File.directory?(@opts[:remote_base_dir])
             raise Entangler::ValidationError, 'Destination directory is a file'
           end
+
           @opts[:remote_base_dir] = File.realpath(File.expand_path(@opts[:remote_base_dir]))
           return unless @opts[:remote_base_dir] == base_dir
+
           raise Entangler::ValidationError, "Destination directory can't be the same as the base directory"
         end
 
@@ -31,6 +35,7 @@ module Entangler
           raise Entangler::ValidationError, 'Missing remote base dir' unless keys.include?(:remote_base_dir)
           raise Entangler::ValidationError, 'Missing remote user' unless keys.include?(:remote_user)
           raise Entangler::ValidationError, 'Missing remote host' unless keys.include?(:remote_host)
+
           validate_remote_base_dir
           validate_remote_entangler_version
         end
@@ -43,10 +48,12 @@ module Entangler
 
         def validate_remote_entangler_version
           return unless @opts[:remote_mode]
+
           res = `#{generate_ssh_command('source ~/.rvm/environments/default && entangler --version')}`
           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}."
           raise Entangler::VersionMismatchError, msg

data/lib/entangler/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'logger'
 
@@ -11,7 +13,7 @@ module Entangler
       File.join(base_dir, '.entangler', 'log', log_file_name)
     end
 
-    def initialize(outputs, verbose = false)
+    def initialize(outputs, verbose: false)
       @loggers = Array(outputs).map do |output|
         logger = ::Logger.new(output)
 

data/lib/entangler/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Entangler
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.2'
 end

data/lib/entangler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'entangler/version'
 require_relative 'entangler/errors'
 require_relative 'entangler/logger'

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Dave Allie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: to_regexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 description: Two way file syncer using platform native notify.
 email:
 - dave@daveallie.com
@@ -133,15 +161,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Two way file syncer using platform native notify.