Make sclack installable from pip in a more universal fashion (#142)

Moved app and config within the sclack package Co-authored-by: Steven McGrath <[email protected]> Co-authored-by: Mario Rodas <[email protected]>
haskellcamargo · May 20, 2021 · da75272 · da75272 · JPTIZ · Jun 24, 2021
1 parent c44ddbc
commit da75272
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/app.py → sclack/app.py b/app.py → sclack/app.py
@@ -958,10 +958,15 @@ def ask_for_token(json_config):
             config_file.write(json.dumps(token_config, indent=False))
             json_config.update(token_config)
 
-if __name__ == '__main__':
+def run():
     json_config = {}
-    with open('./config.json', 'r') as config_file:
+    config_file = os.path.join(
+        os.path.dirname(os.path.realpath(__file__)), 'config.json')
+    with open(config_file, 'r') as config_file:
         json_config.update(json.load(config_file))
     ask_for_token(json_config)
     app = App(json_config)
     app.start()
+
+if __name__ == '__main__':
+    run()
diff --git a/config.json → sclack/config.json b/config.json → sclack/config.json
diff --git a/setup.py b/setup.py
@@ -12,7 +12,14 @@
     author='Marcelo Camargo',
     author_email='[email protected]',
     url='https://github.com/haskellcamargo/sclack',
-    scripts=["app.py"],
+    entry_points={
+        'console_scripts': [
+            'sclack=sclack.app:run',
+        ],
+    },
+    package_data={
+        'sclack': ['config.json']
+    },
     packages=find_packages(),
     install_requires=[
         'asyncio',

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -1,5 +1,5 @@
 from sclack.quick_switcher import remove_diacritic
-from app import ask_for_token
+from sclack.app import ask_for_token
 
 from slackclient import SlackClient
 
@@ -58,4 +58,4 @@ def test_get_members_pagination2():
             limit=10,  # 1k is max limit
             types='public_channel,private_channel,im')
     members = client.api_call('conversations.members', channel=channels['channels'][0]['id'], limit=1)
-    assert members != None and members.get('response_metadata', None) != None
+    assert members != None and members.get('response_metadata', None) != None