git-stream 2.0.1__tar.gz → 2.0.2__tar.gz

git_stream-2.0.2/.github/workflows/build-and-release.yml

@@ -0,0 +1,31 @@
+name: Git Stream Build and Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      skip-pypi-test:
+        description: Skip PyPI test
+        type: boolean
+  push:
+    branches:
+      - main
+      - feature/*
+      - release/*
+  pull_request:
+    branches:
+      - main
+      - feature/*
+      - release/*
+
+permissions:
+  checks: write
+  contents: write
+  id-token: write
+
+jobs:
+  ci-cd:
+    uses: arisilon/shared-actions/.github/workflows/python-cicd.yaml@released
+    with:
+      skip-pypi-test: ${{ inputs.skip-pypi-test || false }}
+      test-action: "python -c 'import git_stream; print(git_stream.__version__)'"
+    secrets: inherit

{git_stream-2.0.1 → git_stream-2.0.2}/.gitignore

@@ -1,6 +1,6 @@
 # File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
-# Created by https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,git,macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows,visualstudiocode,python,git,macos
+# Created by https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,macos,git
+# Edit at https://www.toptal.com/developers/gitignore?templates=windows,visualstudiocode,python,macos,git
 
 ### Git ###
 # Created by git for backups. To disable backups in Git:
@@ -26,6 +26,7 @@
 # Icon must end with two \r
 Icon
 
+
 # Thumbnails
 ._*
 
@@ -266,12 +267,11 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,git,macos
+# End of https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,macos,git
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 
-.git/
 .p4cfg
 artifacts/
-unit_test_results/
+test_results*/
 git-stream-*

{git_stream-2.0.1 → git_stream-2.0.2}/.p4ignore

@@ -1,6 +1,6 @@
 # File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
-# Created by https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,git,macos
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows,visualstudiocode,python,git,macos
+# Created by https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,macos,git
+# Edit at https://www.toptal.com/developers/gitignore?templates=windows,visualstudiocode,python,macos,git
 
 ### Git ###
 # Created by git for backups. To disable backups in Git:
@@ -26,6 +26,7 @@
 # Icon must end with two \r
 Icon
 
+
 # Thumbnails
 ._*
 
@@ -266,12 +267,12 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,git,macos
+# End of https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,python,macos,git
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 
 .git/
 .p4cfg
 artifacts/
-unit_test_results/
+test_results*/
 git-stream-*

{git_stream-2.0.1 → git_stream-2.0.2}/CHANGELOG.md

@@ -7,14 +7,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Current Release
 
+### [2.0.2] - 2025-06-23
+
+- Changed
+  - Fixed stream path when repo name starts with a period. (GitHub #4)
+
+## Release History
+
 ### [2.0.1] - 2025-02-16
 
 - Changed
   - Moved repo to Arisilon organization. (GitHub #2)
   - Convert from flit to setuptools. (GitHub #3)
 
-## Release History
-
 ### [2.0.0] - 2025-01-01
 
 - Changed

{git_stream-2.0.1 → git_stream-2.0.2}/PKG-INFO

@@ -1,26 +1,27 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: git-stream
-Version: 2.0.1
+Version: 2.0.2
 Summary: Git Stream Implementation
-Keywords: python,programming,utilities
+Keywords: git,programming,utilities
 Author-email: "Jeffery G. Smith" <web@pobox.com>
 Requires-Python: ~=3.12
 Description-Content-Type: text/markdown
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development
 Classifier: Natural Language :: English
+License-File: LICENSE
 Requires-Dist: BatCave
-Requires-Dist: vjer ; extra == "dev"
 Requires-Dist: bumpver ; extra == "dev"
+Requires-Dist: vjer ; extra == "dev"
 Project-URL: changelog, https://github.com/arisilon/git-stream/blob/main/CHANGELOG.md
 Project-URL: documentation, https://git-stream.readthedocs.io
 Project-URL: homepage, https://github.com/arisilon/git-stream/
 Project-URL: repository, https://github.com/arisilon/git-stream/
 Provides-Extra: dev
+Provides-Extra: test
 
 # git-stream Python Module
 

{git_stream-2.0.1 → git_stream-2.0.2}/git_stream/__init__.py

@@ -13,7 +13,7 @@ __title__ = 'git-stream'
 __summary__ = 'Git Stream Implementation'
 __uri__ = 'https://github.com/arisilon/git-stream/'
 
-__version__ = '2.0.1'
+__version__ = '2.0.2'
 __build_name__ = '{var:build_name}'
 __build_date__ = '{var:build_date}'
 
@@ -21,4 +21,4 @@ __author__ = 'Jeffery G. Smith'
 __email__ = 'web@pobox.com'
 
 __license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2024 Jeffery G. Smith'
+__copyright__ = 'Copyright (c) 2025 Jeffery G. Smith'

{git_stream-2.0.1 → git_stream-2.0.2}/git_stream/__main__.py

@@ -6,7 +6,6 @@ Enables use as module: $ python -m git-stream --version
 """
 
 # TODO:
-#   Store as a module and install with pip
 #   Move config to OS correct location
 #   Add to BatCave.cms
 #       DATA_CACHE_DIR
@@ -231,7 +230,9 @@ def create(args: Namespace) -> None:
     """Create a stream."""
     config = _read_config()
     repo = args.repo if args.repo.startswith('git@') else f'{config.default_remote}{args.repo}.git'
-    repo_name = repo.split('/')[-1].split('.')[0]
+    repo_name = repo.split('/')[-1]
+    if repo_name.endswith('.git'):
+        repo_name = repo_name[:-4]
     stream_branch = f'{config.stream_branch_prefix}{args.name}'
     stream_name = f'{repo_name}-' + stream_branch.replace('/', '-')
     parent = args.parent if args.parent else config.default_parent

{git_stream-2.0.1 → git_stream-2.0.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
+requires = ["setuptools >= 77.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -7,14 +7,13 @@ name = "git-stream"
 description = "Git Stream Implementation"
 authors = [{ name = "Jeffery G. Smith", email = "web@pobox.com" }]
 readme = "DOCUMENTATION.md"
-license = { file = "LICENSE" }
+license-files = ["LICENSE"]
 dynamic = ["version"]
 
 requires-python = "~=3.12"
-keywords = ["python", "programming", "utilities"]
+keywords = ["git", "programming", "utilities"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
-    "License :: OSI Approved :: MIT License",
 
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3.12",
@@ -27,8 +26,8 @@ classifiers = [
 dependencies = ["BatCave"]
 
 [project.optional-dependencies]
-dev = ["vjer", "bumpver"]
-# test = []
+dev = ["bumpver", "vjer"]
+test = []
 # doc = []
 
 [project.scripts]
@@ -72,17 +71,9 @@ ignore_missing_imports = true
 module = "dotmap.*"
 ignore_missing_imports = true
 
-[[tool.mypy.overrides]]
-module = "flit.*"
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = "xmlrunner.*"
-ignore_missing_imports = true
-
 [tool.bumpver]
-current_version = "v2.0.1"
-version_pattern = "vMAJOR.MINOR.PATCH[PYTAGNUM]"
+current_version = "2.0.2"
+version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version} [skip ci]"
 commit = true
 tag = false
@@ -91,4 +82,4 @@ push = true
 [tool.bumpver.file_patterns]
 "git_stream/__init__.py" = ["__version__ = '{pep440_version}'"]
 
-# cSpell:ignore buildapi bumpver xmlrunner pytagnum
+# cSpell:ignore pyproject pytagnum

{git_stream-2.0.1 → git_stream-2.0.2}/setup.py

@@ -13,13 +13,13 @@ install_requires = \
 ['BatCave']
 
 extras_require = \
-{'dev': ['vjer', 'bumpver']}
+{'dev': ['bumpver', 'vjer']}
 
 entry_points = \
 {'console_scripts': ['git-stream = git_stream.__main__:main']}
 
 setup(name='git-stream',
-      version='2.0.1',
+      version='2.0.2',
       description='Git Stream Implementation',
       author=None,
       author_email='"Jeffery G. Smith" <web@pobox.com>',

git_stream-2.0.2/tests/__init__.py

@@ -0,0 +1 @@
+"""This is the unit test driver module."""

git_stream-2.0.2/tests/test_main.py

@@ -0,0 +1,123 @@
+import sys
+import os
+import yaml
+import unittest
+import tempfile
+from io import StringIO
+from contextlib import redirect_stdout, redirect_stderr
+from pathlib import Path
+from types import SimpleNamespace
+from dotmap import DotMap
+
+# Adjust import path to include project root
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+from git_stream import __main__ as main_module
+
+class TestMain(unittest.TestCase):
+    def setUp(self):
+        # Create isolated temp directory and config file
+        self.tempdir = tempfile.TemporaryDirectory()
+        config_path = Path(self.tempdir.name) / 'config.yml'
+        initial = {
+            'schema': main_module.CONFIG_SCHEMA,
+            'default_parent': 'main',
+            'default_remote': 'git@github.com:',
+            'default_pr_reviewer': '',
+            'delivery_branch_template': '%t_%d',
+            'stream_branch_prefix': 'user/',
+            'stream_home': str(Path(self.tempdir.name) / 'streams'),
+            'streams': {}
+        }
+        config_path.write_text(yaml.safe_dump(initial))
+        main_module.CONFIG = config_path
+
+    def tearDown(self):
+        self.tempdir.cleanup()
+
+    def test_read_config_mismatch_schema(self):
+        # Write invalid schema
+        bad_path = Path(self.tempdir.name) / 'bad.yml'
+        bad_path.write_text(yaml.safe_dump({'schema': 999}))
+        main_module.CONFIG = bad_path
+        buf = StringIO()
+        # Patch module-level stderr to capture print
+        orig_err = main_module.stderr
+        main_module.stderr = buf
+        try:
+            with self.assertRaises(SystemExit):
+                main_module._read_config()
+        finally:
+            main_module.stderr = orig_err
+        # Verify the error message contains expected schema
+        self.assertIn(f"expected: {main_module.CONFIG_SCHEMA}", buf.getvalue())
+
+    def test_read_config_success(self):
+        cfg = main_module._read_config()
+        self.assertIsInstance(cfg, DotMap)
+        self.assertEqual(cfg.schema, main_module.CONFIG_SCHEMA)
+
+    def test_configurator_list(self):
+        cfg = main_module._read_config()
+        cfg.new_field = 'value'
+        main_module._write_config(cfg)
+        args = SimpleNamespace(set=None)
+        out = StringIO()
+        with redirect_stdout(out):
+            main_module.configurator(args)
+        self.assertIn('new_field: value', out.getvalue())
+
+    def test_configurator_set(self):
+        args = SimpleNamespace(set='default_parent=dev')
+        main_module.configurator(args)
+        cfg = main_module._read_config()
+        self.assertEqual(cfg.default_parent, 'dev')
+
+    def test_list_streams(self):
+        cfg = main_module._read_config()
+        cfg.streams['s1'] = {
+            'branch': 'b1', 'repo': 'r1', 'description': 'd1',
+            'parents': ['main'], 'schema': main_module.STREAM_SCHEMA
+        }
+        main_module._write_config(cfg)
+        out = StringIO()
+        with redirect_stdout(out):
+            main_module.list_streams()
+        output = out.getvalue()
+        self.assertIn('name: s1', output)
+        self.assertIn('branch: b1', output)
+
+    def test_rm_stream(self):
+        cfg = main_module._read_config()
+        cfg.streams['to_remove'] = {
+            'branch': 'b', 'repo': 'r', 'description': 'd',
+            'parents': ['main'], 'schema': main_module.STREAM_SCHEMA
+        }
+        cfg.streams['keep'] = {
+            'branch': 'b2', 'repo': 'r2', 'description': 'd2',
+            'parents': ['main'], 'schema': main_module.STREAM_SCHEMA
+        }
+        main_module._write_config(cfg)
+        args = SimpleNamespace(name='to_remove', cleanup=False)
+        main_module.rm_stream(args)
+        cfg2 = main_module._read_config()
+        self.assertNotIn('to_remove', cfg2.streams)
+        self.assertIn('keep', cfg2.streams)
+
+    def test_stream_action_delegates(self):
+        calls = {}
+        class Dummy:
+            def foo(self, **kwargs):
+                calls['called'] = True
+                calls['args'] = kwargs
+        # Patch Stream to return Dummy instance
+        original_stream = main_module.Stream
+        main_module.Stream = lambda: Dummy()
+        try:
+            main_module.stream_action('foo', bar=1)
+        finally:
+            main_module.Stream = original_stream
+        self.assertTrue(calls.get('called', False))
+        self.assertEqual(calls.get('args'), {'bar': 1})
+
+if __name__ == '__main__':
+    unittest.main()

git_stream-2.0.2/vjer-rc.yml

@@ -0,0 +1,11 @@
+schema: 3
+project:
+  name: git-stream
+  version_service:
+    type: bumpver
+release:
+  steps:
+    - type: pypi
+      username: __token__
+      password: "{var:PYPI_TOKEN}"
+    - type: bumpver

{git_stream-2.0.1 → git_stream-2.0.2}/vjer.yml

@@ -14,11 +14,17 @@ test:
     - type: mypy
       targets:
         - git_stream
+    - type: python_unittest
 build:
   steps:
     - type: setuptools
 release:
   steps:
+    - type: pypi
+      test_pypi: true
+      username: __token__
+      password: "{var:PYPI_TOKEN}"
+      pre_release_only: true
     - type: bumpver
     - type: setuptools_build
       release_only: true
@@ -30,5 +36,7 @@ release:
         patch: True
         tag: rc
         tag-num: True
-
-# cSpell: ignore bumpver
+    - type: pypi
+      username: __token__
+      password: "{var:PYPI_TOKEN}"
+      release_only: true

git_stream-2.0.1/.github/workflows/build-and-release.yml

@@ -1,141 +0,0 @@
-name: Git Stream Build and Release
-run-name: Git Stream Build and Release - ${{ github.run_id }}
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - release/*
-      - feature/*
-  pull_request:
-    branches:
-      - main
-      - release/*
-      - feature/*
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  ARTIFACTS_DIR: artifacts
-  GH_TOKEN: ${{ github.token }}
-  VJER_ENV: development
-
-jobs:
-  test:
-    uses: arisilon/shared-actions/.github/workflows/vjer.yml@released
-    with:
-      action: test
-      os: ${{ matrix.os }}
-      python-version: ${{ matrix.python-version }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-        python-version:
-          - "3.12"
-          - "3.13"
-
-  build:
-    needs: test
-    uses: arisilon/shared-actions/.github/workflows/vjer.yml@released
-    with:
-      action: build
-      os: ubuntu-latest
-      python-version: "3.12"
-      use-flit: true
-
-  install-test:
-    needs: build
-    uses: arisilon/shared-actions/.github/workflows/install-test.yml@released
-    with:
-      os: ${{ matrix.os }}
-      python-version: ${{ matrix.python-version }}
-      test-action: "python -c 'import batcave; print(batcave.__version__)'"
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-        python-version:
-          - "3.12"
-          - "3.13"
-
-  pre_release:
-    needs: install-test
-    if: (github.event_name != 'pull_request') && ((github.ref_name == 'main') || startsWith(github.ref_name, 'release/'))
-    permissions:
-      contents: write
-      id-token: write
-    runs-on: ubuntu-latest
-    environment: pre_release
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.RELEASE_TOKEN }}
-      - name: Setup Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: "pip"
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-      - name: Install vjer
-        run: pip install vjer
-      - name: Prepare Git
-        run: |
-          git config user.name "${{ github.triggering_actor }}"
-          git config user.email "${{ github.triggering_actor }}@users.noreply.github.com"
-          git pull
-      - name: Publish to Test PyPi
-        uses: pypa/gh-action-pypi-publish@v1.12.4
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          packages-dir: ${{ env.ARTIFACTS_DIR }}
-      - name: Run post-publish steps
-        run: vjer pre_release
-
-  release:
-    needs: pre_release
-    if: (github.event_name != 'pull_request') && ((github.ref_name == 'main') || startsWith(github.ref_name, 'release/'))
-    permissions:
-      contents: write
-      id-token: write
-    runs-on: ubuntu-latest
-    environment: release
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.RELEASE_TOKEN }}
-      - name: Setup Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: "pip"
-      - name: Install vjer
-        run: pip install vjer
-      - name: Prepare Git
-        run: |
-          git config user.name "${{ github.triggering_actor }}"
-          git config user.email "${{ github.triggering_actor }}@users.noreply.github.com"
-          git pull
-      - name: Run post-publish steps
-        run: vjer release
-      - name: Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@v1.12.4
-        with:
-          packages-dir: ${{ env.ARTIFACTS_DIR }}
-      - name: Upload released artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.ARTIFACTS_DIR }}-released
-          path: ${{ env.ARTIFACTS_DIR }}
-
-# cSpell:ignore pypa