Merge pull request #24 from real-digital/refactor

Refactor stuff

.env

@@ -1,2 +1,2 @@
 PYTHONPATH=.
-ESQUE_ENV=dev
+ESQUE_CONF_PATH=esque.cfg

.travis.yml

@@ -2,7 +2,7 @@ dist: xenial
 language: python
 cache: pip
 env:
-- TEST_CMD="pytest tests/ --integration --cov=esque --local"
+- ESQUE_ENV=dev TEST_CMD="pytest tests/ --integration --cov=esque --local"
 before_install:
 - wget https://mirror.netcologne.de/apache.org/kafka/2.2.0/kafka_2.12-2.2.0.tgz -O kafka.tgz
 - mkdir -p kafka && tar xzf kafka.tgz -C kafka --strip-components 1

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 real.digital
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

MANIFEST.in

@@ -0,0 +1,4 @@
+include esque/config/sample_config.cfg
+include scripts/auto_completion.sh
+include README.md
+include LICENSE

esque/config.py

@@ -6,7 +6,7 @@
 
 import click
 
-from esque.environment import ESQUE_ENV
+from esque.environment import ESQUE_CONF_PATH
 from esque.errors import ConfigNotExistsException, ContextNotDefinedException
 
 RANDOM = "".join(random.choices(string.ascii_lowercase, k=8))
@@ -18,18 +18,17 @@
 
 
 def config_dir() -> Path:
-    if ESQUE_ENV == "dev":
-        return Path(__file__).parent.parent
     return Path(click.get_app_dir("esque", force_posix=True))
 
 
 def config_path() -> Path:
+    if ESQUE_CONF_PATH:
+        return Path(ESQUE_CONF_PATH)
     return config_dir() / "esque.cfg"
 
 
 def sample_config_path() -> Path:
-    sample_path = Path(__file__).parent.parent / "config" / "sample_config.cfg"
-    return sample_path
+    return Path(__file__).parent / "config" / "sample_config.cfg"
 
 
 class Config:

esque/environment.py

@@ -1,3 +1,3 @@
 import os
 
-ESQUE_ENV = os.environ.get("ESQUE_ENV")
+ESQUE_CONF_PATH = os.environ.get("ESQUE_CONF_PATH")

setup.py

@@ -40,7 +40,7 @@ class InstallWithPostCommand(install):
     def run(self):
         install.run(self)
         print("installing auto completion")
-        call(["./auto_completion.sh"])
+        call(["./scripts/auto_completion.sh"])
 
 
 setup(
@@ -55,7 +55,6 @@ def run(self):
     author_email="opensource@real-digital.de",
     packages=find_packages(exclude=["tests", "tests.*"]),
     entry_points={"console_scripts": ["esque=esque.cli.commands:esque"]},
-    package_data={"config": ["sample_config.cfg"]},
     python_requires=">=3.6",
     setup_requires=[],
     install_requires=required,