From 7c7877795fe0598138a4cf7d1f16235b4c95e8b3 Mon Sep 17 00:00:00 2001
From: Waylon Walker <waylon@waylonwalker.com>
Date: Tue, 14 Mar 2023 08:15:19 -0500
Subject: [PATCH] 0.1.0 add support for .gitignore and --relative-imports (#1)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ignore .gitignore

* remove relative imports

* remove tmp

* rename template string

* rename template string

* format with black

* changelog

* Bump version: 0.0.0.dev1 → 0.0.0.dev2

* bump version

* Bump version: 0.1.0 → 0.2.0.dev0

* Bump version: 0.2.0.dev0 → 0.2.0.dev1

---------

Co-authored-by: autobump <autobump@users.noreply.github.com>
---
 .gitignore                                      |  3 +++
 ...nswers.yml => .pyflybygen-copier-answers.yml |  0
 CHANGELOG.md                                    |  5 +++++
 README.md                                       |  4 ++--
 pyflybygen/__about__.py                         |  2 +-
 pyflybygen/cli/app.py                           | 17 ++++++++++++++---
 pyproject.toml                                  |  5 +++--
 tmp.py                                          |  2 ++
 8 files changed, 30 insertions(+), 8 deletions(-)
 rename .{{package_name}}-copier-answers.yml => .pyflybygen-copier-answers.yml (100%)

diff --git a/.gitignore b/.gitignore
index 19e0f43..e1a3186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -496,6 +496,9 @@ poetry.toml
 # ruff
 .ruff_cache/
 
+# LSP config files
+pyrightconfig.json
+
 ### SublimeText ###
 # Cache files for Sublime Text
 *.tmlanguage.cache
diff --git a/.{{package_name}}-copier-answers.yml b/.pyflybygen-copier-answers.yml
similarity index 100%
rename from .{{package_name}}-copier-answers.yml
rename to .pyflybygen-copier-answers.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb014a6..6d9836c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0
+
+- feat ignore files in .gitignore
+- feat `--relative-imports` flag
+
 ## 0.0.0
 
 init
diff --git a/README.md b/README.md
index a81e53d..6141d67 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 
 Generates pyflyby configurations for your project based on existing imports.
 
-[![PyPI - Version](https://img.shields.io/pypi/v/{{ package_name }}.svg)](https://pypi.org/project/{{ package_name }})
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/{{ package_name }}.svg)](https://pypi.org/project/{{ package_name }})
+[![PyPI - Version](https://img.shields.io/pypi/v/pyflybygen.svg)](https://pypi.org/project/pyflybygen)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pyflybygen.svg)](https://pypi.org/project/pyflybygen)
 
 ---
 
diff --git a/pyflybygen/__about__.py b/pyflybygen/__about__.py
index 6d1bde0..fbb820c 100644
--- a/pyflybygen/__about__.py
+++ b/pyflybygen/__about__.py
@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present Waylon S. Walker <waylon@waylonwalker.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.0"
+__version__ = "0.2.0.dev1"
diff --git a/pyflybygen/cli/app.py b/pyflybygen/cli/app.py
index 300b39b..2592fcd 100644
--- a/pyflybygen/cli/app.py
+++ b/pyflybygen/cli/app.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 
 import more_itertools
+import pathspec
 import typer
 
 from pyflybygen.cli.common import verbose_callback
@@ -48,10 +49,20 @@ def main(
         callback=verbose_callback,
         help="show the log messages",
     ),
+    relative_imports: bool = typer.Option(
+        False,
+        help="include relative imports",
+    ),
 ) -> None:
-    imports = more_itertools.flatten(
-        [get_imports(p.read_text()) for p in Path(".").glob("**/*.py")]
-    )
+    lines = []
+    if Path(".gitignore").exists():
+        lines.extend(Path(".gitignore").read_text().splitlines())
+    spec = pathspec.PathSpec.from_lines("gitwildmatch", lines)
+    files = Path(".").glob("**/*.py")
+    files = [file for file in files if not spec.match_file(str(file))]
+    imports = more_itertools.flatten([get_imports(p.read_text()) for p in files])
+    if not relative_imports:
+        imports = [i for i in imports if "from ." not in i]
     print("\n".join(set(imports)))
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 8db8537..012e08c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,8 +30,7 @@ dependencies = [
   "anyconfig",
   "tree_sitter_languages",
   'more_itertools',
-  'coverage',
-  'coverage-rich',
+  'pathspec',
 ]
 dynamic = ["version"]
 
@@ -58,6 +57,8 @@ dependencies = [
   "pytest-rich",
   "ruff",
   "black",
+  'coverage',
+  'coverage-rich',
 ]
 [tool.hatch.envs.default.scripts]
 test = "coverage run -m pytest"
diff --git a/tmp.py b/tmp.py
index 7f7b969..fb6bacf 100644
--- a/tmp.py
+++ b/tmp.py
@@ -1,5 +1,7 @@
 from pathlib import Path
 
+from .pyflybygen import pyflybygen
+
 statements = """
 from __future__ import (absolute_import,
                         division)