entangler 1.0.0.beta1 → 1.0.0.beta2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 967e19ece113d7aa2359cf932a74e53ceb422ea6
4
- data.tar.gz: 822f1cbd484e5a775de97f0d6bff6010312a4154
3
+ metadata.gz: 367499550d388ad3f9642abcf1d7afc1742fd938
4
+ data.tar.gz: 1e928995f5fb7ef1c5d22d8f1b20813bdfb00d84
5
5
  SHA512:
6
- metadata.gz: a5ba1871dc42e6d6aaf7616b8bc9b793b41d7fb150d1aaa501a453894ecb1fa0ad0c92d2e2385cad855a3c2f9ebf52a07100be2bc659ffc098e8717b0fe1e122
7
- data.tar.gz: 46bcd6e8caa9fa1ae0a999dbe3a7aef0a579b073ef8886db943bda8686f340f297131dc503815b4326fc6bdc5604d00d4eab5f2c1a72df2b3fb501a4f7e28069
6
+ metadata.gz: b704a2c97c418c6fc588812bf9f854f7cb14c54d50d3da9ec5d2466fb3c113f94fa6ad6af807584f41595d6b61ed04f7ad5890a02bc683c56caf5f2596fcd639
7
+ data.tar.gz: 69ca0e83d1b1ac3d0dbb0e6bf6a3f670558cad26ad5b1d761135bb5c9366880ba3ad033625f45371e4eab09587c2fc7b718c6a65ea23fb25be16b26b0123c86b
data/README.md CHANGED
@@ -18,7 +18,7 @@ $ entangler master /some/base/path user@remote:/some/remote/path
18
18
 
19
19
  ```
20
20
  $ entangler -h
21
- Entangler v1.0.0.beta1
21
+ Entangler v1.0.0.beta2
22
22
 
23
23
  Usage:
24
24
  entangler master <base_dir> <remote_user>@<remote_host>:<remote_base_dir> [options]
@@ -38,7 +38,7 @@ Options:
38
38
 
39
39
  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`
40
40
  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
41
- have to use regex. `-i '/^\.git\/[^\/]+\/.*/'` will match all sub-directories of `.git/`, but not the files in `.git`.
41
+ have to use regex. `-i '/^\.git(?:\/[^\/]+)+/'` will match all sub-directories of `.git/`, but not the files in `.git`.
42
42
 
43
43
  You can specify multiple `-i` or `--ignore` flags to ignore multiple paths.
44
44
 
data/exe/entangler CHANGED
@@ -89,7 +89,7 @@ if options[:ignore]
89
89
  opts[:ignore] = options[:ignore].map do |opt|
90
90
  if ToRegexp::String.literal? opt
91
91
  source, *rest = opt.as_regexp(detect: true)
92
- ::Regexp.new "^#{source}", *rest
92
+ ::Regexp.new "^#{source}(?:/[^/]+)*", *rest
93
93
  else
94
94
  opt.to_regexp(detect: true)
95
95
  end
@@ -15,7 +15,7 @@ module Entangler
15
15
  @recently_received_paths = []
16
16
  @listener_pauses = [false, false]
17
17
  @opts = opts
18
- @opts[:ignore] = [/^\.git.*/] unless @opts.key?(:ignore)
18
+ @opts[:ignore] = [/^\.git(?:\/[^\/]+)*/] unless @opts.key?(:ignore)
19
19
  @opts[:ignore] << /^\.entangler.*/
20
20
 
21
21
  validate_opts
@@ -1,3 +1,3 @@
1
1
  module Entangler
2
- VERSION = '1.0.0.beta1'.freeze
2
+ VERSION = '1.0.0.beta2'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: entangler
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.beta1
4
+ version: 1.0.0.beta2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dave Allie