dfsync 0.4.8__tar.gz → 0.4.9__tar.gz

{dfsync-0.4.8 → dfsync-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfsync
-Version: 0.4.8
+Version: 0.4.9
 Summary: 
 Author: Mihai Balint
 Author-email: balint.mihai@gmail.com

{dfsync-0.4.8 → dfsync-0.4.9}/dfsync/filters.py

@@ -1,4 +1,5 @@
-import black, fnmatch
+import black
+import fnmatch
 import os.path
 import git.exc
 import subprocess
@@ -111,6 +112,10 @@ class UntrackedGitFilesFilter(LoggingFilter):
         self._repos = {}
         self._is_repo_initialized = {}
         self._untracked_and_ignored_files = {}
+        self._should_filter_untracked_files = True
+
+    def set_should_filter_untracked_files(self, should_filter_untracked_files: bool = True):
+        self._should_filter_untracked_files = should_filter_untracked_files
 
     def get_untracked_and_ignored_files(self):
         flat_files = []
@@ -175,13 +180,17 @@ class UntrackedGitFilesFilter(LoggingFilter):
             self._ignore(src_file_path, "GIT repo internals")
             return True
 
-        for rel_file_path in repo.untracked_files:
-            abs_file_path = os.path.join(repo.working_dir, rel_file_path)
-            if src_abs_path == abs_file_path:
-                self._ignore(src_file_path, "Untracked GIT file")
-                return True
+        if self._should_filter_untracked_files and self._is_untracked_file(repo, src_abs_path):
+            self._ignore(src_file_path, "Untracked GIT file")
+            return True
+
         return False
 
+    def _is_untracked_file(self, repo, src_abs_path):
+        return any(
+            src_abs_path == os.path.join(repo.working_dir, rel_file_path) for rel_file_path in repo.untracked_files
+        )
+
 
 USER_FILTERS = [EmacsBufferFilter(), PythonBlackFilter()]
 GIT_FILTER = UntrackedGitFilesFilter()
@@ -215,3 +224,7 @@ def add_user_filter(f: LoggingFilter):
 
 def add_user_ignored_patterns_filter(patterns: [str]):
     add_user_filter(UserConfigFilter(patterns))
+
+
+def set_ignore_untracked_files(should_ignore_untracked_files: bool):
+    GIT_FILTER.set_should_filter_untracked_files(should_ignore_untracked_files)

{dfsync-0.4.8 → dfsync-0.4.9}/dfsync/monitor.py

@@ -12,6 +12,7 @@ from functools import partial
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 
+import dfsync.filters as filters
 from dfsync.backends import rsync_backend, kube_backend
 from dfsync.distribution import (
     get_installed_version,
@@ -21,7 +22,6 @@ from dfsync.distribution import (
     is_installed_in_editable_mode,
     update_package,
 )
-from dfsync.filters import add_user_ignored_patterns_filter, ALL_FILTERS
 from dfsync.config import read_config
 from dfsync.char_ui import KeyController
 from dfsync.kube_credentials import contextualize_kube_credentials, update_local_kube_config, normalized_k8s_url
@@ -54,7 +54,7 @@ class FileChangedEventHandler(ControlledThreadedOperation, FileSystemEventHandle
         **kwargs,
     ):
         super().__init__()
-        self.filters = [*ALL_FILTERS]
+        self.filters = [*filters.ALL_FILTERS]
 
         self.backend = backend
         self.backend_options = kwargs
@@ -263,6 +263,10 @@ def version():
     """
     Print the currently installed version
     """
+    _version()
+
+
+def _version():
     installed_version = get_installed_version()
     click.echo(f"{installed_version}")
 
@@ -275,6 +279,16 @@ def version():
         click.echo(f"Latest version is {latest_version}, please update using `dfsync self-update`")
 
 
+@main.command(name="help", context_settings=dict(ignore_unknown_options=True))
+@click.option("--help", is_flag=True, default=False, hidden=True)
+def help(help):
+    """
+    Print the usage/help for dfsync
+    """
+    with click.Context(sync, info_name="dfsync") as ctx:
+        click.echo(sync.get_help(ctx))
+
+
 @main.command()
 def self_update():
     """
@@ -309,11 +323,15 @@ def import_kube_host(kube_host=None, credentials=None):
 @main.command()
 @click.argument("source", nargs=-1)
 @click.argument("destination", default="", nargs=1)
-@click.option("--supervisor/--no-supervisor", default=False, help="Try to install supervisor in container", type=bool)
+@click.option("--supervisor", is_flag=True, default=False, help="Try to install supervisor in container")
 @click.option("--kube-host", default=None, help="Kubernetes api host server address/hostname", type=str)
 @click.option("--pod-timeout", default=30, help="Pod reconfiguration timeout (default is 30 seconds)", type=int)
 @click.option("--full-sync/--no-full-sync", default=True, help="On startup, sync all files to destination", type=bool)
-def sync(source, destination, supervisor, kube_host, pod_timeout, full_sync):
+@click.option("--version", is_flag=True, default=False, help="Print the currently installed version")
+@click.option(
+    "--sync-git-untracked", is_flag=True, default=False, help="Sync git-untracked files instead of ignoring them"
+)
+def sync(source, destination, supervisor, kube_host, pod_timeout, full_sync, version, sync_git_untracked):
     """
     Watches a folder for changes and propagates all file changes to a destination.
 
@@ -353,7 +371,14 @@ def sync(source, destination, supervisor, kube_host, pod_timeout, full_sync):
 
     paths = ["."] if len(source) == 0 else source
     config = read_config(destination, *paths)
-    add_user_ignored_patterns_filter(config.ignore_files)
+    filters.add_user_ignored_patterns_filter(config.ignore_files)
+
+    if sync_git_untracked:
+        filters.set_ignore_untracked_files(False)
+
+    if version:
+        _version()
+        return
 
     destination_dir = destination
     if len(source) == 0 and config.destination and not has_destination_optics(destination):

{dfsync-0.4.8 → dfsync-0.4.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dfsync"
-version = "0.4.8"
+version = "0.4.9"
 description = ""
 authors = ["Mihai Balint <balint.mihai@gmail.com>"]