Merge branch 'test-commands'

dephell/commands/base.py

@@ -6,17 +6,21 @@
 from typing import Optional
 
 # app
-from ..config import config
+from ..config import config, Config
 from .helpers import getitem
 
 
 class BaseCommand:
     logger = getLogger('dephell.commands')
 
-    def __init__(self, argv):
+    def __init__(self, argv, config: Config = None):
         parser = self.get_parser()
         self.args = parser.parse_args(argv)
-        self.config = self.get_config(self.args)
+
+        if config is None:
+            self.config = self.get_config(self.args)
+        else:
+            self.config = config
 
     @classmethod
     def get_parser(cls):

dephell/commands/build.py

@@ -1,5 +1,6 @@
 # built-in
 from argparse import ArgumentParser
+from pathlib import Path
 
 # app
 from ..config import builders
@@ -57,13 +58,14 @@ def __call__(self):
             self.logger.info('merged')
 
         # dump
+        project_path = Path(self.config['project'])
         for to_format, to_path in DUMPERS:
             if to_format == self.config['from']['format']:
                 continue
             self.logger.info('dumping...', extra=dict(format=to_format))
             dumper = CONVERTERS[to_format]
             dumper.dump(
-                path=to_path,
+                path=project_path.joinpath(to_path),
                 reqs=Requirement.from_graph(resolver.graph, lock=False),
                 project=resolver.graph.metainfo,
             )

dephell/commands/deps_install.py

@@ -34,7 +34,7 @@ def get_parser(cls):
         return parser
 
     def __call__(self) -> bool:
-        loader_config = self.config.get('to', self.config['from'])
+        loader_config = self.config.get('to') or self.config['from']
         self.logger.info('get dependencies', extra=dict(
             format=loader_config['format'],
             path=loader_config['path'],

dephell/commands/deps_outdated.py

@@ -29,15 +29,19 @@ def get_parser(cls):
         return parser
 
     def __call__(self):
-        loader_config = self.config.get('to', self.config['from'])
-        loader = CONVERTERS[loader_config['format']]
-        if loader.lock:
-            self.logger.info('get dependencies from lockfile', extra=dict(
-                format=loader_config['format'],
-                path=loader_config['path'],
-            ))
-            root = loader.load(path=loader_config['path'])
-        else:
+        root = None
+
+        loader_config = self.config.get('to') or self.config.get('from')
+        if loader_config is not None:
+            loader = CONVERTERS[loader_config['format']]
+            if loader.lock:
+                self.logger.info('get dependencies from lockfile', extra=dict(
+                    format=loader_config['format'],
+                    path=loader_config['path'],
+                ))
+                root = loader.load(path=loader_config['path'])
+
+        if root is None:
             venvs = VEnvs(path=self.config['venv'])
             venv = venvs.get(Path(self.config['project']), env=self.config.env)
             if venv.exists():

dephell/commands/generate_editorconfig.py

@@ -56,16 +56,18 @@ def get_parser(cls):
         return parser
 
     def __call__(self):
+        project_path = Path(self.config['project'])
+
         matched = []
         non_matched = list(RULES)
-        for path in Path().iterdir():
+        for path in project_path.iterdir():
             for i, (match, _rule) in enumerate(non_matched):
                 if fnmatch(path.name, match):
                     matched.append(non_matched.pop(i))
                     break
 
         matched = ['[{}]\n{}'.format(match, '\n'.join(rule)) for match, rule in matched]
-        text = HEADER + '\n\n'.join(matched)
-        Path('.editorconfig').write_text(text)
+        text = HEADER + '\n\n'.join(matched) + '\n'
+        (project_path / '.editorconfig').write_text(text)
         self.logger.info('editorconfig generated')
         return True

dephell/commands/generate_license.py

@@ -46,6 +46,6 @@ def __call__(self):
             year=datetime.now().year,
             name=getuser().title(),
         ))
-        Path('LICENSE').write_text(text)
+        (Path(self.config['project']) / 'LICENSE').write_text(text)
         self.logger.info('license generated', extra=dict(license=license.name))
         return True

dephell/commands/helpers.py

@@ -82,9 +82,10 @@ def get_python(config: Config) -> Python:
         return pythons.get_best(python)
 
     # defined in dependency file
-    loader = CONVERTERS[config['from']['format']]
-    root = loader.load(path=config['from']['path'])
-    if root.python:
-        return pythons.get_by_spec(root.python)
+    if 'from' in config:
+        loader = CONVERTERS[config['from']['format']]
+        root = loader.load(path=config['from']['path'])
+        if root.python:
+            return pythons.get_by_spec(root.python)
 
     return pythons.current

dephell/context_tools.py

@@ -0,0 +1,36 @@
+# built-in
+import os
+from contextlib import contextmanager
+
+
+@contextmanager
+def chdir(path):
+    """Context manager for changing dir and restoring previous workdir after exit.
+    """
+    curdir = os.getcwd()
+
+    path = str(path)
+    if not os.path.exists(path):
+        os.makedirs(path)
+
+    os.chdir(path)
+    try:
+        yield
+    finally:
+        os.chdir(curdir)
+
+
+@contextmanager
+def nullcontext(value=None):
+    yield value
+
+
+@contextmanager
+def env_var(key, value):
+    old_value = os.environ.get(key)
+    os.environ[key] = value
+    yield
+    if old_value is None:
+        del os.environ[key]
+    else:
+        os.environ[key] = old_value

dephell/controllers/resolver.py

@@ -9,7 +9,7 @@
 from ..config import config
 from .conflict import analize_conflict
 from ..models import RootDependency
-from ..utils import nullcontext
+from ..context_tools import nullcontext
 
 
 logger = getLogger('dephell.resolver')
@@ -72,7 +72,7 @@ def unapply(self, dep, *, force: bool = True, soft: bool = False) -> None:
 
     def resolve(self, debug: bool = False, level: Optional[int] = None) -> bool:
         if config['silent']:
-            spinner = nullcontext(type('Mock', [], {}))
+            spinner = nullcontext(type('Mock', (), {}))
         else:
             spinner = yaspin(text="resolving...")
 

dephell/converters/setuppy.py

@@ -12,7 +12,7 @@
 # app
 from ..controllers import DependencyMaker, Readme
 from ..models import Author, EntryPoint, RootDependency
-from ..utils import chdir
+from ..context_tools import chdir
 from .base import BaseConverter
 
 try:

dephell/repositories/git/git.py

@@ -12,7 +12,8 @@
 from ...config import config
 from ...models.git_release import GitRelease
 from ...models.release import Release
-from ...utils import cached_property, chdir
+from ...utils import cached_property
+from ...context_tools import chdir
 from ..base import Interface
 
 

dephell/utils.py

@@ -1,32 +1,9 @@
 # built-in
 import os
 import platform
-from contextlib import contextmanager
 from itertools import product
 
 
-@contextmanager
-def chdir(path):
-    """Context manager for changing dir and restoring previous workdir after exit.
-    """
-    curdir = os.getcwd()
-
-    path = str(path)
-    if not os.path.exists(path):
-        os.makedirs(path)
-
-    os.chdir(path)
-    try:
-        yield
-    finally:
-        os.chdir(curdir)
-
-
-@contextmanager
-def nullcontext(value=None):
-    yield value
-
-
 def lazy_product(*all_groups):
     slices = [[] for _ in range(len(all_groups))]
     all_groups = [iter(groups) for groups in all_groups]

dephell/venvs.py

@@ -43,7 +43,7 @@ def ensure_directories(self, env_dir):
 
 @attr.s()
 class VEnv:
-    path = attr.ib(type=Path, convert=Path)
+    path = attr.ib(type=Path, converter=Path)
 
     project = attr.ib(type=str, default=None)
     env = attr.ib(type=str, default=None)
@@ -132,7 +132,7 @@ def clone(self, path: Path) -> 'VEnv':
 
 @attr.s()
 class VEnvs:
-    path = attr.ib(type=Path, convert=Path)
+    path = attr.ib(type=Path, converter=Path)
 
     @cached_property
     def current(self) -> Optional[VEnv]:

tests/conftest.py

@@ -0,0 +1,13 @@
+import shutil
+from pathlib import Path
+import pytest
+
+
+@pytest.fixture()
+def temp_path(tmp_path: Path):
+    for path in tmp_path.iterdir():
+        if path.is_file():
+            path.unlink()
+        else:
+            shutil.rmtree(str(path))
+    yield tmp_path