fx-bin 2.0.0__tar.gz → 2.2.0__tar.gz

{fx_bin-2.0.0 → fx_bin-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fx-bin
-Version: 2.0.0
+Version: 2.2.0
 Summary: A common bin collection for my own usage
 Keywords: fx_bin
 Author: Frank Xu

{fx_bin-2.0.0 → fx_bin-2.2.0}/fx_bin/__init__.py

@@ -15,4 +15,4 @@ try:
     __version__ = version("fx-bin")
 except Exception:
     # Fallback version in case package is not installed
-    __version__ = "2.0.0"
+    __version__ = "2.2.0"

{fx_bin-2.0.0 → fx_bin-2.2.0}/fx_bin/backup.py

@@ -15,6 +15,7 @@ import shutil
 import tarfile
 from datetime import datetime
 from pathlib import Path
+from typing import Optional
 
 from .common import (
     generate_timestamp,
@@ -47,14 +48,14 @@ def get_base_name(filename: str) -> str:
 
 def backup_file(
     source_path: str,
-    backup_dir: str = "backups",
+    backup_dir: Optional[str] = None,
     timestamp_format: str = DEFAULT_TIMESTAMP_FORMAT,
 ) -> str:
     """Create a timestamped backup of a file.
 
     Args:
         source_path: Path to the file to backup
-        backup_dir: Directory to store the backup (default: 'backups')
+        backup_dir: Directory to store the backup (default: None = same level as source)
         timestamp_format: Format string for timestamp (default: '%Y%m%d%H%M%S')
 
     Returns:
@@ -65,6 +66,8 @@ def backup_file(
 
     Examples:
         >>> backup_file("document.txt")  # doctest: +SKIP
+        'document_20250104120000.txt'
+        >>> backup_file("document.txt", backup_dir="backups")  # doctest: +SKIP
         'backups/document_20250104120000.txt'
     """
     if not os.path.exists(source_path):
@@ -78,8 +81,12 @@ def backup_file(
     timestamp = generate_timestamp(timestamp_format, now=datetime.now())
     backup_filename = f"{base_name}_{timestamp}{ext}"
 
-    backup_dir_path = Path(backup_dir)
-    backup_dir_path.mkdir(parents=True, exist_ok=True)
+    # NEW DEFAULT: Same level as source, unless explicit backup_dir provided
+    if backup_dir is None:
+        backup_dir_path = source_path_obj.parent  # Parent directory of source
+    else:
+        backup_dir_path = Path(backup_dir)
+        backup_dir_path.mkdir(parents=True, exist_ok=True)
 
     backup_path = backup_dir_path / backup_filename
     if backup_path.exists():
@@ -92,7 +99,7 @@ def backup_file(
 
 def backup_directory(
     source_path: str,
-    backup_dir: str = "backups",
+    backup_dir: Optional[str] = None,
     timestamp_format: str = DEFAULT_TIMESTAMP_FORMAT,
     compress: bool = False,
 ) -> str:
@@ -100,7 +107,7 @@ def backup_directory(
 
     Args:
         source_path: Path to the directory to backup
-        backup_dir: Directory to store the backup (default: 'backups')
+        backup_dir: Directory to store the backup (default: None = same level as source)
         timestamp_format: Format string for timestamp (default: '%Y%m%d%H%M%S')
         compress: Whether to compress as .tar.xz (default: False)
 
@@ -116,9 +123,11 @@ def backup_directory(
 
     Examples:
         >>> backup_directory("mydir/")  # doctest: +SKIP
-        'backups/mydir_20250104120000/'
+        'mydir_20250104120000/'
         >>> backup_directory("mydir/", compress=True)  # doctest: +SKIP
-        'backups/mydir_20250104120000.tar.xz'
+        'mydir_20250104120000.tar.xz'
+        >>> backup_directory("mydir/", backup_dir="backups")  # doctest: +SKIP
+        'backups/mydir_20250104120000/'
     """
     if not os.path.exists(source_path):
         raise FileNotFoundError(f"Source directory not found: {source_path}")
@@ -131,7 +140,7 @@ def backup_directory(
 
 def _backup_directory_uncompressed(
     source_path: str,
-    backup_dir: str,
+    backup_dir: Optional[str],
     timestamp_format: str,
 ) -> str:
     """Create uncompressed directory backup."""
@@ -141,8 +150,12 @@ def _backup_directory_uncompressed(
     timestamp = generate_timestamp(timestamp_format, now=datetime.now())
     backup_dirname = f"{dir_name}_{timestamp}"
 
-    backup_dir_path = Path(backup_dir)
-    backup_dir_path.mkdir(parents=True, exist_ok=True)
+    # NEW DEFAULT: Same level as source, unless explicit backup_dir provided
+    if backup_dir is None:
+        backup_dir_path = source_path_obj.parent  # Parent directory of source
+    else:
+        backup_dir_path = Path(backup_dir)
+        backup_dir_path.mkdir(parents=True, exist_ok=True)
 
     backup_path = backup_dir_path / backup_dirname
     if backup_path.exists():
@@ -155,7 +168,7 @@ def _backup_directory_uncompressed(
 
 
 def _backup_directory_compressed(
-    source_path: str, backup_dir: str, timestamp_format: str
+    source_path: str, backup_dir: Optional[str], timestamp_format: str
 ) -> str:
     """Create compressed directory backup as .tar.xz."""
     source_path_obj = Path(source_path)
@@ -164,8 +177,12 @@ def _backup_directory_compressed(
     timestamp = generate_timestamp(timestamp_format, now=datetime.now())
     backup_filename = f"{dir_name}_{timestamp}.tar.xz"
 
-    backup_dir_path = Path(backup_dir)
-    backup_dir_path.mkdir(parents=True, exist_ok=True)
+    # NEW DEFAULT: Same level as source, unless explicit backup_dir provided
+    if backup_dir is None:
+        backup_dir_path = source_path_obj.parent  # Parent directory of source
+    else:
+        backup_dir_path = Path(backup_dir)
+        backup_dir_path.mkdir(parents=True, exist_ok=True)
 
     backup_path = backup_dir_path / backup_filename
     if backup_path.exists():

{fx_bin-2.0.0 → fx_bin-2.2.0}/fx_bin/cli.py

@@ -337,11 +337,6 @@ def replace(search_text, replace_text, filenames):
 
 @cli.command()
 @click.argument("path", type=click.Path(exists=True))
-@click.option(
-    "--backup-dir",
-    default="backups",
-    help="Directory to store backups (default: 'backups')",
-)
 @click.option(
     "--compress",
     is_flag=True,
@@ -355,15 +350,16 @@ def replace(search_text, replace_text, filenames):
 )
 def backup(
     path: str,
-    backup_dir: str,
     compress: bool,
     timestamp_format: Optional[str],
 ) -> int:
     """Create a timestamped backup of a file or directory.
 
     Examples:
-        fx backup file.txt             # Backup file.txt to backups/
-        fx backup mydir/ --compress    # Backup directory as .tar.xz
+        fx backup file.txt          # Backup to file_timestamp.txt (same level)
+        fx backup mydir/ --compress # Backup to mydir_timestamp.tar.xz
+
+    Backups are created in the same directory as the source by default.
     """
     from . import backup as backup_module
     from pathlib import Path
@@ -373,11 +369,9 @@ def backup(
         path_obj = Path(path)
 
         if path_obj.is_file():
-            result = backup_module.backup_file(path, backup_dir, ts_format)
+            result = backup_module.backup_file(path, None, ts_format)
         else:
-            result = backup_module.backup_directory(
-                path, backup_dir, ts_format, compress
-            )
+            result = backup_module.backup_directory(path, None, ts_format, compress)
 
         click.echo(f"Backup created: {result}")
 

{fx_bin-2.0.0 → fx_bin-2.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fx-bin"
-version = "2.0.0"
+version = "2.2.0"
 description = "A common bin collection for my own usage"
 authors = ["Frank Xu <frank@frankxu.me>"]
 readme = "README.md"
@@ -157,10 +157,17 @@ version_variables = [
     "fx_bin/__init__.py:__version__",
 ]
 branch = "main"
-upload_to_pypi = false
+upload_to_pypi = false  # We handle PyPI upload manually in workflow
 build_command = "pip install poetry && poetry build"
 commit_parser = "conventional"
 
+# GitHub Release Settings
+# Semantic-release creates GitHub Release with auto-generated changelog
+upload_to_repository = true  # Creates GitHub Release
+repository_user = "frankyxhl"
+repository_name = "fx_bin"
+remove_dist = false  # Keep dist files for manual upload to release
+
 [tool.semantic_release.commit_parser_options]
 minor_tags = ["feat"]
 patch_tags = ["fix", "perf"]