entangler 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fce99ceae57ea4c4ffcde6dda904c6bb030f98e
-  data.tar.gz: 9a9d36b04315449753ab3752053330e9e6f2e10f
+  metadata.gz: e3ef95e28e08db3d7ba05137821bfdf2ac9e0b45
+  data.tar.gz: 63c508ce43601ee0911e9027671ace3ec89e39cc
 SHA512:
-  metadata.gz: a2315af430ac4814b443e51ee0ae7433531475ccffeb283680c1604515b7e5dd41a17871fb1a9a72062fcc04a3568dd1c33caf8270828eec392dd5ce8d910c0c
-  data.tar.gz: 583b0a09e0abc0a211e020292e5a2eb2a149f12786d84f74ca1b05a412db212fef05081736d32273829f9f7e44a9e114ee16156b97ec0e8e39f3a5cc881a1152
+  metadata.gz: 4a78ef9e6108412dd28877afc9bfd423286d6ee4c61a83c63363311664bcac9cb9f50552ee4f44d70069d8a89adba3605f0e619505d6128c2c56087f6e767805
+  data.tar.gz: 89c9a6bb2c136167f29ff94783cc78f6e307b3987ae67d63629e8ce70f040ea277f83a2d299add9ce6c2103c457b4f4dbbd352801febd7dfff31531ccad30110

data/README.md

@@ -15,19 +15,32 @@ $ gem install entangler
 
 ```shell
 entangler master /some/base/path user@remote:/some/remote/path
+```
 
+```
 entangler -h
+Entangler v0.3.0
+
 Usage:
    entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
    entangler slave <base_dir> [options]
 
 Options:
+    -i, --ignore '/.git'             Ignore folder when syncing, string is regex if surrounded by '/'
+                                     All folders should be relative to the base sync directory, but should start with a '/'.
     -p, --port PORT                  Overwrite the SSH port (usually 22)
                                      (doesn't do anything in slave mode)
     -v, --version                    Show version number
     -h, --help                       Show this message
 ```
 
+### Ignoring folders
+
+If you specify string, instead of regex, it will match any folder 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 can use `-i '/^\/\.git\/[^\/]*/'` which will match any path starting with `/.git/`, but not `/.git` itself.
+
+You can specify multiple `-i` or `--ignore` flags to ignore multiple directories.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/entangler.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency "lib_ruby_diff", "~> 0.1"
+  spec.add_dependency "to_regexp", "~> 0.2"
 end

data/exe/entangler

@@ -1,14 +1,25 @@
 #!/usr/bin/env ruby
 require 'entangler'
 require 'optparse'
+require 'to_regexp'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage:\n   entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]\n   entangler slave <base_dir> [options]"
+  opts.banner = %Q(Entangler v#{Entangler::VERSION}
+
+Usage:
+   entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
+   entangler slave <base_dir> [options])
 
   opts.separator ""
   opts.separator "Options:"
 
+  opts.on("-i", "--ignore '/.git'", "Ignore folder when syncing, string is regex if surrounded by '/'",
+          "All folders should be relative to the base sync directory, but should start with a '/'.") do |ignore|
+    options[:ignore] ||= []
+    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
@@ -62,4 +73,10 @@ else
   opts = {mode: 'slave'}
 end
 
+if options[:ignore]
+  opts[:ignore] = options[:ignore].map do |opt|
+    opt.to_regexp(detect: true)
+  end
+end
+
 Entangler.run(base_dir, opts)

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

@@ -5,7 +5,8 @@ module Entangler
         protected
         def start_remote_slave
           require 'open3'
-          @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 = @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}\"")
           remote_err.close
         end
 

data/lib/entangler/executor/base.rb

@@ -16,7 +16,9 @@ module Entangler
         @notify_sleep = 0
         @exported_at = 0
         @opts = opts
-        @opts[:ignore] = [/^\/\.git.*/, /^\/\.entangler.*/, /^\/\.idea.*/, /^\/log.*/, /^\/tmp.*/] unless @opts.has_key?(:ignore)
+        @opts[:ignore] = [/^\/\.git.*/] unless @opts.has_key?(:ignore)
+        @opts[:ignore] << /^\/\.entangler.*/
+
         validate_opts
         logger.info("Starting executor")
       end

data/lib/entangler/executor/master.rb

@@ -28,7 +28,13 @@ module Entangler
 
       def perform_initial_rsync
         logger.info 'Running initial sync'
-        IO.popen("rsync -azv --exclude .git --exclude log --exclude .entangler --exclude tmp -e \"ssh -p #{@opts[:remote_port]}\" --delete #{base_dir}/ #{@opts[:remote_user]}@#{@opts[:remote_host]}:#{@opts[:remote_base_dir]}/").each do |line|
+        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]}
+        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]}/"
+
+        IO.popen(rsync_cmd).each do |line|
           logger.debug line.chomp
         end
         logger.debug 'Initial sync complete'

data/lib/entangler/version.rb

@@ -1,3 +1,3 @@
 module Entangler
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entangler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dave Allie
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: to_regexp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Two way file syncer using platform native notify and rdiff syncing.
 email:
 - dave@daveallie.com