xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bots: Extract path resolution logic into a function.

Browse source
This commit is contained in:
Sivagiri Visakan 2018-05-22 01:31:15 +05:30 committed by showell
parent d053528925
commit 09a7894a34
4 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
zulip_bots/zulip_bots/finder.py
View file

@ -1,6 +1,9 @@
import sys import sys
import os
from os.path import basename, splitext from os.path import basename, splitext
from typing import Any, Optional, Text from typing import Any, Optional, Text, Tuple
current_dir = os.path.dirname(os.path.abspath(__file__))
def import_module_from_source(path: Text, name: Optional[Text]=None) -> Any: def import_module_from_source(path: Text, name: Optional[Text]=None) -> Any:
if not name: if not name:
@ -21,3 +24,13 @@ def import_module_from_source(path: Text, name: Optional[Text]=None) -> Any:
loader.exec_module(module) loader.exec_module(module)
return module return module
def resolve_bot_path(name: Text) -> Tuple[Text, Text]:
if os.path.isfile(name):
bot_path = os.path.abspath(name)
bot_name = splitext(basename(bot_path))[0]
else:
bot_path = os.path.abspath(os.path.join(current_dir, 'bots', name, name + '.py'))
bot_name = name
return (bot_path, bot_name)

9
zulip_bots/zulip_bots/run.py
View file

@ -80,13 +80,10 @@ def exit_gracefully_if_bot_config_file_does_not_exist(bot_config_file: str) -> N
def main() -> None: def main() -> None:
args = parse_args() args = parse_args()
if os.path.isfile(args.bot):
bot_path = os.path.abspath(args.bot) bot_path, bot_name = finder.resolve_bot_path(args.bot)
bot_name = os.path.splitext(basename(bot_path))[0]
else:
bot_path = os.path.abspath(os.path.join(current_dir, 'bots', args.bot, args.bot+'.py'))
bot_name = args.bot
sys.path.insert(0, os.path.dirname(bot_path)) sys.path.insert(0, os.path.dirname(bot_path))
if args.provision: if args.provision:
provision_bot(os.path.dirname(bot_path), args.force) provision_bot(os.path.dirname(bot_path), args.force)

10
zulip_bots/zulip_bots/terminal.py
View file

@ -3,7 +3,7 @@ import os
import sys import sys
import argparse import argparse
from zulip_bots.finder import import_module_from_source from zulip_bots.finder import import_module_from_source, resolve_bot_path
from zulip_bots.simple_lib import TerminalBotHandler from zulip_bots.simple_lib import TerminalBotHandler
current_dir = os.path.dirname(os.path.abspath(__file__)) current_dir = os.path.dirname(os.path.abspath(__file__))
@ -30,12 +30,8 @@ def parse_args():
def main(): def main():
args = parse_args() args = parse_args()
if os.path.isfile(args.bot):
bot_path = os.path.abspath(args.bot) bot_path, bot_name = resolve_bot_path(args.bot)
bot_name = os.path.splitext(os.path.basename(bot_path))[0]
else:
bot_path = os.path.abspath(os.path.join(current_dir, 'bots', args.bot, args.bot+'.py'))
bot_name = args.bot
bot_dir = os.path.dirname(bot_path) bot_dir = os.path.dirname(bot_path)
sys.path.insert(0, bot_dir) sys.path.insert(0, bot_dir)

15
zulip_bots/zulip_bots/tests/test_finder.py Normal file
View file

@ -0,0 +1,15 @@
import os
from unittest import TestCase
from zulip_bots import finder
class FinderTestCase(TestCase):
def test_resolve_bot_path(self) -> None:
current_directory = os.path.dirname(os.path.abspath(__file__))
expected_bot_path = os.path.abspath(current_directory + '/../bots/helloworld/helloworld.py')
expected_bot_name = 'helloworld'
expected_bot_path_and_name = (expected_bot_path, expected_bot_name)
actual_bot_path_and_name = finder.resolve_bot_path('helloworld')
self.assertEqual(expected_bot_path_and_name, actual_bot_path_and_name)