Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions modcli/cli.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import os
import secrets
import sys
import time
import webbrowser
from datetime import datetime

import click
from importlib.metadata import version
Expand Down Expand Up @@ -253,6 +255,21 @@ def list_config():
click.echo(f'Active environment: {env.name}')
click.echo(f'Authenticated in [{env.name}]: {"Yes" if env.token else "No"}')
click.echo(f'Registered environments: {list(context.environments.keys())}')
click.echo()
width = max(len(name) for name in context.environments)
for e in context.environments.values():
marker = '*' if e.name == env.name else ' '
click.echo(f'{marker} {e.name:<{width}} {_token_status(e)}')


def _token_status(env):
if not env.token:
return 'not logged in'
if not env.exp:
return env.username
if env.exp < time.time():
return f'{env.username} (expired)'
return f'{env.username} (expires {datetime.fromtimestamp(env.exp):%Y-%m-%d %H:%M})'


@click.command(help='Publish LV2 bundles, where PROJECT_FILE points to the buildroot project descriptor file (JSON)')
Expand Down
10 changes: 7 additions & 3 deletions modcli/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@

def read_context():
context = CliContext.read(settings.CONFIG_DIR)
if len(context.environments) == 0:
for env_name, urls in settings.URLS.items():
context.add_env(env_name, urls[0], urls[1])
first_run = not context.environments
# add default environments a newer version brought, keeping the existing ones and their tokens
missing = {name: urls for name, urls in settings.URLS.items() if name not in context.environments}
for env_name, (api_url, bundle_url) in missing.items():
context.add_env(env_name, api_url, bundle_url)
if first_run:
context.set_active_env(settings.DEFAULT_ENV)
if missing:
context.save()
return context

Expand Down
21 changes: 21 additions & 0 deletions tests/cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,27 @@ def test_confirm_all_is_accepted_and_ignored(self):
self.assertNotIn('confirm_all', params)


class ListConfigTest(TestCase):

def test_lists_every_env_token(self):
ctx = config.CliContext('unused')
ctx.add_env('dev', 'https://api-dev', 'https://bundle-dev')
ctx.add_env('prod', 'https://api', 'https://bundle')
ctx.add_env('staging', 'https://api-staging', 'https://bundle-staging')
ctx.set_active_env('prod')
ctx.environments['dev'].set_token(TokenHelper.generate_token('dev-user', exp=1))
ctx.environments['prod'].set_token(TokenHelper.generate_token('prod-user'))

with patch('modcli.cli.context', ctx):
result = CliRunner().invoke(cli.list_config)

self.assertEqual(result.exit_code, 0, result.output)
self.assertIn('Active environment: prod\nAuthenticated in [prod]: Yes\n', result.output)
self.assertIn(' dev dev-user (expired)\n', result.output)
self.assertIn('* prod prod-user\n', result.output)
self.assertIn(' staging not logged in\n', result.output)


class SetTokenTest(TestCase):

def test_set_token_decodes_base64url_payload(self):
Expand Down
29 changes: 28 additions & 1 deletion tests/config_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
import sys
import tempfile
from unittest import TestCase, skipIf
from unittest.mock import patch

from modcli import config
from modcli import config, settings
from tests.helpers import TokenHelper

TOKEN = TokenHelper.generate_token(exp=2000000000)
Expand Down Expand Up @@ -41,3 +42,29 @@ def test_clear(self):
self.assertFalse(os.path.exists(self._file('context.json')))
self.assertFalse(os.path.exists(self._file('access_token')))
self.assertEqual(config.CliContext.read(self.path).environments, {})


class ReadContextTest(TestCase):

def setUp(self):
self.path = os.path.join(tempfile.mkdtemp(), 'modcli')
self.urls = {'dev': ('https://api-dev', 'https://bundle-dev')}
for p in (patch.object(settings, 'CONFIG_DIR', self.path), patch.object(settings, 'URLS', self.urls)):
p.start()
self.addCleanup(p.stop)

def test_first_run_adds_defaults_and_activates_default_env(self):
context = config.read_context()
self.assertEqual(list(context.environments), ['dev'])
self.assertEqual(context.current_env().name, settings.DEFAULT_ENV)

def test_adds_new_defaults_and_keeps_tokens(self):
context = config.read_context()
context.current_env().set_token(TOKEN)
context.save()
self.urls['prod'] = ('https://api', 'https://bundle')

context = config.read_context()
self.assertEqual(list(context.environments), ['dev', 'prod'])
self.assertEqual((context.current_env().name, context.active_token()), ('dev', TOKEN))
self.assertEqual(list(config.CliContext.read(self.path).environments), ['dev', 'prod'])
Loading