entangler 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a5a4bfb661a1b81041b316ccc19cf643e899fa
-  data.tar.gz: afd689dbbc2f8b14c3451382e759cbca4e0c9026
+  metadata.gz: bc0ae798eba13d9d1191ca253ed99d3545ec5c1a
+  data.tar.gz: 3846da80d6a40aa7bb4ade1a4840e99bfc50e5d9
 SHA512:
-  metadata.gz: 3f5e4f5949dbfcc45512231b6fcbcc27c6ae3ee9f2cbe3599e4d46f9b785231c0ae2e48f367ff3b2cae15202a0237144acbab568cf8a3fac70b3ac365daf9630
-  data.tar.gz: 94decc01d9838012e01c432cc507518b60a58be1c3b8d0417bc16aaa641bba518c6b1f1b59e90210fae5e43daac996a01d02ff8a6dcd638a714d7a23674cb240
+  metadata.gz: fbe7d30b14fd8778cb57a5051d19be6f5951aae93e227ffa66884337582af01064f18c434dac879b7a75c1a9ebb059df19c7ce089b037477a9fee036084a5f58
+  data.tar.gz: d4d93f058abd4dedf6ffc908bc2d56a3932b03de51a466d623cc2a8c7d1a4a964d13de619a240ed6fdb57cadaf544ecaa9bef1f129ed860b0149f5c38931daf3

data/README.md

@@ -19,11 +19,11 @@ entangler master /some/base/path user@remote:/some/remote/path
 
 ```
 entangler -h
-Entangler v0.3.0
+Entangler v0.4.0
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
-   entangler slave <base_dir> [options]
+   entangler master <base_dir> <other_synced_base_dir> [options]
 
 Options:
     -i, --ignore '/.git'             Ignore folder when syncing, string is regex if surrounded by '/'

data/exe/entangler

@@ -9,7 +9,7 @@ OptionParser.new do |opts|
 
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
-   entangler slave <base_dir> [options])
+   entangler master <base_dir> <other_synced_base_dir> [options])
 
   opts.separator ""
   opts.separator "Options:"
@@ -51,23 +51,31 @@ if mode == 'master'
   remote_information = ARGV.shift
 
   unless remote_information
-    raise 'Missing remote information'
+    raise 'Missing destination information'
     exit 1
   end
 
-  user, rest = remote_information.split('@', 2)
-  host, path = (rest || '').split(':', 2)
+  user = host = path = error = nil
+  remote_mode = false
+  if remote_information.match(/[^@]+@[^:]+:.+/)
+    remote_mode = true
+    user, rest = remote_information.split('@', 2)
+    host, path = (rest || '').split(':', 2)
+
+    error = 'Missing remote user' unless user
+    error = 'Missing remote host' unless host
+    error = 'Missing remote path' unless path
+  else
+    path = remote_information
+  end
 
-  error = nil
-  error = 'Missing remote user' unless user
-  error = 'Missing remote host' unless host
-  error = 'Missing remote path' unless path
   unless error.nil?
     puts error
     exit 1
   end
 
-  opts = {remote_base_dir: path, remote_user: user, remote_host: host}
+  opts = {remote_base_dir: path, remote_mode: remote_mode}
+  opts.merge!(remote_user: user, remote_host: host) if remote_mode
   opts[:remote_port] = options[:port] if options[:port]
 else
   opts = {mode: 'slave'}

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

@@ -6,7 +6,10 @@ module Entangler
         def start_remote_slave
           require 'open3'
           ignore_opts = @opts[:ignore].map{|regexp| "-i '#{regexp.inspect}'"}.join(' ')
-          @remote_writer, @remote_reader, remote_err, @remote_thread = Open3.popen3("ssh -q #{@opts[:remote_user]}@#{@opts[:remote_host]} -p #{@opts[:remote_port]} -C \"source ~/.rvm/environments/default && entangler slave #{@opts[:remote_base_dir]} #{ignore_opts}\"")
+          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
+
+          @remote_writer, @remote_reader, remote_err, @remote_thread = Open3.popen3(full_cmd)
           remote_err.close
         end
 

data/lib/entangler/executor/master.rb

@@ -17,13 +17,19 @@ module Entangler
       private
       def validate_opts
         super
-        raise 'Missing remote base dir' unless @opts.keys.include?(:remote_base_dir)
-        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'"`
-        raise 'Cannot connect to remote' if res.empty?
-        raise 'Remote base dir invalid' unless res.strip == 'ok'
+        if @opts[:remote_mode]
+          raise 'Missing remote base dir' unless @opts.keys.include?(:remote_base_dir)
+          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'"`
+          raise 'Cannot connect to remote' if res.empty?
+          raise 'Remote base dir invalid' unless res.strip == 'ok'
+        else
+          @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] == self.base_dir
+          raise "Destination directory doesn't exist" unless Dir.exists?(@opts[:remote_base_dir])
+        end
       end
 
       def perform_initial_rsync
@@ -32,7 +38,11 @@ module Entangler
         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]}
         exclude_args = exclude_folders.map{|path| "--exclude #{path}"}.join(' ')
-        rsync_cmd = "rsync -azv #{exclude_args} -e \"ssh -p #{@opts[:remote_port]}\" --delete #{base_dir}/ #{@opts[:remote_user]}@#{@opts[:remote_host]}:#{@opts[:remote_base_dir]}/"
+
+        ssh_settings = @opts[:remote_mode] ? "-e \"ssh -p #{@opts[:remote_port]}\"" : ''
+        remote_path = @opts[:remote_mode] ? "#{@opts[:remote_user]}@#{@opts[:remote_host]}:#{@opts[:remote_base_dir]}/" : "#{@opts[:remote_base_dir]}/"
+
+        rsync_cmd = "rsync -azv #{exclude_args} #{ssh_settings} --delete #{base_dir}/ #{remote_path}"
 
         IO.popen(rsync_cmd).each do |line|
           logger.debug line.chomp

data/lib/entangler/version.rb

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

data/lib/entangler.rb

@@ -6,7 +6,7 @@ module Entangler
     attr_accessor :executor
 
     def run(base_dir, opts = {})
-      opts = {mode: 'master'}.merge(opts)
+      opts = {mode: 'master', remote_mode: true}.merge(opts)
 
       require 'entangler/executor/base'
       if opts[:mode] == 'master'

data/lib/notifier/README.md

@@ -0,0 +1,3 @@
+The code in the following subdirectories comes from https://github.com/DmitryKoterov/dklab_realsync, unmodified.
+
+It is being redistrubuted under GPL, which it was originally provided under. For more information on GPL, please see https://www.gnu.org/licenses/gpl-3.0.en.html.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Dave Allie
@@ -109,6 +109,7 @@ files:
 - lib/entangler/executor/processing/base.rb
 - lib/entangler/executor/slave.rb
 - lib/entangler/version.rb
+- lib/notifier/README.md
 - lib/notifier/bin/darwin/notify
 - lib/notifier/bin/linux/notify
 - lib/notifier/src/darwin/BUILD