entangler 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367499550d388ad3f9642abcf1d7afc1742fd938
-  data.tar.gz: 1e928995f5fb7ef1c5d22d8f1b20813bdfb00d84
+  metadata.gz: b4502e99a42282d8f8c48f7c2cd1097bece8b357
+  data.tar.gz: 291923c77737fa3922341d61124085f23e7ddae9
 SHA512:
-  metadata.gz: b704a2c97c418c6fc588812bf9f854f7cb14c54d50d3da9ec5d2466fb3c113f94fa6ad6af807584f41595d6b61ed04f7ad5890a02bc683c56caf5f2596fcd639
-  data.tar.gz: 69ca0e83d1b1ac3d0dbb0e6bf6a3f670558cad26ad5b1d761135bb5c9366880ba3ad033625f45371e4eab09587c2fc7b718c6a65ea23fb25be16b26b0123c86b
+  metadata.gz: 3ef8fc38e33759d2b88e65d4348a6bc60d9f0ae2e9777b7b2e812ae874205401ea2010346bf46375be6680d03eddb1b18483f462da3a4e5a56c6f26fea5e5652
+  data.tar.gz: 7809f15d79a760d0ad1273080ac66c018c2778319ad0d1f744bfe6ed9b5007402a46ca2f7d35e2cfa1bb7cacd578a261b56d297f220854d106013a9242d90f98

data/README.md

@@ -18,7 +18,7 @@ $ entangler master /some/base/path user@remote:/some/remote/path
 
 ```
 $ entangler -h
-Entangler v1.0.0.beta2
+Entangler v1.0.0.beta3
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
@@ -38,7 +38,7 @@ Options:
 
 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(?:\/[^\/]+)+/'` will match all sub-directories of `.git/`, but not the files in `.git`.
+have to use regex. `-i '/^\.git(?:\/[^\/]+)+$/'` 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/exe/entangler

@@ -54,7 +54,10 @@ end
 if mode == 'master'
   remote_information = ARGV.shift
 
-  raise 'Missing destination information' unless remote_information
+  unless remote_information
+    puts 'Missing destination information'
+    exit 1
+  end
 
   user = host = path = error = nil
   remote_mode = false
@@ -89,7 +92,7 @@ if options[:ignore]
   opts[:ignore] = options[:ignore].map do |opt|
     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

data/lib/entangler/errors.rb

@@ -0,0 +1,5 @@
+module Entangler
+  class EntanglerError < StandardError; end
+  class ValidationError < EntanglerError; end
+  class VersionMismatchError < EntanglerError; end
+end

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

@@ -40,13 +40,11 @@ module Entangler
 
         def listener
           @listener ||= begin
-            l = Listen::Listener.new(base_dir) do |modified, added, removed|
+            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
-            l.ignore!(@opts[:ignore])
-            l
           end
         end
 

data/lib/entangler/executor/base.rb

@@ -11,15 +11,15 @@ module Entangler
       attr_reader :base_dir
 
       def initialize(base_dir, opts = {})
+        validate_base_dir(base_dir)
         @base_dir = File.realpath(File.expand_path(base_dir))
         @recently_received_paths = []
         @listener_pauses = [false, false]
         @opts = opts
-        @opts[:ignore] = [/^\.git(?:\/[^\/]+)*/] unless @opts.key?(:ignore)
+        @opts[:ignore] = [%r{^\.git(?:/[^/]+)*$}] unless @opts.key?(:ignore)
         @opts[:ignore] << /^\.entangler.*/
 
         validate_opts
-        logger.info('Starting executor')
       end
 
       def generate_abs_path(rel_path)
@@ -31,19 +31,19 @@ module Entangler
       end
 
       def run
+        logger.info('Starting executor')
         start_listener
         start_remote_io
         Signal.trap('INT') { kill_off_threads }
         wait_for_threads
       ensure
         stop_listener
+        logger.info('Stopping entangler')
       end
 
       protected
 
-      def validate_opts
-        raise "Base directory doesn't exist" unless Dir.exist?(base_dir)
-      end
+      def validate_opts; end
 
       def send_to_remote(msg = {})
         Marshal.dump(msg, @remote_writer)
@@ -61,6 +61,11 @@ module Entangler
       def log_dir
         File.join(base_dir, '.entangler', 'log')
       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

data/lib/entangler/executor/master.rb

@@ -27,24 +27,30 @@ module Entangler
       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]))
-        raise "Destination directory can't be the same as the base directory" if @opts[:remote_base_dir] == base_dir
-        raise "Destination directory doesn't exist" unless Dir.exist?(@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 'Missing remote base dir' unless keys.include?(:remote_base_dir)
-        raise 'Missing remote user' unless keys.include?(:remote_user)
-        raise 'Missing remote host' unless keys.include?(:remote_host)
+        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 'Cannot connect to remote' if res.empty?
-        raise 'Remote base dir invalid' unless res.strip == 'ok'
+        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
@@ -53,8 +59,9 @@ module Entangler
         remote_version = Gem::Version.new(res.strip)
         local_version = Gem::Version.new(Entangler::VERSION)
         return unless major_version_mismatch?(local_version, remote_version)
-        raise 'Entangler version too far apart, please update either local or remote Entangler.' \
+        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)

data/lib/entangler/version.rb

@@ -1,3 +1,3 @@
 module Entangler
-  VERSION = '1.0.0.beta2'.freeze
+  VERSION = '1.0.0.beta3'.freeze
 end

data/lib/entangler.rb

@@ -1,4 +1,5 @@
 require_relative 'entangler/version'
+require_relative 'entangler/errors'
 require_relative 'entangler/entangled_file'
 
 module Entangler

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Dave Allie
@@ -117,6 +117,7 @@ files:
 - exe/entangler
 - lib/entangler.rb
 - lib/entangler/entangled_file.rb
+- lib/entangler/errors.rb
 - lib/entangler/executor/background/base.rb
 - lib/entangler/executor/background/master.rb
 - lib/entangler/executor/base.rb