bashhub 3.0.3__tar.gz → 3.1.0__tar.gz

{bashhub-3.0.3/bashhub.egg-info → bashhub-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bashhub
-Version: 3.0.3
+Version: 3.1.0
 Summary: Bashhub.com python client
 Author-email: Ryan Caloras <ryan@bashhub.com>
 License-Expression: Apache-2.0
@@ -55,8 +55,7 @@ curl -OL https://bashhub.com/setup && $SHELL setup
 ```
 For non default login shells, just specify the shell e.g. (`bash setup`, `zsh setup`, `fish setup`)
 
-Detailed installation instructions can be found at
-https://github.com/rcaloras/bashhub-client/wiki/Install
+The installer uses [uv](https://docs.astral.sh/uv/) to install Bashhub. Detailed installation instructions can be found at https://github.com/rcaloras/bashhub-client/wiki/Install
 
 # Usage
 Bashhub can be accessed from the command line in a couple ways:

{bashhub-3.0.3 → bashhub-3.1.0}/README.md

@@ -21,8 +21,7 @@ curl -OL https://bashhub.com/setup && $SHELL setup
 ```
 For non default login shells, just specify the shell e.g. (`bash setup`, `zsh setup`, `fish setup`)
 
-Detailed installation instructions can be found at
-https://github.com/rcaloras/bashhub-client/wiki/Install
+The installer uses [uv](https://docs.astral.sh/uv/) to install Bashhub. Detailed installation instructions can be found at https://github.com/rcaloras/bashhub-client/wiki/Install
 
 # Usage
 Bashhub can be accessed from the command line in a couple ways:

{bashhub-3.0.3 → bashhub-3.1.0}/bashhub/bashhub.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 import io
 import os
 import re
-import shutil
 import subprocess
 import sys
+from importlib import resources
 from time import mktime
 
 import click
@@ -191,15 +191,22 @@ def update(version: str) -> None:
 
     query_param = '?version={0}'.format(version) if version else ''
     url = 'https://bashhub.com/setup' + query_param
-    response = requests.get(url, stream=True)
     filename = 'update-bashhub.sh'
-    with open(filename, 'wb') as out_file:
-        shutil.copyfileobj(response.raw, out_file)
+    download_installer(url, filename)
 
     subprocess.call(["bash", "-e", filename, version])
     os.remove(filename)
 
 
+def download_installer(url: str, filename: str) -> None:
+    response = requests.get(url, stream=True)
+    response.raise_for_status()
+
+    with open(filename, 'wb') as out_file:
+        for chunk in response.iter_content(chunk_size=8192):
+            out_file.write(chunk)
+
+
 @bashhub.group()
 def util() -> None:
     """Misc utils used by Bashhub"""
@@ -214,6 +221,12 @@ def update_system_info() -> None:
     sys.exit(0) if result is not None else sys.exit(1)
 
 
+@util.command()
+def shell_dir() -> None:
+    """Print the installed Bashhub shell assets directory"""
+    click.echo(resources.files("bashhub").joinpath("shell"))
+
+
 @util.command()
 @click.argument('date_string', type=str)
 def parsedate(date_string: str) -> None:

bashhub-3.1.0/bashhub/shell/deps/fish/functions/__bh_check_bashhub_installation.fish

@@ -0,0 +1,27 @@
+#
+# __bh_check_bashhub_installation.fish
+# Should only be sourced once following installation.
+#
+
+# Small function to check our Bashhub installation.
+function __bh_check_bashhub_installation
+    set -l ret 0
+    set -l config_path "$BH_HOME_DIRECTORY/config"
+    if not [ -f "$config_path" ]
+        echo "Missing Bashhub config file. Please run 'bashhub setup' to generate one."
+        set ret 2
+    else if not grep -Fq "access_token" "$config_path"
+        echo "Missing Bashhub access token. Please run 'bashhub setup' to re-login."
+        set ret 3
+    else if not grep -Fq "system_name" "$config_path"
+        echo "Missing system name. Please run 'bashhub setup' to re-login."
+        set ret 4
+    else if grep -Fq "save_commands = False" "$config_path"
+        echo "Bashhub is currently disabled. Run 'bashhub on' to re-enable."
+        set ret 5
+    end
+
+    return $ret
+end
+
+__bh_check_bashhub_installation

{bashhub-3.0.3 → bashhub-3.1.0}/bashhub/shell/deps/lib-bashhub.sh

@@ -23,7 +23,7 @@ contains_element() {
   return 1
 }
 
-# Make sure our bin directory is on our path
+# Make sure Bashhub's stable command directory is on our path
 __bh_path_add "$HOME/.bashhub/bin"
 
 #

{bashhub-3.0.3 → bashhub-3.1.0}/bashhub/version.py

@@ -1,5 +1,5 @@
 import platform
 
-__version__ = '3.0.3'
+__version__ = '3.1.0'
 
 version_str = 'Bashhub {0} (python {1})'.format(__version__, platform.python_version())

{bashhub-3.0.3 → bashhub-3.1.0/bashhub.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bashhub
-Version: 3.0.3
+Version: 3.1.0
 Summary: Bashhub.com python client
 Author-email: Ryan Caloras <ryan@bashhub.com>
 License-Expression: Apache-2.0
@@ -55,8 +55,7 @@ curl -OL https://bashhub.com/setup && $SHELL setup
 ```
 For non default login shells, just specify the shell e.g. (`bash setup`, `zsh setup`, `fish setup`)
 
-Detailed installation instructions can be found at
-https://github.com/rcaloras/bashhub-client/wiki/Install
+The installer uses [uv](https://docs.astral.sh/uv/) to install Bashhub. Detailed installation instructions can be found at https://github.com/rcaloras/bashhub-client/wiki/Install
 
 # Usage
 Bashhub can be accessed from the command line in a couple ways:

{bashhub-3.0.3 → bashhub-3.1.0}/bashhub.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ bashhub/shell/bashhub.sh
 bashhub/shell/bashhub.zsh
 bashhub/shell/deps/bash-preexec.sh
 bashhub/shell/deps/lib-bashhub.sh
+bashhub/shell/deps/fish/functions/__bh_check_bashhub_installation.fish
 bashhub/view/__init__.py
 bashhub/view/status.py
 tests/test_bashhub.py

{bashhub-3.0.3 → bashhub-3.1.0}/pyproject.toml

@@ -77,4 +77,10 @@ include-package-data = true
 include = ["bashhub*"]
 
 [tool.setuptools.package-data]
-bashhub = ["shell/*.fish", "shell/*.sh", "shell/*.zsh", "shell/deps/*.sh"]
+bashhub = [
+    "shell/*.fish",
+    "shell/*.sh",
+    "shell/*.zsh",
+    "shell/deps/*.sh",
+    "shell/deps/fish/functions/*.fish",
+]

bashhub-3.1.0/tests/test_bashhub.py

@@ -0,0 +1,109 @@
+import os
+from pathlib import Path
+
+import click
+import pytest
+from click.testing import CliRunner
+
+from bashhub.bashhub import bashhub, download_installer
+from bashhub.version import __version__
+from bashhub.bashhub import rest_client
+from bashhub.bashhub import bashhub_globals
+
+
+def test_bashhub_save():
+    def print_failed(command):
+        print("Failed")
+        pass
+
+    rest_client.save_command = print_failed
+
+    runner = CliRunner()
+    args = ['save', 'echo "Running bashhub tests"', '/tmp', '1', '100000', '1']
+
+    ignored_command = ['save', 'echo "Running bashhub tests" #ignore', '/tmp',
+                       '1', '100000', '1']
+
+    # Should omit saving if save_commands is set
+    bashhub_globals.BH_SAVE_COMMANDS = False
+    result = runner.invoke(bashhub, args)
+    assert '' == result.output
+
+    bashhub_globals.BH_SAVE_COMMANDS = True
+
+    # Should omit saving if #ignore is set
+    result = runner.invoke(bashhub, ignored_command)
+    assert '' == result.output
+
+    # Should omit saving a command if BH_FILTER regex is set
+    bashhub_globals.BH_FILTER = 'echo'
+    result = runner.invoke(bashhub, args)
+    assert '' == result.output
+
+    def no_auth_token():
+        return ''
+
+# Should not try to save a command if we don't have an auth token
+
+    bashhub_globals.BH_AUTH = no_auth_token
+    result = runner.invoke(bashhub, ['save', 'date', '/tmp', '1', '1000', '1'])
+    error_message = "No auth token found. Run 'bashhub setup' to login.\n"
+    assert error_message == result.output
+
+
+def test_bashhub_version():
+    runner = CliRunner()
+    result = runner.invoke(bashhub, ['version'])
+    assert __version__ in result.output
+
+
+def test_bashhub_update_writes_decoded_installer_response(monkeypatch):
+    script = b'#!/bin/bash\necho setup\n'
+    calls = []
+
+    class GitHubResponse:
+        status_code = 200
+
+    class SetupResponse:
+        def raise_for_status(self):
+            return None
+
+        def iter_content(self, chunk_size):
+            assert chunk_size == 8192
+            return [script]
+
+    def get(url, stream=False):
+        calls.append((url, stream))
+        if 'github.com' in url:
+            return GitHubResponse()
+        return SetupResponse()
+
+    def call(args):
+        with open(args[2], 'rb') as installer:
+            assert installer.read() == script
+        assert args == ['bash', '-e', 'update-bashhub.sh', '3.1.0rc2']
+        return 0
+
+    monkeypatch.setattr('bashhub.bashhub.requests.get', get)
+    monkeypatch.setattr('bashhub.bashhub.subprocess.call', call)
+
+    runner = CliRunner()
+    with runner.isolated_filesystem():
+        result = runner.invoke(bashhub, ['update', '3.1.0rc2'])
+
+    assert result.exit_code == 0
+    assert ('https://bashhub.com/setup?version=3.1.0rc2', True) in calls
+
+
+@pytest.mark.skipif(
+    not os.getenv('functional_test'),
+    reason='requires the production Bashhub setup endpoint',
+)
+def test_bashhub_update_downloads_production_installer(tmp_path):
+    installer = tmp_path / 'update-bashhub.sh'
+
+    download_installer('https://bashhub.com/setup', str(installer))
+
+    script = Path(installer).read_bytes()
+    assert script.startswith(b'#!/bin/bash')
+    assert b'install_bashhub' in script

bashhub-3.0.3/tests/test_bashhub.py

@@ -1,55 +0,0 @@
-import os
-
-import click
-from click.testing import CliRunner
-
-from bashhub.bashhub import bashhub
-from bashhub.version import __version__
-from bashhub.bashhub import rest_client
-from bashhub.bashhub import bashhub_globals
-
-
-def test_bashhub_save():
-    def print_failed(command):
-        print("Failed")
-        pass
-
-    rest_client.save_command = print_failed
-
-    runner = CliRunner()
-    args = ['save', 'echo "Running bashhub tests"', '/tmp', '1', '100000', '1']
-
-    ignored_command = ['save', 'echo "Running bashhub tests" #ignore', '/tmp',
-                       '1', '100000', '1']
-
-    # Should omit saving if save_commands is set
-    bashhub_globals.BH_SAVE_COMMANDS = False
-    result = runner.invoke(bashhub, args)
-    assert '' == result.output
-
-    bashhub_globals.BH_SAVE_COMMANDS = True
-
-    # Should omit saving if #ignore is set
-    result = runner.invoke(bashhub, ignored_command)
-    assert '' == result.output
-
-    # Should omit saving a command if BH_FILTER regex is set
-    bashhub_globals.BH_FILTER = 'echo'
-    result = runner.invoke(bashhub, args)
-    assert '' == result.output
-
-    def no_auth_token():
-        return ''
-
-# Should not try to save a command if we don't have an auth token
-
-    bashhub_globals.BH_AUTH = no_auth_token
-    result = runner.invoke(bashhub, ['save', 'date', '/tmp', '1', '1000', '1'])
-    error_message = "No auth token found. Run 'bashhub setup' to login.\n"
-    assert error_message == result.output
-
-
-def test_bashhub_version():
-    runner = CliRunner()
-    result = runner.invoke(bashhub, ['version'])
-    assert __version__ in result.output