crackerjack 0.20.3__py3-none-any.whl → 0.20.7__py3-none-any.whl

crackerjack/crackerjack.py

@@ -1017,51 +1017,33 @@ class Crackerjack:
                 self.execute_command(["pdm", "bump", option])
                 break
 
-    def _publish_project(self, options: OptionsProtocol) -> None:
+    def _ensure_keyring_installed(self, options: OptionsProtocol) -> None:
+        """Ensure keyring is installed for PDM on macOS."""
         from .errors import ErrorCode, PublishError, handle_error
 
-        if options.publish:
-            if platform.system() == "Darwin":
-                # First check if keyring is already installed in PDM
-                check_keyring = self.execute_command(
-                    ["pdm", "self", "list"], capture_output=True, text=True
-                )
-                keyring_installed = "keyring" in check_keyring.stdout
-
-                if not keyring_installed:
-                    # Only attempt to install keyring if it's not already installed
-                    self.console.print("Installing keyring for PDM...")
-                    authorize = self.execute_command(
-                        ["pdm", "self", "add", "keyring"],
-                        capture_output=True,
-                        text=True,
-                    )
-                    if authorize.returncode > 0:
-                        error = PublishError(
-                            message="Authentication setup failed",
-                            error_code=ErrorCode.AUTHENTICATION_ERROR,
-                            details=f"Failed to add keyring support to PDM.\nCommand output:\n{authorize.stderr}",
-                            recovery="Please manually add your keyring credentials to PDM. Run `pdm self add keyring` and try again.",
-                            exit_code=1,
-                        )
-                        handle_error(
-                            error=error,
-                            console=self.console,
-                            verbose=options.verbose,
-                            ai_agent=options.ai_agent,
-                        )
+        if platform.system() != "Darwin":
+            return
 
-            build = self.execute_command(
-                ["pdm", "build"], capture_output=True, text=True
+        # Check if keyring is already installed in PDM
+        check_keyring = self.execute_command(
+            ["pdm", "self", "list"], capture_output=True, text=True
+        )
+        keyring_installed = "keyring" in check_keyring.stdout
+
+        if not keyring_installed:
+            # Only attempt to install keyring if it's not already installed
+            self.console.print("Installing keyring for PDM...")
+            authorize = self.execute_command(
+                ["pdm", "self", "add", "keyring"],
+                capture_output=True,
+                text=True,
             )
-            self.console.print(build.stdout)
-
-            if build.returncode > 0:
+            if authorize.returncode > 0:
                 error = PublishError(
-                    message="Package build failed",
-                    error_code=ErrorCode.BUILD_ERROR,
-                    details=f"Command output:\n{build.stderr}",
-                    recovery="Review the error message above for details. Common issues include missing dependencies, invalid project structure, or incorrect metadata in pyproject.toml.",
+                    message="Authentication setup failed",
+                    error_code=ErrorCode.AUTHENTICATION_ERROR,
+                    details=f"Failed to add keyring support to PDM.\nCommand output:\n{authorize.stderr}",
+                    recovery="Please manually add your keyring credentials to PDM. Run `pdm self add keyring` and try again.",
                     exit_code=1,
                 )
                 handle_error(
@@ -1071,26 +1053,233 @@ class Crackerjack:
                     ai_agent=options.ai_agent,
                 )
 
-            publish_result = self.execute_command(
-                ["pdm", "publish", "--no-build"], capture_output=True, text=True
+    def _build_package(self, options: OptionsProtocol) -> None:
+        """Build the package using PDM."""
+        from .errors import ErrorCode, PublishError, handle_error
+
+        build = self.execute_command(["pdm", "build"], capture_output=True, text=True)
+        self.console.print(build.stdout)
+
+        if build.returncode > 0:
+            error = PublishError(
+                message="Package build failed",
+                error_code=ErrorCode.BUILD_ERROR,
+                details=f"Command output:\n{build.stderr}",
+                recovery="Review the error message above for details. Common issues include missing dependencies, invalid project structure, or incorrect metadata in pyproject.toml.",
+                exit_code=1,
+            )
+            handle_error(
+                error=error,
+                console=self.console,
+                verbose=options.verbose,
+                ai_agent=options.ai_agent,
             )
 
-            if publish_result.returncode > 0:
-                error = PublishError(
-                    message="Package publication failed",
-                    error_code=ErrorCode.PUBLISH_ERROR,
-                    details=f"Command output:\n{publish_result.stderr}",
-                    recovery="Ensure you have the correct PyPI credentials configured. Check your internet connection and that the package name is available on PyPI.",
-                    exit_code=1,
+    def _prepare_publish_command(self) -> list[str]:
+        """Prepare the PDM publish command with appropriate flags."""
+        # Prepare the publish command
+        publish_cmd = ["pdm", "publish", "--no-build"]
+
+        # Check if we're running in a CI environment
+        is_ci = any(env in os.environ for env in ("CI", "GITHUB_ACTIONS", "GITLAB_CI"))
+
+        # If in CI environment, check if OIDC is likely to be the issue
+        if is_ci:
+            self.console.print("[yellow]Detected CI environment[/yellow]")
+
+            # Check for required OIDC-related environment variables
+            if "GITHUB_ACTIONS" not in os.environ and "GITLAB_CI" not in os.environ:
+                self.console.print(
+                    "[yellow]Non-GitHub/GitLab CI environment detected[/yellow]"
                 )
-                handle_error(
-                    error=error,
-                    console=self.console,
-                    verbose=options.verbose,
-                    ai_agent=options.ai_agent,
+                # Don't add --no-oidc flag as it may not be supported by all PDM versions
+            elif "ACTIONS_ID_TOKEN_REQUEST_URL" not in os.environ:
+                self.console.print("[yellow]OIDC token request URL not found[/yellow]")
+                # Don't add --no-oidc flag as it may not be supported by all PDM versions
+
+            # Check for API token in environment regardless of OIDC status
+            self._check_for_token_env_vars()
+
+        return publish_cmd
+
+    def _check_for_token_env_vars(self) -> None:
+        """Check for token environment variables."""
+        for token_var in ("PYPI_TOKEN", "PYPI_API_TOKEN", "TWINE_PASSWORD"):
+            if token_var in os.environ:
+                self.console.print(
+                    f"[yellow]Found {token_var} environment variable, will use for authentication[/yellow]"
                 )
-            else:
-                self.console.print("[green]✅ Package published successfully![/green]")
+                # If we have a token, PDM will use it automatically
+                break
+        else:
+            self.console.print(
+                "[yellow]No PyPI token found in environment variables[/yellow]"
+            )
+
+    def _check_keyring_credentials(self) -> None:
+        """Check for PyPI credentials in keyring."""
+        # First try to verify if keyring has PyPI credentials, wrapped in double try/except
+        # to handle both ImportError and keyring backend errors
+        try:
+            try:
+                import keyring
+
+                username = keyring.get_password("pdm-publish", "username")
+                token = (
+                    keyring.get_password("pdm-publish", username) if username else None
+                )
+
+                if username and token:
+                    self.console.print(
+                        f"[green]Found PyPI credentials in keyring for user: {username}[/green]"
+                    )
+                else:
+                    self.console.print(
+                        "[yellow]Warning: Could not find PyPI credentials in keyring.[/yellow]"
+                    )
+                    self.console.print(
+                        "[yellow]You might be prompted for username and password.[/yellow]"
+                    )
+            except ImportError:
+                self.console.print(
+                    "[yellow]Warning: Could not import keyring module to check credentials.[/yellow]"
+                )
+        except Exception as e:
+            # Catch any keyring-related exceptions, including NoKeyringError
+            self.console.print(f"[yellow]Warning: Keyring error: {e}[/yellow]")
+            self.console.print(
+                "[yellow]Will use PDM's built-in credential handling.[/yellow]"
+            )
+
+    def _execute_publish_command(
+        self, publish_cmd: list[str], options: OptionsProtocol
+    ) -> None:
+        """Execute the publish command and handle OIDC errors."""
+        from .errors import (
+            ErrorCode,
+            ExecutionError,
+            PublishError,
+            check_command_result,
+            handle_error,
+        )
+
+        # Log the exact command we're running
+        self.console.print(f"[yellow]Running command: {' '.join(publish_cmd)}[/yellow]")
+
+        # Execute the publish command with detailed output
+        publish_result = self.execute_command(
+            publish_cmd, capture_output=True, text=True
+        )
+
+        # Print the command's stdout and stderr for debugging
+        self.console.print(
+            f"[yellow]Debug: publish stdout:[/yellow]\n{publish_result.stdout}"
+        )
+        self.console.print(
+            f"[yellow]Debug: publish stderr:[/yellow]\n{publish_result.stderr}"
+        )
+        self.console.print(
+            f"[yellow]Debug: publish return code: {publish_result.returncode}[/yellow]"
+        )
+
+        # If first attempt failed with OIDC error, try an alternative approach
+        if publish_result.returncode > 0 and "OIDC" in publish_result.stderr:
+            self.console.print(
+                "[yellow]Detected OIDC error, OIDC may not be supported on this platform[/yellow]"
+            )
+
+            # Provide a more helpful error message
+            error = PublishError(
+                message="Package publication failed - OIDC authentication issue",
+                error_code=ErrorCode.AUTHENTICATION_ERROR,
+                details=f"OIDC authentication is not supported on this platform or configuration.\n\nCommand output:\n{publish_result.stderr}",
+                recovery="Consider manually setting PyPI credentials using the keyring or environment variables. Run 'pdm config pypi.username YOUR_USERNAME' and 'pdm config pypi.password YOUR_PASSWORD' to configure credentials.",
+                exit_code=1,
+            )
+            handle_error(
+                error=error,
+                console=self.console,
+                verbose=options.verbose,
+                ai_agent=options.ai_agent,
+            )
+            return
+
+        # Check the command result and raise an error if it failed
+        try:
+            cmd_str = " ".join(publish_cmd)
+            check_command_result(
+                publish_result,
+                cmd_str,
+                "Package publication failed",
+                ErrorCode.PUBLISH_ERROR,
+                "Ensure you have the correct PyPI credentials configured. Check your internet connection and that the package name is available on PyPI.",
+            )
+        except ExecutionError as e:
+            # Convert to PublishError for consistent error handling
+            error = PublishError(
+                message=e.message,
+                error_code=ErrorCode.PUBLISH_ERROR,
+                details=e.details,
+                recovery=e.recovery,
+                exit_code=1,
+            )
+            handle_error(
+                error=error,
+                console=self.console,
+                verbose=options.verbose,
+                ai_agent=options.ai_agent,
+            )
+
+    def _publish_project(self, options: OptionsProtocol) -> None:
+        """Publish the package to PyPI."""
+        from .errors import ErrorCode, PublishError, handle_error
+
+        if not options.publish:
+            return
+
+        try:
+            # Step 1: Ensure keyring is installed (on macOS)
+            self._ensure_keyring_installed(options)
+
+            # Step 2: Build the package
+            self._build_package(options)
+
+            # Print debug info before executing publish command
+            self.console.print(
+                "[yellow]Debug: About to execute PDM publish command[/yellow]"
+            )
+
+            # Step 3: Setup environment variables for authentication
+            os.environ["PDM_USE_KEYRING"] = "1"
+
+            # Step 4: Prepare publish command with appropriate flags
+            publish_cmd = self._prepare_publish_command()
+
+            # Step 5: Check keyring credentials
+            self._check_keyring_credentials()
+
+            # Step 6: Execute publish command and handle OIDC errors
+            self._execute_publish_command(publish_cmd, options)
+
+            # Success message
+            self.console.print("[green]✅ Package published successfully![/green]")
+
+        except Exception as e:
+            # Catch any other unexpected errors
+            self.console.print(f"[red]Debug: Unexpected error: {e}[/red]")
+            error = PublishError(
+                message="Package publication failed",
+                error_code=ErrorCode.PUBLISH_ERROR,
+                details=f"Unexpected error: {e}",
+                recovery="This is an unexpected error. Please report this issue.",
+                exit_code=1,
+            )
+            handle_error(
+                error=error,
+                console=self.console,
+                verbose=options.verbose,
+                ai_agent=options.ai_agent,
+            )
 
     def _commit_and_push(self, options: OptionsProtocol) -> None:
         if options.commit:

crackerjack/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "pdm-backend" ]
 
 [project]
 name = "crackerjack"
-version = "0.20.2"
+version = "0.20.6"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [
@@ -42,6 +42,7 @@ classifiers = [
 ]
 dependencies = [
     "autotyping>=24.9",
+    "keyring>=25.6",
     "pdm>=2.24.2",
     "pdm-bump>=0.9.12",
     "pre-commit>=4.2",
@@ -216,6 +217,7 @@ exclude-deps = [
     "tomli-w",
     "google-crc32c",
     "pytest-timeout",
+    "keyring",
 ]
 
 [tool.refurb]

{crackerjack-0.20.3.dist-info → crackerjack-0.20.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.20.3
+Version: 0.20.7
 Summary: Crackerjack: code quality toolkit
 Keywords: bandit,black,creosote,mypy,pyright,pytest,refurb,ruff
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -23,6 +23,7 @@ Project-URL: homepage, https://github.com/lesleslie/crackerjack
 Project-URL: repository, https://github.com/lesleslie/crackerjack
 Requires-Python: >=3.13
 Requires-Dist: autotyping>=24.9
+Requires-Dist: keyring>=25.6
 Requires-Dist: pdm>=2.24.2
 Requires-Dist: pdm-bump>=0.9.12
 Requires-Dist: pre-commit>=4.2

{crackerjack-0.20.3.dist-info → crackerjack-0.20.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-crackerjack-0.20.3.dist-info/METADATA,sha256=XNTChcz8YHD5P5n57GnqTS7wy7KymNgaqfm0wexV_D0,26354
-crackerjack-0.20.3.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crackerjack-0.20.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crackerjack-0.20.3.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.20.7.dist-info/METADATA,sha256=AF97uTrJMtTby4zDowoXOZXUS4uUx_BlCV2Ao13qELs,26383
+crackerjack-0.20.7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crackerjack-0.20.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crackerjack-0.20.7.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=4DYG7ZoVEHR5Tv1gQliRWmsNku5Fw2_k756cG_t12Cg,185
 crackerjack/.libcst.codemod.yaml,sha256=a8DlErRAIPV1nE6QlyXPAzTOgkB24_spl2E9hphuf5s,772
 crackerjack/.pdm.toml,sha256=dZe44HRcuxxCFESGG8SZIjmc-cGzSoyK3Hs6t4NYA8w,23
@@ -23,7 +23,8 @@ crackerjack/.ruff_cache/0.11.12/16869036553936192448,sha256=pYYUCDrYh7fPq8xkFLxv
 crackerjack/.ruff_cache/0.11.12/1867267426380906393,sha256=2w4M0Lrjd9flwuq6uJxehTbm7FVUcK5sL2sz1gS2Yvo,256
 crackerjack/.ruff_cache/0.11.12/4240757255861806333,sha256=uph5uIRG-XnF7ywAEcCxqqgIkWALPCvJFcwCgnNfTI4,77
 crackerjack/.ruff_cache/0.11.12/4441409093023629623,sha256=eHrESew3XCFJ2WqmKvtGLO1r4mY5Q_mv7yGlDmM1sSc,153
-crackerjack/.ruff_cache/0.11.13/1867267426380906393,sha256=FQ8Z7PFzLBASpKw20TqKwD02FLSG_mj4C3cEt8nU2YY,256
+crackerjack/.ruff_cache/0.11.13/1867267426380906393,sha256=Zt526cTInLmZB1vp5V7r_JDhNHzHw6nyguTIvqlF5wY,256
+crackerjack/.ruff_cache/0.11.13/4240757255861806333,sha256=l35TwAYyTusgJgyePvfP4_CCllPs1sWapEiLFZw8chQ,83
 crackerjack/.ruff_cache/0.11.2/4070660268492669020,sha256=FTRTUmvj6nZw_QQBp_WHI-h3_iqRejzL39api-9wTvs,224
 crackerjack/.ruff_cache/0.11.3/9818742842212983150,sha256=U-4mT__a-OljovvAJvv5M6X7TCMa3dReLXx3kTNGgwU,224
 crackerjack/.ruff_cache/0.11.4/9818742842212983150,sha256=QF9j6-3MH_d0pDNotdbF2hlqCL66SxN8OLVKR3PZyZU,224
@@ -60,9 +61,9 @@ crackerjack/.ruff_cache/0.9.9/8843823720003377982,sha256=e4ymkXfQsUg5e_mtO34xTsa
 crackerjack/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
 crackerjack/__init__.py,sha256=w5jukdION0D0fyeKYl-7hfCPzI0isXbEjzdjw8RecKA,840
 crackerjack/__main__.py,sha256=jg-eO0Z1VZkx5F-97dsd1rxOQ0uwHWabuKma8thUJVw,6779
-crackerjack/crackerjack.py,sha256=DpbodHdqeoyA0_QC6ADGtNX0A3zMIPpnWqk2UsIdyQw,53203
+crackerjack/crackerjack.py,sha256=fYOjOZ77GWlLg2PrtIqvRfi1ed3dll6mQV-FXsd49DY,60763
 crackerjack/errors.py,sha256=OtbmtA912kzDOWVo6JASuFbaMU-VhmQD_fUNsvnWCZc,4311
 crackerjack/interactive.py,sha256=Ay7_s3pc4ntc_3F_bRKBsWxmjor6nkN9v6tqqJe1iRw,15904
 crackerjack/py313.py,sha256=VgthlcpLL6nNDcg3evvEmGNYWCdMuojnMhow58ISEdY,6184
-crackerjack/pyproject.toml,sha256=HLvG6faHtQDxAtTYK7ujGjPX93n_OLCIgdOaPYtTago,4843
-crackerjack-0.20.3.dist-info/RECORD,,
+crackerjack/pyproject.toml,sha256=ylIWuetL7038ko_YQOVVYAZDUULIWeFuUuAKZtYEy5Q,4879
+crackerjack-0.20.7.dist-info/RECORD,,