entangler 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7664234684080baaf20298dfc18cb7ab65894387
-  data.tar.gz: e90330937c330a0967e086057d8e044785505e35
+SHA256:
+  metadata.gz: 85849db77d8ac84bbb9e7230de8f2d20f88dba32786a029ae0fb06c2700707b6
+  data.tar.gz: 27e90f34ff9c31bc325b907926cf9906144f363d56b361100a62da2ab81a8539
 SHA512:
-  metadata.gz: da01d358c301ff60072b67b10e74703446ca0e24a4d70ba0bef1a9eb6a23be7ac16b021de7f768934ffce9e9262e410f619dbf02ab20b6886c88839324092c8c
-  data.tar.gz: 0824476a729ee980afd9ad8eb0d0c371c5b0bbe5f31b826678131027afc9b985341520f9f565e5a2ed3a282406d08c8b960c79eecaebf6898400b63d480467bd
+  metadata.gz: c57b439657b3314fe8cc44018208e364610321de33939bc9cf34fceb4b0108de61c4385a9aaf7700748f122118af4d62a3fff267461eb912b8cf421103fc4ddd
+  data.tar.gz: 85da07278c48587669f37ed4e8e16abb4474ba55c3fc13a850dc322e1cea66f7934136261bc1302ade69074bbd6d29e9022609693a8db85d0edc48021c729117

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.1.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'
 
@@ -19,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ['entangler']
   spec.require_paths = ['lib']
 
-  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_development_dependency 'bundler', '>= 2.1'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
+  spec.add_development_dependency 'rspec', '>= 3.9'
+  spec.add_development_dependency 'rubocop', '>= 0.80'
   spec.add_dependency 'listen', '~> 3.1'
   spec.add_dependency 'to_regexp', '~> 0.2.0'
 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.rb

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

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,8 +111,9 @@ module Entangler
           @listener_pauses[idx] = true
           listener.pause
           yield
-          @listener_pauses[idx] = false
-          listener.start if @listener_pauses.none?
+          ensure
+            @listener_pauses[idx] = false
+            listener.start if @listener_pauses.none?
         end
 
         def with_log_time(msg)

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'
 

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'

data/lib/entangler/executor/slave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Entangler
   module Executor
     class Slave < Base

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'
 

data/lib/entangler/version.rb

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

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Dave Allie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2020-12-10 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: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -140,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Two way file syncer using platform native notify.