entangler 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c37e01ff82caac966cc6914e8ce9b3ae76820106
-  data.tar.gz: eb49a80d236d3a4ea41aae48b354de2be624e567
+SHA256:
+  metadata.gz: 04a6d5ab6db60640272b7acd3922ba845d2ab171ee4001f4be0b753b7d151c28
+  data.tar.gz: 962a2ab010fffe236dea92a6f5eba83d0ade41ce4edb9af0f867054d2923279c
 SHA512:
-  metadata.gz: e652cb24a4724fa59c4c68f687a7e36cb5a63ecf4f59fa23ab42563fefd0e6e2c500c0f2a55ebfa9aca01b4fb4908443b093d3f63a2188198aeefd392997a36e
-  data.tar.gz: b0f8dd950f5a0946f9738db12f43a41a44b313034ec4bc0b13362cdce3c3b04a638ea908b0a730d735b3fa4533d271eb6a1b8095308069a4220d1569728a3763
+  metadata.gz: 3db61680fd1d006a4ce4dd9a1559c95090c74c898e8c4668378eb4ee5e440f919960104b1d97a62e14846214619e825f16f00385a72fdc4aae05b70dc565ad34
+  data.tar.gz: 65567038136a7bb19280347c8f1a82a59e5b40e0627d4be1ac79f54057c73f00a34b0a91ac8c81e2996a1e646e5649b989122a013db2aaf6377a4109ff333743

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.0.1
+Entangler v1.2.0
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
@@ -30,14 +31,15 @@ Options:
     -p, --port PORT                  Overwrite the SSH port (usually 22)
                                      (doesn't do anything in slave mode)
     -v, --verbose                    Log Debug lines
+    -q, --quiet                      Don't log to stdout in master process
         --version                    Show version number
     -h, --help                       Show this message
 ```
 
 ### Ignoring files and folders
 
-If you specify a string, instead of a regex, it will match any path starting with that string, i.e. `-i '.git'` will ignore the `.git` 
-folder and all its sub-directories. If you want to just ignore the the `.git` sub-directories but not the content in the git folder, you'll 
+If you specify a string, instead of a regex, it will match any path starting with that string, i.e. `-i '.git'` will ignore the `.git`
+folder and all its sub-directories. If you want to just ignore the the `.git` sub-directories but not the content in the git folder, you'll
 have to use regex. `-i '/^\.git(?:\/[^\/]+){2,}$/'` will match all sub-directories of `.git/`, but not the files in `.git`.
 
 You can specify multiple `-i` or `--ignore` flags to ignore multiple paths.

data/entangler.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-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'
 
@@ -14,15 +15,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/daveallie/entangler'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = Dir['lib/**/*'] + Dir['exe/**/*'] + %w[CODE_OF_CONDUCT.md LICENSE.txt README.md
+                                                              Gemfile entangler.gemspec]
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = ['entangler']
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.46'
-  spec.add_dependency 'listen', '~> 3.1'
-  spec.add_dependency 'to_regexp', '~> 0.2'
+  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.3'
+  spec.add_dependency 'to_regexp', '~> 0.2.1'
 end

data/exe/entangler

@@ -1,8 +1,22 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'entangler'
 require 'optparse'
 require 'to_regexp'
 
+def bool_opt(options, opts, key, *args)
+  opts.on(*args) do
+    options[key] = true
+  end
+end
+
+def value_opt(options, opts, key, *args)
+  opts.on(*args) do |val|
+    options[key] = val
+  end
+end
+
 options = {}
 OptionParser.new do |opts|
   opts.banner = %(Entangler v#{Entangler::VERSION}
@@ -20,13 +34,10 @@ Usage:
     options[:ignore] << ignore
   end
 
-  opts.on('-p', '--port PORT', 'Overwrite the SSH port (usually 22)', "(doesn't do anything in slave mode)") do |port|
-    options[:port] = port
-  end
-
-  opts.on('-v', '--verbose', 'Log Debug lines') do
-    options[:verbose] = true
-  end
+  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, :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
     puts Entangler::VERSION
@@ -40,7 +51,7 @@ Usage:
 end.parse!
 
 mode = ARGV.shift
-unless mode && %w(master slave).include?(mode)
+unless mode && %w[master slave].include?(mode)
   puts "Mode unknown, please read help:\nentangler -h"
   exit 1
 end
@@ -90,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)
@@ -103,6 +112,12 @@ if options[:ignore]
   end
 end
 
+opts[:quiet] = options[:quiet]
 opts[:verbose] = options[:verbose]
 
-Entangler.run(base_dir, opts)
+begin
+  Entangler.run(base_dir, opts)
+rescue Entangler::EntanglerError => e
+  puts e.message
+  exit 1
+end

data/lib/entangler.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'entangler/version'
 require_relative 'entangler/errors'
+require_relative 'entangler/logger'
 require_relative 'entangler/entangled_file'
 
 module Entangler

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,12 +1,15 @@
+# frozen_string_literal: true
+
 require 'logger'
 require 'fileutils'
-require 'thread'
 require_relative 'background/base'
+require_relative 'validation/base'
 
 module Entangler
   module Executor
     class Base
       include Entangler::Executor::Background::Base
+      include Entangler::Executor::Validation::Base
 
       attr_reader :base_dir
 
@@ -20,6 +23,7 @@ module Entangler
         @opts[:ignore] << /^\.entangler.*/
 
         validate_opts
+        Entangler::Logger.create_log_dir(base_dir)
       end
 
       def generate_abs_path(rel_path)
@@ -44,36 +48,16 @@ module Entangler
 
       protected
 
-      def validate_opts; end
-
       def send_to_remote(msg = {})
         Marshal.dump(msg, @remote_writer)
       end
 
       def logger
-        FileUtils.mkdir_p log_dir
-        @logger ||= begin
-          l = Logger.new(File.join(log_dir, 'entangler.log'))
-          l.level = @opts[:verbose] ? Logger::DEBUG : Logger::INFO
-          l.formatter = logger_formatter
-          l
-        end
-      end
-
-      def logger_formatter
-        proc do |severity, datetime, _, msg|
-          date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
-          "[#{date_format}] #{severity.rjust(5)}: #{msg}\n"
-        end
-      end
-
-      def log_dir
-        File.join(base_dir, '.entangler', 'log')
+        @logger ||= Entangler::Logger.new(log_outputs, @opts[:verbose])
       end
 
-      def validate_base_dir(base_dir)
-        raise Entangler::ValidationError, "Base directory doesn't exist" unless File.exist?(base_dir)
-        raise Entangler::ValidationError, 'Base directory is a file' unless File.directory?(base_dir)
+      def log_outputs
+        [Entangler::Logger.log_file_path(base_dir)]
       end
     end
   end

data/lib/entangler/executor/helpers.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Entangler
+  module Helper
+    def self.with_temp_file(name: 'tmp_file', contents: nil)
+      require 'tempfile'
+
+      t = Tempfile.new(name)
+      t.puts(contents) unless contents.nil?
+      t.close
+      yield t
+      t.unlink
+    end
+  end
+end

data/lib/entangler/executor/master.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+
+require_relative 'helpers'
 require_relative 'background/master'
+require_relative 'validation/master'
 
 module Entangler
   module Executor
     class Master < Base
       include Entangler::Executor::Background::Master
+      include Entangler::Executor::Validation::Master
 
       def run
         perform_initial_rsync
@@ -16,64 +21,17 @@ module Entangler
 
       private
 
-      def validate_opts
-        super
-        if @opts[:remote_mode]
-          @opts[:remote_port] ||= '22'
-          validate_remote_opts
-        else
-          validate_local_opts
-        end
-      end
-
-      def validate_local_opts
-        unless File.exist?(@opts[:remote_base_dir])
-          raise Entangler::ValidationError, "Destination directory doesn't exist"
-        end
-        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
-
-      def validate_remote_opts
-        keys = @opts.keys
-        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
-
-      def validate_remote_base_dir
-        res = `#{generate_ssh_command("[[ -d '#{@opts[:remote_base_dir]}' ]] && echo 'ok' || echo 'missing'")}`
-        raise Entangler::ValidationError, 'Cannot connect to remote' if res.empty?
-        raise Entangler::ValidationError, 'Remote base dir invalid' unless res.strip == 'ok'
-      end
-
-      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
-      end
-
-      def major_version_mismatch?(version1, version2)
-        version1.segments[0] != version2.segments[0] ||
-          (version1.segments[0].zero? && version1 != version2) ||
-          ((version1.prerelease? || version2.prerelease?) && version1 != version2)
+      def log_outputs
+        outs = [Entangler::Logger.log_file_path(base_dir)]
+        outs << $stdout unless @opts[:quiet]
       end
 
       def perform_initial_rsync
         logger.info 'Running initial sync'
-        IO.popen(rsync_cmd_string).each do |line|
-          logger.debug line.chomp
+        with_temp_rsync_ignores do |file_path|
+          IO.popen(rsync_cmd_string(file_path)).each do |line|
+            logger.debug line.chomp
+          end
         end
         logger.debug 'Initial sync complete'
       end
@@ -107,12 +65,17 @@ module Entangler
         "#{@opts[:remote_user]}@#{@opts[:remote_host]}"
       end
 
-      def rsync_cmd_string
-        exclude_args = find_rsync_ignore_folders.map { |path| "--exclude #{path}" }.join(' ')
+      def with_temp_rsync_ignores
+        Entangler::Helper.with_temp_file(name: 'rsync_ignores', contents: find_rsync_ignore_folders.join("\n")) do |f|
+          yield f.path
+        end
+      end
+
+      def rsync_cmd_string(rsync_ignores_file_path)
         remote_path = @opts[:remote_mode] ? "#{@opts[:remote_user]}@#{@opts[:remote_host]}:" : ''
         remote_path += "#{@opts[:remote_base_dir]}/"
 
-        cmd = "rsync -azv #{exclude_args}"
+        cmd = "rsync -azv --exclude-from #{rsync_ignores_file_path}"
         cmd += " -e \"ssh -p #{@opts[:remote_port]}\"" if @opts[:remote_mode]
         cmd + " --delete #{base_dir}/ #{remote_path}"
       end

data/lib/entangler/executor/slave.rb

@@ -1,16 +1,18 @@
+# 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
-        $stderr.reopen(File.join(log_dir, 'entangler.err'), 'w')
+        @remote_reader = $stdin
+        @remote_writer = $stdout
+        $stderr.reopen(File.join(Entangler::Logger.log_file_path(base_dir, 'entangler.err')), 'w')
       end
     end
   end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Entangler
+  module Executor
+    module Validation
+      module Base
+        protected
+
+        def validate_opts; end
+
+        def validate_base_dir(base_dir)
+          raise Entangler::ValidationError, "Base directory doesn't exist" unless File.exist?(base_dir)
+          raise Entangler::ValidationError, 'Base directory is a file' unless File.directory?(base_dir)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Entangler
+  module Executor
+    module Validation
+      module Master
+        private
+
+        def validate_opts
+          super
+          if @opts[:remote_mode]
+            @opts[:remote_port] ||= '22'
+            validate_remote_opts
+          else
+            validate_local_opts
+          end
+        end
+
+        def validate_local_opts
+          unless File.exist?(@opts[:remote_base_dir])
+            raise Entangler::ValidationError, "Destination directory doesn't exist"
+          end
+          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
+
+        def validate_remote_opts
+          keys = @opts.keys
+          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
+
+        def validate_remote_base_dir
+          res = `#{generate_ssh_command("[[ -d '#{@opts[:remote_base_dir]}' ]] && echo 'ok' || echo 'missing'")}`
+          raise Entangler::ValidationError, 'Cannot connect to remote' if res.empty?
+          raise Entangler::ValidationError, 'Remote base dir invalid' unless res.strip == 'ok'
+        end
+
+        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
+        end
+
+        def major_version_mismatch?(version1, version2)
+          version1.segments[0] != version2.segments[0] ||
+            (version1.segments[0].zero? && version1 != version2) ||
+            ((version1.prerelease? || version2.prerelease?) && version1 != version2)
+        end
+      end
+    end
+  end
+end

data/lib/entangler/logger.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'logger'
+
+module Entangler
+  class Logger
+    def self.create_log_dir(base_dir)
+      FileUtils.mkdir_p(File.dirname(log_file_path(base_dir)))
+    end
+
+    def self.log_file_path(base_dir, log_file_name = 'entangler.log')
+      File.join(base_dir, '.entangler', 'log', log_file_name)
+    end
+
+    def initialize(outputs, verbose: false)
+      @loggers = Array(outputs).map do |output|
+        logger = ::Logger.new(output)
+
+        logger.level = verbose ? ::Logger::DEBUG : ::Logger::INFO
+        logger.formatter = proc do |severity, datetime, _, msg|
+          date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
+          "[#{date_format}] #{severity.rjust(5)}: #{msg}\n"
+        end
+
+        logger
+      end
+    end
+
+    def level=(level)
+      @loggers.each { |logger| logger.level = level }
+    end
+
+    ::Logger::Severity.constants.each do |level|
+      define_method(level.downcase) do |*args|
+        @loggers.each { |logger| logger.send(level.downcase, *args) }
+      end
+    end
+  end
+end

data/lib/entangler/version.rb

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

metadata

@@ -1,99 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Dave Allie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        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.46'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: to_regexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 description: Two way file syncer using platform native notify.
 email:
 - dave@daveallie.com
@@ -102,17 +130,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - entangler.gemspec
 - exe/entangler
 - lib/entangler.rb
@@ -121,8 +142,12 @@ files:
 - lib/entangler/executor/background/base.rb
 - lib/entangler/executor/background/master.rb
 - lib/entangler/executor/base.rb
+- lib/entangler/executor/helpers.rb
 - lib/entangler/executor/master.rb
 - lib/entangler/executor/slave.rb
+- lib/entangler/executor/validation/base.rb
+- lib/entangler/executor/validation/master.rb
+- lib/entangler/logger.rb
 - lib/entangler/version.rb
 homepage: https://github.com/daveallie/entangler
 licenses:
@@ -136,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.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Two way file syncer using platform native notify.

data/.gitignore

@@ -1,11 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/log/
-*.gem

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.rubocop.yml

@@ -1,9 +0,0 @@
-AllCops:
-  DisplayCopNames: true
-  ExtraDetails: true
-
-Metrics/LineLength:
-  Max: 120
-
-Style/Documentation:
-  Enabled: false

data/.travis.yml

@@ -1,20 +0,0 @@
-sudo: false
-language: ruby
-os:
-  - linux
-  - osx
-rvm:
-  - 2.3.3
-  - ruby-head
-matrix:
-  include:
-  - os: osx
-    rvm: 2.2.5
-  - os: linux
-    rvm: 2.2.6
-  allow_failures:
-    - rvm: ruby-head
-before_install:
-  - gem install bundler -v 1.13.6
-install:
-  - bundle install --jobs=3 --retry=3

data/Rakefile

@@ -1,8 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-
-RuboCop::RakeTask.new(:rubocop)
-RSpec::Core::RakeTask.new(:spec)
-
-task default: [:rubocop, :spec]

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'entangler'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here