pgmini-migrate 0.1.2__tar.gz → 0.1.3__tar.gz

{pgmini_migrate-0.1.2 → pgmini_migrate-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgmini-migrate
-Version: 0.1.2
+Version: 0.1.3
 Summary: A minimal PostgreSQL migration tool for Python
 Author-email: Nguyen Vu Duy Luan <nvdluan@gmail.com>
 License: Copyright (c) 2025 Nguyen Vu Duy Luan

{pgmini_migrate-0.1.2 → pgmini_migrate-0.1.3}/pgmini_migrate/cli.py

@@ -29,6 +29,7 @@ def load_env_file(env_path=".env"):
             # do not overwrite existing env set by host
             if k not in os.environ:
                 os.environ[k] = v
+                print(f"Loaded env {k} from {env_path}: {v}")
 
 
 def build_conninfo_from_args(args):
@@ -154,9 +155,7 @@ def get_next_version_str(migrations_root):
 def create_migration(migrations_root, description):
     desc = description.strip()
     # sanitize description
-    desc_clean = "_".join(
-        c for c in desc.lower().replace(" ", "_") if (c.isalnum() or c == "_")
-    )
+    desc_clean=desc.lower().replace(" ", "_").replace("-", "_")
     version = get_next_version_str(migrations_root)
     upgrade_name = f"{version}.{desc_clean}.upgrade.sql"
     downgrade_name = f"{version}.{desc_clean}.downgrade.sql"
@@ -269,11 +268,15 @@ def cmd_downgrade(args):
 
 def build_arg_parser():
     p = argparse.ArgumentParser(prog="pgmigrate", description="Simple PostgreSQL migration tool")
+
+    # NOTE: lấy default từ os.getenv() *tại thời điểm gọi*, không từ hằng module-level
+    migrations_default = os.getenv("MIGRATIONS_DIR", "migrations")
+
     p.add_argument("--env-file", default=".env", help="Path to .env file (default: .env)")
     p.add_argument(
         "--migrations",
-        default=DEFAULT_MIGRATIONS_DIR,
-        help=f"Root migrations dir (default: {DEFAULT_MIGRATIONS_DIR})",
+        default=migrations_default,
+        help=f"Root migrations dir (default: {migrations_default})",
     )
 
     # DB connection options (mutually override database_url)
@@ -303,16 +306,24 @@ def build_arg_parser():
 
 def main(argv=None):
     argv = argv if argv is not None else sys.argv[1:]
+
+    # -------------------------
+    # 1) pre-parse only --env-file
+    # -------------------------
+    pre_parser = argparse.ArgumentParser(add_help=False)
+    pre_parser.add_argument("--env-file", default=".env")
+    pre_args, _unknown = pre_parser.parse_known_args(argv)
+
+    # 2) load env file BEFORE building main parser so os.getenv picks values
+    if pre_args.env_file:
+        load_env_file(pre_args.env_file)
+
+    # 3) build the full parser (now os.getenv reflects .env content)
     parser = build_arg_parser()
-    args = parser.parse_args(argv)
 
-    # Load env file first (do not overwrite existing env vars)
-    if args.env_file:
-        load_env_file(args.env_file)
+    # 4) parse full args (using original argv)
+    args = parser.parse_args(argv)
 
-    # prefer CLI args, else env
-    # Re-populate db fields from env if not provided explicitly
-    # (build_conninfo handles database_url precedence)
     # Dispatch commands:
     if args.cmd == "create":
         desc = " ".join(args.description)
@@ -320,8 +331,6 @@ def main(argv=None):
         return
 
     # For commands that touch DB, ensure connection info exists
-    # Build conninfo now (will use args or environment)
-    # If neither database_url nor db_name provided, abort
     conninfo = build_conninfo_from_args(args)
     if not conninfo:
         print("No database connection info provided. Provide --database-url or host/name/user/password or set env vars.")

{pgmini_migrate-0.1.2 → pgmini_migrate-0.1.3}/pgmini_migrate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgmini-migrate
-Version: 0.1.2
+Version: 0.1.3
 Summary: A minimal PostgreSQL migration tool for Python
 Author-email: Nguyen Vu Duy Luan <nvdluan@gmail.com>
 License: Copyright (c) 2025 Nguyen Vu Duy Luan

{pgmini_migrate-0.1.2 → pgmini_migrate-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pgmini-migrate"
-version = "0.1.2"
+version = "0.1.3"
 description = "A minimal PostgreSQL migration tool for Python"
 readme = "README.md"
 license = { file = "LICENSE" }

{pgmini_migrate-0.1.2 → pgmini_migrate-0.1.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pgmini-migrate",
-    version="0.1.2",
+    version="0.1.3",
     packages=find_packages(),
     install_requires=["psycopg2-binary", 'psycopg', 'python-dotenv'],
     entry_points={