Skip to content

Commit c89c5ad

Browse files
authored
Merge pull request #1 from composer-version-manager/restructure
Restructured package
2 parents e158222 + 987a478 commit c89c5ad

19 files changed

+97
-29
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ venv
44
# Environment
55
.idea
66

7+
.history
8+
Composer_Version_Manager.egg-info
9+
build
10+
dist
11+
.DS_Store

cvm/__init__.py

Whitespace-only changes.

cvm/cli.bkup.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import argparse
2+
from cvm import commands
3+
4+
def default_action(args):
5+
print(args)
6+
7+
def main():
8+
9+
parser = argparse.ArgumentParser('cvm')
10+
parser.add_argument(
11+
'--version',
12+
action='store_true',
13+
help='Shows the current version'
14+
)
15+
parser.set_defaults(action=default_action)
16+
17+
subparser = parser.add_subparsers(dest='cmd')
18+
19+
commands.Init(subparser)
20+
commands.Status(subparser)
21+
22+
args = parser.parse_args()
23+
args.action(args)
24+
25+

src/app/bootstrap.py renamed to cvm/cli.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
import sys
44
from typing import Optional
55

6+
from cvm.helpers.cli import colored_fore
67
from argparse_color_formatter import ColorRawTextHelpFormatter
78
from colorama import Fore
89

9-
from src.app.commands.command import Command
10-
from src.app.commands.install_command import InstallCommand
11-
from src.app.commands.scan_command import ScanCommand
12-
from src.app.commands.use_command import UseCommand
13-
from src.app.helpers.helpers import colored_fore
14-
from src.app.services.cache_service import CacheService
10+
from cvm.commands.command import Command
11+
from cvm.commands.use_command import UseCommand
12+
from cvm.commands.install_command import InstallCommand
13+
from cvm.commands.scan_command import ScanCommand
14+
15+
from cvm.services.cache_service import CacheService
16+
1517

1618
COMMAND_NAME = 'cvm'
1719
COMMAND_DESC = 'Composer Version Manager\n' + colored_fore(Fore.WHITE, 'Author: @game-of-morgan (Morgan Wowk)')
@@ -33,7 +35,7 @@ def get_command_by_name(name: str) -> Optional[Command]:
3335
return command()
3436

3537

36-
def run():
38+
def main():
3739
CacheService.boot_cache()
3840
parser = argparse.ArgumentParser(
3941
colored_fore(Fore.LIGHTGREEN_EX, COMMAND_NAME),

cvm/commands.bkup.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
class BaseCommand:
2+
name = None
3+
description = None
4+
aliases = []
5+
6+
def __init__(self, subparser):
7+
parser = subparser.add_parser(self.name, aliases=self.aliases)
8+
self.add_arguments(parser)
9+
parser.set_defaults(action=self.handle)
10+
11+
def handle(self, *args, **kwargs):
12+
raise NotImplementedError
13+
14+
def add_arguments(self, parser):
15+
raise NotImplementedError
16+
17+
class Init(BaseCommand):
18+
name = 'init'
19+
aliases = ['i']
20+
21+
def handle(self, args):
22+
print("I AM IN INIT")
23+
24+
def add_arguments(self, parser):
25+
parser.add_argument('--foo')
26+
27+
class Status(BaseCommand):
28+
29+
name = 'status'
30+
description = 'wat it be doing'
31+
aliases = ['s']
32+
33+
def handle(self, args):
34+
print("I AM IN STATUS")
35+
36+
def add_arguments(self, parser):
37+
parser.add_argument('--bar')

cvm/commands/__init__.py

Whitespace-only changes.
File renamed without changes.

src/app/commands/install_command.py renamed to cvm/commands/install_command.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from argparse import Action, Namespace
22

3-
from src.app.commands.command import Command
4-
from src.app.services.composer_service import ComposerService
5-
from src.app.services.github_service import GitHubService
3+
from cvm.commands.command import Command
4+
from cvm.services.composer_service import ComposerService
5+
from cvm.services.github_service import GitHubService
66

77

88
class InstallCommand(Command):

src/app/commands/scan_command.py renamed to cvm/commands/scan_command.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from argparse import Action, Namespace
22

3-
from src.app.commands.command import Command
3+
from cvm.commands.command import Command
44

55

66
class ScanCommand(Command):

src/app/commands/use_command.py renamed to cvm/commands/use_command.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from argparse import Action, Namespace
22

3-
from src.app.commands.command import Command
4-
from src.app.services.composer_service import ComposerService
5-
from src.app.services.github_service import GitHubService
3+
from cvm.commands.command import Command
4+
from cvm.services.composer_service import ComposerService
5+
from cvm.services.github_service import GitHubService
66

77

88
class UseCommand(Command):

0 commit comments

Comments
 (0)