reposnap 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

reposnap/controllers/project_controller.py

@@ -1,9 +1,6 @@
-# src/reposnap/controllers/project_controller.py
-
 import logging
 from pathlib import Path
 from reposnap.core.file_system import FileSystem
-from reposnap.core.markdown_generator import MarkdownGenerator
 from reposnap.models.file_tree import FileTree
 import pathspec
 from typing import List, Optional
@@ -11,35 +8,33 @@ from typing import List, Optional
 class ProjectController:
     def __init__(self, args: Optional[object] = None):
         self.logger = logging.getLogger(__name__)
+        # Always determine repository root using Git (or cwd)
+        self.root_dir = self._get_repo_root().resolve()
         if args:
-            # Support both new 'paths' (multiple paths) and legacy 'path'
-            if hasattr(args, 'paths'):
-                input_paths = [Path(p) for p in args.paths]
-            else:
-                input_paths = [Path(args.path)]
             self.args = args
-            # Determine repository root (using provided paths’ common parent if available)
-            self.root_dir = self._get_repo_root().resolve()
-            # Convert provided paths to be relative to the repository root.
+            # Treat positional arguments as literal file/directory names.
+            input_paths = [Path(p) for p in (args.paths if hasattr(args, 'paths') else [args.path])]
             self.input_paths = []
             for p in input_paths:
-                try:
-                    candidate = (self.root_dir / p).resolve()
-                    rel = candidate.relative_to(self.root_dir)
-                    if rel != Path('.'):
-                        self.input_paths.append(rel)
-                except ValueError:
-                    self.logger.warning(f"Path {p} is not under repository root {self.root_dir}. Ignoring.")
+                candidate = (self.root_dir / p).resolve()
+                if candidate.exists():
+                    try:
+                        rel = candidate.relative_to(self.root_dir)
+                        if rel != Path('.'):
+                            self.input_paths.append(rel)
+                    except ValueError:
+                        self.logger.warning(f"Path {p} is not under repository root {self.root_dir}. Ignoring.")
+                else:
+                    self.logger.warning(f"Path {p} does not exist relative to repository root {self.root_dir}.")
             self.output_file: Path = Path(args.output).resolve() if args.output else self.root_dir / 'output.md'
             self.structure_only: bool = args.structure_only if hasattr(args, 'structure_only') else False
             self.include_patterns: List[str] = args.include if hasattr(args, 'include') else []
             self.exclude_patterns: List[str] = args.exclude if hasattr(args, 'exclude') else []
         else:
-            self.root_dir = Path('.').resolve()
+            self.args = None
             self.input_paths = []
-            self.output_file = Path('output.md').resolve()
+            self.output_file = self.root_dir / 'output.md'
             self.structure_only = False
-            self.args = None
             self.include_patterns = []
             self.exclude_patterns = []
         self.file_tree: Optional[FileTree] = None
@@ -49,25 +44,9 @@ class ProjectController:
 
     def _get_repo_root(self) -> Path:
         """
-        Determine the repository root. If arguments were provided and those paths exist,
-        use the common parent directory of all provided paths. Otherwise, fall back to the
-        git repository working tree directory (or current directory if not a git repo).
+        Determine the repository root using Git if available,
+        otherwise use the current directory.
         """
-        if self.args is not None:
-            candidate_paths = []
-            if hasattr(self.args, 'paths'):
-                for p in self.args.paths:
-                    candidate = Path(p).resolve()
-                    if candidate.exists():
-                        candidate_paths.append(candidate)
-            elif hasattr(self.args, 'path'):
-                candidate = Path(self.args.path).resolve()
-                if candidate.exists():
-                    candidate_paths.append(candidate)
-            if candidate_paths:
-                from os.path import commonpath
-                common = Path(commonpath([str(p) for p in candidate_paths]))
-                return common
         from git import Repo, InvalidGitRepositoryError
         try:
             repo = Repo(Path.cwd(), search_parent_directories=True)
@@ -104,25 +83,33 @@ class ProjectController:
         return files
 
     def collect_file_tree(self) -> None:
-        self.logger.info("Collecting files by walking the repository root.")
-        all_files = []
-        for path in self.root_dir.rglob("*"):
-            if path.is_file():
-                try:
-                    rel = path.relative_to(self.root_dir)
-                    all_files.append(rel)
-                except ValueError:
-                    continue
-        # Apply include/exclude filtering.
+        self.logger.info("Collecting files from Git tracked files if available.")
+        try:
+            from reposnap.core.git_repo import GitRepo
+            git_repo = GitRepo(self.root_dir)
+            all_files = git_repo.get_git_files()
+            self.logger.debug(f"Git tracked files: {all_files}")
+        except Exception as e:
+            self.logger.warning(f"Error obtaining Git tracked files: {e}.")
+            all_files = []
+        # If Git returns an empty list but files exist on disk, fall back to filesystem scan.
+        if not all_files:
+            file_list = [p for p in self.root_dir.rglob("*") if p.is_file()]
+            if file_list:
+                self.logger.info("Git tracked files empty, using filesystem scan fallback.")
+                all_files = []
+                for path in file_list:
+                    try:
+                        rel = path.relative_to(self.root_dir)
+                        all_files.append(rel)
+                    except ValueError:
+                        continue
         all_files = self._apply_include_exclude(all_files)
-        self.logger.debug(f"All files after include/exclude filtering: {all_files}")
+        self.logger.debug(f"All files after applying include/exclude: {all_files}")
         if self.input_paths:
             trees = []
             for input_path in self.input_paths:
-                subset = [
-                    f for f in all_files
-                    if f == input_path or f.parts[:len(input_path.parts)] == input_path.parts
-                ]
+                subset = [f for f in all_files if f == input_path or list(f.parts[:len(input_path.parts)]) == list(input_path.parts)]
                 self.logger.debug(f"Files for input path '{input_path}': {subset}")
                 if subset:
                     tree = FileSystem(self.root_dir).build_tree_structure(subset)
@@ -164,6 +151,7 @@ class ProjectController:
 
     def generate_output(self) -> None:
         self.logger.info("Starting Markdown generation.")
+        from reposnap.core.markdown_generator import MarkdownGenerator
         markdown_generator = MarkdownGenerator(
             root_dir=self.root_dir,
             output_file=self.output_file,
@@ -175,6 +163,7 @@ class ProjectController:
     def generate_output_from_selected(self, selected_files: set) -> None:
         self.logger.info("Generating Markdown from selected files.")
         pruned_tree = self.file_tree.prune_tree(selected_files)
+        from reposnap.core.markdown_generator import MarkdownGenerator
         markdown_generator = MarkdownGenerator(
             root_dir=self.root_dir,
             output_file=self.output_file,
@@ -194,14 +183,15 @@ class ProjectController:
         gitignore_path = self.root_dir / '.gitignore'
         if not gitignore_path.exists():
             for parent in self.root_dir.parents:
-                gitignore_path = parent / '.gitignore'
-                if gitignore_path.exists():
+                candidate = parent / '.gitignore'
+                if candidate.exists():
+                    gitignore_path = candidate
                     break
             else:
                 gitignore_path = None
         if gitignore_path and gitignore_path.exists():
             with gitignore_path.open('r') as gitignore:
-                patterns = gitignore.readlines()
+                patterns = [line.strip() for line in gitignore if line.strip() and not line.strip().startswith('#')]
             self.logger.debug(f"Loaded .gitignore patterns from {gitignore_path.parent}: {patterns}")
             return patterns
         else:

reposnap/models/file_tree.py

@@ -48,7 +48,8 @@ class FileTree:
                 if filtered_value:
                     filtered_subtree[key] = filtered_value
             else:
-                if not spec.match_file(current_path):
+                # Exclude the file if either the full path OR its basename matches a .gitignore pattern.
+                if not spec.match_file(current_path) and not spec.match_file(Path(current_path).name):
                     filtered_subtree[key] = value
         return filtered_subtree
 

{reposnap-0.6.2.dist-info → reposnap-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reposnap
-Version: 0.6.2
+Version: 0.6.3
 Summary: Generate a Markdown file with all contents of your project
 Author: agoloborodko
 License-File: LICENSE

{reposnap-0.6.2.dist-info → reposnap-0.6.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reposnap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reposnap/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reposnap/controllers/project_controller.py,sha256=qYsZL-8ZX6sqTdmJtVRMFnv0yHIUGk_fROMZnitwiTo,9513
+reposnap/controllers/project_controller.py,sha256=u3agILanSms5Gx4D5e6EWhHrb6B08saz5udct8yVS-s,9353
 reposnap/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reposnap/core/file_system.py,sha256=82gwvmgrsWf63paMrIz-Z0eqIjbqt9_-vujdXlJJoFE,1074
 reposnap/core/git_repo.py,sha256=2u_ILkV-Ur7qr1WHmHM2yg44Ggft61RsdbZLsZaQ5NU,1256
@@ -9,11 +9,11 @@ reposnap/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 reposnap/interfaces/cli.py,sha256=JzTNDibzuRRmnWg-gBfKJ2tSlh-NYSL_3q6J-Erjrr8,1374
 reposnap/interfaces/gui.py,sha256=pzWQbW55gBNZu4tXRdBFic39upGtYxew91FSiEvalj0,5421
 reposnap/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reposnap/models/file_tree.py,sha256=SQ1cKW066uh1F1BcF8AXuw4Q-l6rkybxjdJEcLFjewg,3052
+reposnap/models/file_tree.py,sha256=0WcSDbFH5pSZHyWxWtmz-FF4_ELnZ3Byz2iXN4Tpijw,3206
 reposnap/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reposnap/utils/path_utils.py,sha256=7072816LCP8Q8XBydn0iknmfrObPO_-2rFqpbAvPrjY,501
-reposnap-0.6.2.dist-info/METADATA,sha256=nZ4w5dZc3i0dk2GmcLPWdoF5pj7CO2ttce6s6-JoIFo,5348
-reposnap-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reposnap-0.6.2.dist-info/entry_points.txt,sha256=o3GyO7bpR0dujPCjsvvZMPv4pXNJlFwD49_pA1r5FOA,102
-reposnap-0.6.2.dist-info/licenses/LICENSE,sha256=Aj7WCYBXi98pvi723HPn4GDRyjxToNWb3PC6j1_lnPk,1069
-reposnap-0.6.2.dist-info/RECORD,,
+reposnap-0.6.3.dist-info/METADATA,sha256=wPRE4NKJuzwMKTyYD8e2nPUYUNjwM81kCEsVz18yWTY,5348
+reposnap-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reposnap-0.6.3.dist-info/entry_points.txt,sha256=o3GyO7bpR0dujPCjsvvZMPv4pXNJlFwD49_pA1r5FOA,102
+reposnap-0.6.3.dist-info/licenses/LICENSE,sha256=Aj7WCYBXi98pvi723HPn4GDRyjxToNWb3PC6j1_lnPk,1069
+reposnap-0.6.3.dist-info/RECORD,,