Merge pull request #417 from anti-social/dev/copy_glob

Support glob rules for Copy and Depends commands #389

Author: tailhook

.gitignore

@@ -17,7 +17,7 @@ todo.txt
 /alpine-keys.apk
 /alpine
 
-/target
+target
 
 /tests/image/images
 /tests/image/nginx

.travis.yml

@@ -40,7 +40,7 @@ script:
     tests=($(echo $TESTS))
     for test in ${tests[@]}; do
       if [[ $test = cargo ]]; then
-        vagga -E VAGGA_VERSION=v0.0.0-test _run rust-musl cargo test
+        vagga -E VAGGA_VERSION=v0.0.0-test _run rust-musl cargo test --all
       else
         vagga \
           -E UBUNTU_MIRROR=http://mirrors.us.kernel.org/ubuntu/ \

Cargo.lock

@@ -3,6 +3,9 @@ name = "vagga"
 version = "0.7.2"
 authors = ["Paul Colomiets"]
 
+[workspace]
+members = ["path_filter"]
+
 [dependencies]
 libc = "0.2.10"
 nix = "0.7.0"
@@ -37,6 +40,7 @@ quire = "0.2.1"
 lazy_static = "0.2.2"
 dir-signature = { git = "https://github.com/tailhook/dir-signature.git", rev = "9fd30db", optional=true }
 itertools = "0.5.8"
+path-filter = { version = "0.1.0", path = "path_filter"}
 
 [features]
 default = ["containers"]

Cargo.toml

@@ -662,11 +662,15 @@ Files and Directories
    path
      (required) Destination path
 
+   .. _ignore-regex:
+
    ignore-regex
      (default ``(^|/)\.(git|hg|svn|vagga)($|/)|~$|\.bak$|\.orig$|^#.*#$``)
      Regular expression of paths to ignore. Default regexp ignores common
      revision control folders and editor backup files.
 
+   .. _include-regex:
+
    include-regex
      (default ``None``)
      Regular expression of paths to include. When path matches both ignore and
@@ -682,6 +686,57 @@ Files and Directories
      unmapped users (the ones that don't belong to user's subuid/subgid range),
      will be set to ``nobody`` (65535).
 
+   .. _rules:
+
+   rules
+     Leverages glob patterns instead of regular expressions to match paths.
+     This option conflicts with ``ignore-regex`` and ``include-regex`` options.
+
+     The rules are similar to those which is used in
+     `.gitignore <https://git-scm.com/docs/gitignore>`_ file but meaning of
+     include/exclude rules is opposite. Also there are several differences:
+
+     * Include patterns **must** be absolute so they have to start with
+       a leading slash. This is done for performance reasons to exclude
+       unknown directories from traversing. If you really want to match relative
+       paths you can prepend pattern with a slash followed by two consecutive
+       asterisks. Thus ``/**/*.py`` pattern will match ``test.py``,
+       ``dir/main.py``, ``dir/subdir/test.py`` paths and so on.
+     * ``!`` prefix negates the pattern. Negative patterns can be relative.
+       Unlike `.gitignore` patterns it is possible to include a file when its
+       parent directory was excluded. For instance rules
+       ``["!dir", "/dir/*.py"]`` will match all python files inside the ``dir``
+       directory.
+     * If there is no matched files inside a directory the directory itself
+       won't be copied.
+     * If the pattern ends with a slash, it will match only with a direcotory
+       and paths underneath it. Also ``/dir/`` pattern will copy ``dir``
+       directory even if it is empty.
+     * Empty rules will match all underneath paths. But if you add only exclude
+       rules no path will be matched. So you should explicitly add at least one
+       include rule:
+
+       ``[]`` will match all paths
+
+       ``["!dir/"]`` will match nothing
+
+       ``["!dir/", "/"]`` will match all paths except ``dir`` directories
+
+     By default there are some ignore rules that correspond ``ignore-regex``
+     expression:
+       ``["!.git/", "!.hg/", "!.svn/", "!.vagga/", "!*.bak", "!*.orig", "!*~",
+       "!#*#", "!.#*"]``
+
+     .. versionadded:: 0.7.3
+
+   .. _no-default-rules:
+
+   no-default-rules
+     Disables default ignore rules which are given above. The option only works
+     in pair with ``rules`` option.
+
+     .. versionadded:: 0.7.3
+
    .. warning:: If the source directory starts with `/work` all the files are
       read and checksummed on each run of the application in the container. So
       copying large directories for this case may influence container startup
@@ -782,6 +837,25 @@ Meta Data
    if it's temporary container that depends on some generated file (sometimes
    useful for tests).
 
+   Options:
+
+   path
+     (required) Relative path to directory or file inside ``/work`` directory.
+     Matched files and directories will be checksummed to get the version of
+     the container.
+
+   ignore-regex
+     See `ignore-regex`_
+
+   include-regex
+     See `include-regex`_
+
+   rules
+     See `rules`_
+
+   no-default-rules
+     See `no-default-rules`_
+
 
 Sub-Containers
 ==============