datacommons-cli 0.0.1__tar.gz → 0.0.3__tar.gz

{datacommons_cli-0.0.1 → datacommons_cli-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacommons-cli
-Version: 0.0.1
+Version: 0.0.3
 Summary: Data Commons CLI
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/datacommonsorg/datacommons

datacommons_cli-0.0.1/datacommons_cli/version.py → datacommons_cli-0.0.3/datacommons_cli/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.0.1"
+__version__ = "0.0.3"

datacommons_cli-0.0.3/datacommons_cli/cli.py

@@ -0,0 +1,74 @@
+# Copyright 2025 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+
+import click
+
+from datacommons_admin.admin_cli import admin as admin_cli
+
+from . import __version__
+
+
+def get_logo_color():
+    """Determine the best logo color based on terminal capabilities"""
+    colorterm = os.environ.get("COLORTERM", "").lower()
+    if colorterm in ("truecolor", "24bit"):
+        return (7, 81, 179)
+
+    term = os.environ.get("TERM", "").lower()
+    if "256color" in term or colorterm:
+        return 26  # Royal blue color index in 256-color palette
+
+    return "blue"
+
+
+class CustomGroup(click.Group):
+    """Custom click.Group to preserve logo formatting and newlines in help text"""
+
+    def format_help_text(self, ctx, formatter):
+        if self.help:
+            formatter.write_paragraph()
+            with formatter.indentation():
+                for line in self.help.splitlines():
+                    if line:
+                        formatter.write(f"{' ' * formatter.current_indent}{line}\n")
+                    else:
+                        formatter.write("\n")
+
+
+def cli_help() -> str:
+    """Return help string for the CLI"""
+    logo = (
+        "    ██████╗   ██████╗\n"
+        "    ██╔══██╗ ██╔════╝\n"
+        "    ██║  ██║ ██║     \n"
+        "    ██║  ██║ ██║     \n"
+        "    ██████╔╝ ╚██████╗\n"
+        "    ╚═════╝   ╚═════╝"
+    )
+    styled_logo = click.style(logo, fg=get_logo_color(), bold=True)
+    version_str = click.style(f"v{__version__}", fg="bright_black")
+    return f"{styled_logo}\n\nData Commons CLI {version_str}"
+
+
+@click.group(cls=CustomGroup, help=cli_help())
+@click.version_option(version=__version__, prog_name="Data Commons CLI")
+def cli():
+    """Data Commons CLI"""
+    pass
+
+
+# Add admin CLI commands to the main CLI
+cli.add_command(admin_cli)

{datacommons_cli-0.0.1 → datacommons_cli-0.0.3}/datacommons_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacommons-cli
-Version: 0.0.1
+Version: 0.0.3
 Summary: Data Commons CLI
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/datacommonsorg/datacommons

{datacommons_cli-0.0.1 → datacommons_cli-0.0.3}/datacommons_cli.egg-info/SOURCES.txt

@@ -1,9 +1,10 @@
 pyproject.toml
+datacommons_cli/__init__.py
 datacommons_cli/cli.py
-datacommons_cli/version.py
 datacommons_cli.egg-info/PKG-INFO
 datacommons_cli.egg-info/SOURCES.txt
 datacommons_cli.egg-info/dependency_links.txt
 datacommons_cli.egg-info/entry_points.txt
 datacommons_cli.egg-info/requires.txt
-datacommons_cli.egg-info/top_level.txt
+datacommons_cli.egg-info/top_level.txt
+tests/test_cli.py

{datacommons_cli-0.0.1 → datacommons_cli-0.0.3}/datacommons_cli.egg-info/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 datacommons = datacommons_cli.cli:cli
+datacommons-cli = datacommons_cli.cli:cli

{datacommons_cli-0.0.1 → datacommons_cli-0.0.3}/pyproject.toml

@@ -16,6 +16,7 @@ urls = {Homepage = "https://github.com/datacommonsorg/datacommons"}
 
 [project.scripts]
 datacommons = "datacommons_cli.cli:cli"
+datacommons-cli = "datacommons_cli.cli:cli"
 
 [build-system]
 requires = ["uv", "setuptools"]
@@ -25,4 +26,4 @@ build-backend = "setuptools.build_meta"
 include-package-data = true
 
 [tool.setuptools.dynamic]
-version = {attr = "datacommons_cli.version.__version__"}
+version = {attr = "datacommons_cli.__version__"}

datacommons_cli-0.0.1/datacommons_cli/cli.py → datacommons_cli-0.0.3/tests/test_cli.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC.
+# Copyright 2026 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,16 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import click
+from click.testing import CliRunner
+from datacommons_cli.cli import cli, __version__
 
-from datacommons_admin.admin_cli import admin as admin_cli
 
+def test_cli_version() -> None:
+    runner = CliRunner()
+    result = runner.invoke(cli, ["--version"])
+    assert result.exit_code == 0
+    assert f"Data Commons CLI, version {__version__}" in result.output
 
-@click.group()
-def cli():
-    """Datacommons CLI suite"""
-    pass
 
-
-# Add schema CLI commands to the main CLI
-cli.add_command(admin_cli)
+def test_cli_help() -> None:
+    runner = CliRunner()
+    result = runner.invoke(cli, ["--help"])
+    assert result.exit_code == 0
+    assert "Data Commons CLI" in result.output