Improved package functionnality

Author: cyclotruc

pytest.ini

@@ -1,6 +1,6 @@
 [pytest]
 pythonpath = src
-testpaths = src/tests
+testpaths = src/gitingest/tests
 asyncio_mode = auto
 
 # Coverage configuration

src/gitingest/__init__.py

@@ -1,6 +1,6 @@
-from .ingest import ingest_from_query
+from .ingest_from_query import ingest_from_query
 from .clone import clone_repo
 from .parse_query import parse_query
+from .ingest import ingest
 
-
-__all__ = ["ingest_from_query", "clone_repo", "parse_query"]
+__all__ = ["ingest_from_query", "clone_repo", "parse_query", "ingest"]

src/gitingest/cli.py

@@ -2,7 +2,9 @@
 import pathlib
 import click
 
-from .ingest import analyze_codebase, DEFAULT_IGNORE_PATTERNS, MAX_FILE_SIZE
+from gitingest.ingest import ingest
+from gitingest.ingest_from_query import MAX_FILE_SIZE
+from gitingest.parse_query import DEFAULT_IGNORE_PATTERNS
 
 def normalize_pattern(pattern: str) -> str:
     pattern = pattern.strip()
@@ -12,61 +14,21 @@ def normalize_pattern(pattern: str) -> str:
     return pattern
 
 @click.command()
-@click.argument('path', type=click.Path(exists=True))
+@click.argument('source', type=str, required=True)
 @click.option('--output', '-o', default=None, help='Output file path (default: <repo_name>.txt in current directory)')
 @click.option('--max-size', '-s', default=MAX_FILE_SIZE, help='Maximum file size to process in bytes')
-@click.option('--ignore-pattern', '-i', multiple=True, help='Additional patterns to ignore')
-def main(path, output, max_size, ignore_pattern):
+@click.option('--exclude-pattern', '-e', multiple=True, help='Patterns to exclude')
+@click.option('--include-pattern', '-i', multiple=True, help='Patterns to include')
+def main(source, output, max_size, exclude_pattern, include_pattern):
     """Analyze a directory and create a text dump of its contents."""
     try:
-        # Convert path to absolute path
-        abs_path = os.path.abspath(path)
-        repo_name = os.path.basename(abs_path)
-        
         # Combine default and custom ignore patterns
-        ignore_patterns = list(DEFAULT_IGNORE_PATTERNS)
-        if ignore_pattern:
-            ignore_patterns.extend(ignore_pattern)
-            
-        # Check for .gitignore and add its patterns
-        gitignore_path = os.path.join(abs_path, '.gitignore')
-        if os.path.exists(gitignore_path):
-            with open(gitignore_path, 'r') as f:
-                for line in f:
-                    line = line.strip()
-                    # Skip empty lines and comments
-                    if line and not line.startswith('#'):
-                        normalized_pattern = normalize_pattern(line)
-                        ignore_patterns.append(normalized_pattern)
-
-        # If no output file specified, use repo name in current directory
-        if output is None:
-            output = f"{repo_name}.txt"
-            
-        # Create a query dict to match the expected format
-        query = {
-            'local_path': abs_path,
-            'subpath': '/',
-            'user_name': os.path.basename(os.path.dirname(abs_path)),
-            'repo_name': repo_name,
-            'ignore_patterns': ignore_patterns,
-            'include_patterns': [],
-            'pattern_type': 'exclude',
-            'max_file_size': max_size,
-            'branch': None,
-            'commit': None,
-            'type': 'tree',
-            'slug': repo_name
-        }
-            
-        # Run analysis
-        summary, tree, content = analyze_codebase(query)
+        exclude_patterns = list(exclude_pattern)
+        include_patterns = list(set(include_pattern))
 
-        # Write to file
-        with open(output, 'w') as f:
-            f.write(f"Summary:\n{summary}\n\n")
-            f.write(f"{tree}\n")
-            f.write(content)
+        if not output:
+            output = "digest.txt"
+        summary, tree, content = ingest(source, max_size, include_patterns, exclude_patterns, output=output)
 
         click.echo(f"Analysis complete! Output written to: {output}")
         click.echo("\nSummary:")