entangler 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc0ae798eba13d9d1191ca253ed99d3545ec5c1a
-  data.tar.gz: 3846da80d6a40aa7bb4ade1a4840e99bfc50e5d9
+  metadata.gz: 116d9b520b874e6c30aaac728a0d341547bfdd4f
+  data.tar.gz: e3981339b47c28b20c1510b6e97b32086e174a7e
 SHA512:
-  metadata.gz: fbe7d30b14fd8778cb57a5051d19be6f5951aae93e227ffa66884337582af01064f18c434dac879b7a75c1a9ebb059df19c7ce089b037477a9fee036084a5f58
-  data.tar.gz: d4d93f058abd4dedf6ffc908bc2d56a3932b03de51a466d623cc2a8c7d1a4a964d13de619a240ed6fdb57cadaf544ecaa9bef1f129ed860b0149f5c38931daf3
+  metadata.gz: 42aaecf1a355c18f5f44e09e76fc95ad1c4356b1930bee788386e5577f7d5a1f906cbdc5ea1e3c6e7617aa8735a16cb7dd977d17457e5d4573da232e7e0d7df7
+  data.tar.gz: 35f0c0b7be7c7984bf8d5215f4996b62d28cbf57afa21fc888087b44b768d40e2c594e2a5f21c5284012cf6d1a9b24ebde73ce752f8b5ae3ad28c07a1b9d5d36

data/README.md

@@ -14,12 +14,12 @@ $ gem install entangler
 ## Usage
 
 ```shell
-entangler master /some/base/path user@remote:/some/remote/path
+$ entangler master /some/base/path user@remote:/some/remote/path
 ```
 
 ```
-entangler -h
-Entangler v0.4.0
+$ entangler -h
+Entangler v0.4.1
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]

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

@@ -7,7 +7,8 @@ module Entangler
           require 'open3'
           ignore_opts = @opts[:ignore].map{|regexp| "-i '#{regexp.inspect}'"}.join(' ')
           entangler_cmd = "entangler slave #{@opts[:remote_base_dir]} #{ignore_opts}"
-          full_cmd = @opts[:remote_mode] ? "ssh -q #{@opts[:remote_user]}@#{@opts[:remote_host]} -p #{@opts[:remote_port]} -C \"source ~/.rvm/environments/default && #{entangler_cmd}\"" : entangler_cmd
+          ssh_cmd = generate_ssh_command("source ~/.rvm/environments/default && #{entangler_cmd}")
+          full_cmd = @opts[:remote_mode] ? ssh_cmd : entangler_cmd
 
           @remote_writer, @remote_reader, remote_err, @remote_thread = Open3.popen3(full_cmd)
           remote_err.close

data/lib/entangler/executor/master.rb

@@ -22,7 +22,7 @@ module Entangler
           raise 'Missing remote user' unless @opts.keys.include?(:remote_user)
           raise 'Missing remote host' unless @opts.keys.include?(:remote_host)
           @opts[:remote_port] ||= '22'
-          res = `ssh -q #{@opts[:remote_user]}@#{@opts[:remote_host]} -p #{@opts[:remote_port]} -C "[[ -d '#{@opts[:remote_base_dir]}' ]] && echo 'ok' || echo 'missing'"`
+          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'
         else
@@ -34,9 +34,15 @@ module Entangler
 
       def perform_initial_rsync
         logger.info 'Running initial sync'
-        all_folders = Dir.glob("#{base_dir}/**/*/", File::FNM_DOTMATCH).tap{|a| a.shift(1) }.find_all{|path| !path.end_with?("/./")}
-        all_ignore_matches = all_folders.map{|path| @opts[:ignore].map{|regexp| regexp.match("/#{path[0..-2]}")}.compact.first}.compact
-        exclude_folders = all_ignore_matches.map{|match| match[0]}.uniq.map{|path| path[1..-1]}
+        local_folders = `find #{base_dir} -type d`.split("\n").tap{|a| a.shift(1) }.map{|path| path.sub(base_dir, '') }
+
+        remote_find_cmd = "find #{@opts[:remote_base_dir]} -type d"
+        raw_remote_folders = `#{@opts[:remote_mode] ? generate_ssh_command(remote_find_cmd) : remote_find_cmd}`
+        remote_folders = raw_remote_folders.split("\n").tap{|a| a.shift(1) }.map{|path| path.sub(@opts[:remote_base_dir], '') }
+
+        all_folders = remote_folders | local_folders
+        ignore_matches = all_folders.map{|path| @opts[:ignore].map{|regexp| (regexp.match(path) || [])[0]}.compact.first}.compact.uniq
+        exclude_folders = ignore_matches.map{|path| path[1..-1]}
         exclude_args = exclude_folders.map{|path| "--exclude #{path}"}.join(' ')
 
         ssh_settings = @opts[:remote_mode] ? "-e \"ssh -p #{@opts[:remote_port]}\"" : ''
@@ -49,6 +55,10 @@ module Entangler
         end
         logger.debug 'Initial sync complete'
       end
+
+      def generate_ssh_command(cmd)
+        "ssh -q #{@opts[:remote_user]}@#{@opts[:remote_host]} -p #{@opts[:remote_port]} -C \"#{cmd}\""
+      end
     end
   end
 end

data/lib/entangler/version.rb

@@ -1,3 +1,3 @@
 module Entangler
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dave Allie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Two way file syncer using platform native notify and rdiff syncing.