semtag 0.2.0__tar.gz → 0.2.2__tar.gz

semtag-0.2.2/.github/workflows/publish.yml

@@ -0,0 +1,128 @@
+name: Publish to PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+      - '[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-*'
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write  # Required for creating GitHub releases
+      id-token: write  # Required for trusted publishing
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Required for setuptools_scm to get git history
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build twine
+
+      - name: Build package
+        run: python -m build
+
+      - name: Check package
+        run: twine check dist/*
+
+      # Use the official PyPI publish action
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+      # GH Release
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          generate_release_notes: true
+          files: |
+            dist/*
+
+  ### Homebrew tap update
+  update-homebrew-tap:
+    name: Update Homebrew tap
+    runs-on: ubuntu-latest
+    needs: build-and-publish
+    permissions:
+      contents: write
+    env:
+      FORMULA_PATH: tap/Formula/semtag.rb
+      TEMPLATE_PATH: tap/Templates/semtag.template
+    steps:
+      - name: Checkout this repo
+        uses: actions/checkout@v4
+        with:
+          repository: mateuszmikrut/semtag
+          path: semtag
+
+      - name: Checkout tap repo
+        uses: actions/checkout@v4
+        with:
+          repository: mateuszmikrut/homebrew-tap
+          token: ${{ secrets.HOMEBREW_TAP_TOKEN }} ## Add this to secrets
+          path: tap
+
+      - name: Create a branch for the update
+        working-directory: tap
+        run: |
+          set -euo pipefail
+          git checkout -b bump-semtag-"${GITHUB_REF_NAME}"
+
+
+      - name: Update formula
+        # working-directory: semtag
+        run: |
+          set -euo pipefail
+          TAG="${GITHUB_REF_NAME}"
+          VERSION="${TAG#v}"
+          TARBALL_URL="https://github.com/mateuszmikrut/semtag/archive/refs/tags/${TAG}.tar.gz"
+
+          # Get tarball SHA
+          curl -sL "$TARBALL_URL" -o semtag.tar.gz
+          TARBALL_SHA=$(shasum -a 256 semtag.tar.gz | awk '{print $1}')
+
+
+          RESOURCES=""
+          for pkg in $(grep -vE '^#|^$' semtag/requirements.txt ); do
+            name=$(echo "$pkg" | sed 's/[>=<].*//')
+            version=$(echo "$pkg" | sed 's/.*[>=]=//; s/[<>=].*//')
+
+            pypi_url="https://pypi.org/pypi/${name}/${version}/json"
+            response=$(curl -s "$pypi_url" | tr -d '\r')
+
+            if ! echo "$response" | jq empty 2>/dev/null; then
+              echo "ERROR: Failed to parse PyPI response for $pkg $version" >&2
+              continue
+            fi
+            url=$(echo "$response" | jq -r '.urls[] | select(.packagetype=="sdist") | .url' | head -1)
+            sha=$(echo "$response" | jq -r '.urls[] | select(.packagetype=="sdist") | .digests.sha256' | head -1)
+
+            RESOURCES="$(printf "%s%s\n  resource \"%s\" do\n    url \"%s\"\n    sha256 \"%s\"\n  end\n\n" "$RESOURCES" "" "$name" "$url" "$sha")"
+          done
+          export RESOURCES
+
+          envsubst < "${{ env.TEMPLATE_PATH }}" > "${{ env.FORMULA_PATH }}"
+
+      - name: Commit and push changes
+        run: |
+          set -euo pipefail
+          git status --short
+          if git diff --quiet; then
+            echo "No changes to commit"
+            exit 0
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add "${FORMULA_PATH}"
+          git commit -m "Update semtag to ${GITHUB_REF_NAME}"
+          git push

{semtag-0.2.0/semtag.egg-info → semtag-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: semtag
-Version: 0.2.0
+Version: 0.2.2
 Summary: A tool for managing semantic version tags in git repositories
 Author-email: Mateusz Mikrut <mateusz.mikrut@gmail.com>
 License-Expression: MIT
@@ -35,16 +35,21 @@ semtag [options]
 
 ### Options
 
-- `-p, --patch` - Increment patch version (x.x.PATCH)
-- `-m, --minor` - Increment minor version (x.MINOR.0)
-- `-M, --major` - Increment major version (MAJOR.0.0)
-- `-b, --by` - Increment by a specific number (default: 1)
-- `-l, --label` - Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)
-- `-u, --push` - Push the new tag to remote repository
-- `-U, --pushall` - Push all local tags to remote repository
-- `-n, --nofetch` - Do not fetch tags from remote prior creating new one
-<!-- - `-f, --force` - Force operation even if not on main/master branch -->
-- `-v, --verbose` - Increase verbosity (use -v or -vv for more detail (INFO,DEBUG))
+<!-- OPTIONS:START -->
+```
+  -h, --help         show this help message and exit
+  -v, --verbose      Verbosity (-v for INFO, -vv for DEBUG)
+  -b, --by BY        Increment by a specific number
+  -p, --patch        Increment patch version (x.x.PATCH)
+  -m, --minor        Increment minor version (x.MINOR.0)
+  -M, --major        Increment major version (MAJOR.0.0)
+  -l, --label LABEL  Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)
+  -a, --msg MSG      Annotated tags message
+  -u, --push         Push the new tag to remote repository
+  -U, --pushall      Push all local tags to remote repository
+  -n, --no-fetch     Do not fetch tags from remote before operation
+```
+<!-- OPTIONS:END -->
 
 ### Examples
 
@@ -69,6 +74,12 @@ Using pip  (preferred)
 pip install semtag
 ```
 
+Using Homebrew
+
+```bash
+brew install mateuszmikrut/tap/semtag
+```
+
 From git
 ```bash
 git clone https://github.com/mateuszmikrut/semtag.git

{semtag-0.2.0 → semtag-0.2.2}/README.md

@@ -10,16 +10,21 @@ semtag [options]
 
 ### Options
 
-- `-p, --patch` - Increment patch version (x.x.PATCH)
-- `-m, --minor` - Increment minor version (x.MINOR.0)
-- `-M, --major` - Increment major version (MAJOR.0.0)
-- `-b, --by` - Increment by a specific number (default: 1)
-- `-l, --label` - Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)
-- `-u, --push` - Push the new tag to remote repository
-- `-U, --pushall` - Push all local tags to remote repository
-- `-n, --nofetch` - Do not fetch tags from remote prior creating new one
-<!-- - `-f, --force` - Force operation even if not on main/master branch -->
-- `-v, --verbose` - Increase verbosity (use -v or -vv for more detail (INFO,DEBUG))
+<!-- OPTIONS:START -->
+```
+  -h, --help         show this help message and exit
+  -v, --verbose      Verbosity (-v for INFO, -vv for DEBUG)
+  -b, --by BY        Increment by a specific number
+  -p, --patch        Increment patch version (x.x.PATCH)
+  -m, --minor        Increment minor version (x.MINOR.0)
+  -M, --major        Increment major version (MAJOR.0.0)
+  -l, --label LABEL  Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)
+  -a, --msg MSG      Annotated tags message
+  -u, --push         Push the new tag to remote repository
+  -U, --pushall      Push all local tags to remote repository
+  -n, --no-fetch     Do not fetch tags from remote before operation
+```
+<!-- OPTIONS:END -->
 
 ### Examples
 
@@ -44,6 +49,12 @@ Using pip  (preferred)
 pip install semtag
 ```
 
+Using Homebrew
+
+```bash
+brew install mateuszmikrut/tap/semtag
+```
+
 From git
 ```bash
 git clone https://github.com/mateuszmikrut/semtag.git

semtag-0.2.2/requirements.txt

@@ -0,0 +1,3 @@
+gitdb==4.0.12
+GitPython==3.1.45
+smmap==5.0.2

{semtag-0.2.0 → semtag-0.2.2/semtag.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: semtag
-Version: 0.2.0
+Version: 0.2.2
 Summary: A tool for managing semantic version tags in git repositories
 Author-email: Mateusz Mikrut <mateusz.mikrut@gmail.com>
 License-Expression: MIT
@@ -35,16 +35,21 @@ semtag [options]
 
 ### Options
 
-- `-p, --patch` - Increment patch version (x.x.PATCH)
-- `-m, --minor` - Increment minor version (x.MINOR.0)
-- `-M, --major` - Increment major version (MAJOR.0.0)
-- `-b, --by` - Increment by a specific number (default: 1)
-- `-l, --label` - Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)
-- `-u, --push` - Push the new tag to remote repository
-- `-U, --pushall` - Push all local tags to remote repository
-- `-n, --nofetch` - Do not fetch tags from remote prior creating new one
-<!-- - `-f, --force` - Force operation even if not on main/master branch -->
-- `-v, --verbose` - Increase verbosity (use -v or -vv for more detail (INFO,DEBUG))
+<!-- OPTIONS:START -->
+```
+  -h, --help         show this help message and exit
+  -v, --verbose      Verbosity (-v for INFO, -vv for DEBUG)
+  -b, --by BY        Increment by a specific number
+  -p, --patch        Increment patch version (x.x.PATCH)
+  -m, --minor        Increment minor version (x.MINOR.0)
+  -M, --major        Increment major version (MAJOR.0.0)
+  -l, --label LABEL  Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)
+  -a, --msg MSG      Annotated tags message
+  -u, --push         Push the new tag to remote repository
+  -U, --pushall      Push all local tags to remote repository
+  -n, --no-fetch     Do not fetch tags from remote before operation
+```
+<!-- OPTIONS:END -->
 
 ### Examples
 
@@ -69,6 +74,12 @@ Using pip  (preferred)
 pip install semtag
 ```
 
+Using Homebrew
+
+```bash
+brew install mateuszmikrut/tap/semtag
+```
+
 From git
 ```bash
 git clone https://github.com/mateuszmikrut/semtag.git

{semtag-0.2.0 → semtag-0.2.2}/semtag.egg-info/SOURCES.txt

@@ -11,4 +11,5 @@ semtag.egg-info/SOURCES.txt
 semtag.egg-info/dependency_links.txt
 semtag.egg-info/entry_points.txt
 semtag.egg-info/requires.txt
-semtag.egg-info/top_level.txt
+semtag.egg-info/top_level.txt
+tools/pre-commit

{semtag-0.2.0 → semtag-0.2.2}/semtag.py

@@ -14,19 +14,12 @@ logger = logging.getLogger(__name__)
 
 def main():
   """ Main function """
-  ########################
-  ### Argument Parsing ###
-  ########################
+  
+  ### Arguments
   parser = argparse.ArgumentParser(
     description='SemTag - Manage semantic version tags in git repositories',
     formatter_class=argparse.RawDescriptionHelpFormatter,
-    epilog="""
-Examples:
-  %(prog)s -m              # Increment minor version (1.0.0 -> 1.1.0)
-  %(prog)s -M              # Increment major version (1.0.0 -> 2.0.0)
-  %(prog)s -p -b 5         # Increment patch version by 5 (1.0.0 -> 1.0.5)
-  %(prog)s -p -l rc1       # Increment patch and add label (1.0.0 -> 1.0.1-rc1)
-        """
+    epilog="\n"
   )
   parser.add_argument('-v', '--verbose', action='count', default=0, help='Verbosity (-v for INFO, -vv for DEBUG)')
   # parser.add_argument('-f', '--force', action='store_true', default=False, help='Force the operation even if not on main/master branch')
@@ -38,12 +31,13 @@ Examples:
   version_group.add_argument('-M', '--major', action='store_true', help='Increment major version (MAJOR.0.0)')
   
   parser.add_argument('-l', '--label', type=str, default=None, help='Add label to the version (e.g., -l rc1 creates 1.0.0-rc1)')
+  parser.add_argument('-a', '--msg', type=str, help='Annotated tags message', default=None)
   parser.add_argument('-u', '--push', action='store_true', help='Push the new tag to remote repository', default=False)
   parser.add_argument('-U', '--pushall', action='store_true', help='Push all local tags to remote repository', default=False)
   parser.add_argument('-n', '--no-fetch', action='store_true', help='Do not fetch tags from remote before operation', default=False)
   args = parser.parse_args()
   
-  ### Logging based on verbosity ###
+  ### Logging based on verbosity 
   if args.verbose == 0:
     log_level = logging.WARNING
   elif args.verbose == 1:
@@ -55,14 +49,12 @@ Examples:
     level=log_level,
     format='%(message)s' # Keep it simple (no timestamps, severity etc.)
   )
-  
-  ##################
-  ### Main Logic ###
-  ##################
+
+  ### Main Logic 
   logger.debug(f"Arguments: {args}")
   pwd = Path('.').resolve()
 
-  ### Check if this is a git workspace ###
+  ### Check if this is a git workspace 
   try:
     repo = git.Repo(pwd, search_parent_directories=True)
     logger.debug(f"Found git repository at {repo.working_dir}")
@@ -85,8 +77,7 @@ Examples:
   #   logger.warning("HEAD is detached, not on any branch")
   #   exit(2)
   
-
-  # Fetch tags from remote to avoid duplicates
+  ### Fetch tags from remote to avoid duplicates
   if not args.no_fetch:
     try:
       logger.debug("Fetching tags from remote...")
@@ -94,22 +85,23 @@ Examples:
       logger.info("Tags fetched successfully")
     except Exception as e:
       logger.warning(f"Error fetching tags: {e}")
-    
-  logger.debug(f"Tags in repository: {repo.tags}")
+
+  ### Sort and filter semantic tags 
+  logger.debug(f"All tags in repository: {repo.tags}")
   tags = semsort([tag.name for tag in repo.tags])
   logger.debug(f"Sorted semantic tags: {tags}")
+  
+  ### No tags case
   if tags:
     latest_tag = tags[0]
     logger.info(f"Latest semantic version tag: {latest_tag}")
   else:
-    # No tags found, start with 0.0.0
-    logger.info("No semantic version tags found. Starting with 0.0.0")
     latest_tag = '0.0.0'
+    logger.info("No semantic version tags found. Starting with 0.0.0")
     
-  # Initialize obj
   current_version = SemanticVersion(latest_tag)
   
-  ### Increment version ###
+  ### Increment version 
   if args.major:
     logger.debug("Incrementing major version")
     current_version.inc_major(by=args.by)
@@ -120,7 +112,7 @@ Examples:
     logger.debug("Incrementing patch version")
     current_version.inc_patch(by=args.by)
   
-  ### Label ###
+  ### Label 
   if args.label:
     logger.debug(f"Adding label: {args.label}")
     current_version.add_label(args.label)
@@ -128,14 +120,18 @@ Examples:
   new_tag = str(current_version)
   logger.debug(f"Generated new tag: {new_tag}")
     
-  ### Create and push
+  ### Create tag
   try:
-    #TODO: add tag message option later
-    #repo.create_tag(new_tag, message=f"Release {new_tag}")
-    repo.create_tag(new_tag)
+    if args.msg:
+      logger.debug(f"Creating annotated tag '{new_tag}' with message: {args.msg}")
+      repo.create_tag(new_tag, message=args.msg)
+    else:
+      logger.debug(f"Creating lightweight tag '{new_tag}'")
+      repo.create_tag(new_tag)
+  
     logger.info(f"Successfully created tag: {new_tag}")
     
-    # Push if requested
+    ### Push 
     if args.pushall:
       logger.debug("Pushing all local tags to remote...")
       repo.remote('origin').push(tags=True)
@@ -151,7 +147,7 @@ Examples:
   except Exception as e:
     logger.error(f"Error: {e}")  
 
-  # Print the new tag to stout as confirmation if not verbose
+  ### Print the new tag to stout as confirmation if not verbose
   if args.verbose == 0:
     GREEN = '\033[92m'
     YELLOW = '\033[93m'

semtag-0.2.2/tools/pre-commit

@@ -0,0 +1,46 @@
+#!/bin/bash
+# Pre-commit hook to generate README.md options from script argparse help
+
+### Install pre-commit hook:
+# ln -s ../../tools/pre-commit .git/hooks/pre-commit
+
+REPO_ROOT=$(git rev-parse --show-toplevel)
+
+# Check if semtag.py has been modified
+echo "Pre-commit hook running..."
+if git diff --cached --name-only | grep -q semtag.py; then
+  echo "Updating README.md options..."
+  cd "$REPO_ROOT" || exit 1
+
+  OPTIONS_TMP=$(mktemp)
+  README_TMP=$(mktemp)
+
+  # Prefer virtual environment python if exists
+  if [ -d venv ];then
+    PYPATH="$REPO_ROOT/venv/bin/python"
+  else
+    PYPATH="python3"
+  fi
+
+  $PYPATH semtag.py --help 2>&1 | sed -n '/^options:/,/^$/p' | tail -n +2 > "$OPTIONS_TMP"
+
+  # README with updated options
+  awk -v opts_file="$OPTIONS_TMP" '
+    /<!-- OPTIONS:START -->/ { print; print "```"; system("cat " opts_file); print "```"; skip=1; next }
+    /<!-- OPTIONS:END -->/ { skip=0 }
+    !skip
+  ' README.md > "$README_TMP"
+    
+  if [ $? -eq 0 ]; then
+    mv "$README_TMP" README.md
+    rm -f "$OPTIONS_TMP"
+    git add README.md
+    echo "README.md options updated and staged"
+  else
+    echo "Failed to update README.md"
+    rm -f "$README_TMP" "$OPTIONS_TMP"
+    exit 1
+  fi
+fi
+
+exit 0

semtag-0.2.0/.github/workflows/publish.yml

@@ -1,49 +0,0 @@
-name: Publish to PyPI
-
-on:
-  push:
-    tags:
-      - 'v*'
-      - '[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+-*'
-
-jobs:
-  build-and-publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write  # Required for creating GitHub releases
-      id-token: write  # Required for trusted publishing
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Required for setuptools_scm to get git history
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
-      - name: Build package
-        run: python -m build
-
-      - name: Check package
-        run: twine check dist/*
-
-      # Use the official PyPI publish action
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-
-      # GH Release
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          generate_release_notes: true
-          files: |
-            dist/*

semtag-0.2.0/requirements.txt

@@ -1 +0,0 @@
-gitpython>=3.1.0