Merge branch 'show-command'

dephell/commands/__init__.py

@@ -11,10 +11,11 @@
 from .inspect_config import InspectConfigCommand
 from .inspect_gadget import InspectGadgetCommand
 from .inspect_venv import InspectVenvCommand
-from .install import InstallCommand
 from .jail_install import JailInstallCommand
 from .jail_list import JailListCommand
 from .jail_remove import JailRemoveCommand
+from .package_install import PackageInstallCommand
+from .package_show import PackageShowCommand
 from .venv_create import VenvCreateCommand
 from .venv_destroy import VenvDestroyCommand
 from .venv_run import VenvRunCommand
@@ -35,10 +36,11 @@
     'InspectConfigCommand',
     'InspectGadgetCommand',
     'InspectVenvCommand',
-    'InstallCommand',
     'JailInstallCommand',
     'JailListCommand',
     'JailRemoveCommand',
+    'PackageInstallCommand',
+    'PackageShowCommand',
     'VenvCreateCommand',
     'VenvDestroyCommand',
     'VenvRunCommand',
@@ -61,11 +63,12 @@
     'inspect config': InspectConfigCommand,
     'inspect venv': InspectVenvCommand,
     'inspect gadget': InspectGadgetCommand,
-    'install': InstallCommand,
     'jail install': JailInstallCommand,
     'jail list': JailListCommand,
     'jail remove': JailRemoveCommand,
     # 'jail update': ...,
+    'package install': PackageInstallCommand,
+    'package show': PackageShowCommand,
     'venv create': VenvCreateCommand,
     'venv destroy': VenvDestroyCommand,
     'venv run': VenvRunCommand,

dephell/commands/base.py

@@ -3,7 +3,6 @@
 import os.path
 from functools import reduce
 from logging import getLogger
-from operator import getitem
 from typing import Optional
 
 # app
@@ -44,20 +43,40 @@ def validate(self):
             print(self.config.format_errors())
         return is_valid
 
-    @staticmethod
-    def get_value(data, key, sep: Optional[str] = '-'):
+    @classmethod
+    def get_value(cls, data, key, sep: Optional[str] = '-'):
         # print all config
         if not key:
             return json.dumps(data, indent=2, sort_keys=True)
 
         if sep is None:
             return json.dumps(data[key], indent=2, sort_keys=True)
 
-        keys = key.split(sep)
-        value = reduce(getitem, keys, data)
+        keys = key.replace('.', sep).split(sep)
+        value = reduce(cls._getitem, keys, data)
         # print config section
         if type(value) is dict:
             return json.dumps(value, indent=2, sort_keys=True)
 
         # print one value
         return value
+
+    @staticmethod
+    def _getitem(value, key):
+        if key in ('reverse()', 'reversed()'):
+            return value[::-1]
+        if key == 'first()':
+            return value[0]
+        if key == 'last()':
+            return value[-1]
+        if key == 'min()':
+            return min(value)
+        if key == 'max()':
+            return max(value)
+        if key == 'type()':
+            return type(value).__name__
+        if key in ('len()', 'length()'):
+            return len(value)
+        if key.isdigit():
+            key = int(key)
+        return value[key]

dephell/commands/deps_licenses.py

@@ -22,7 +22,6 @@ def get_parser(cls):
         builders.build_api(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('key', nargs='*')
         return parser
 
     def __call__(self):
@@ -54,5 +53,5 @@ def __call__(self):
             else:
                 licenses['Unknown'].add(dep.name)
         licenses = {name: sorted(deps) for name, deps in licenses.items()}
-        print(self.get_value(data=licenses, key=' '.join(self.args.key), sep=None))
+        print(self.get_value(data=licenses, key=self.config['filter'], sep=None))
         return True

dephell/commands/generate_authors.py

@@ -1,6 +1,6 @@
 # built-in
 import subprocess
-from argparse import ArgumentParser, REMAINDER
+from argparse import ArgumentParser
 from pathlib import Path
 
 # app
@@ -18,7 +18,6 @@ def get_parser(cls):
         builders.build_config(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('name', nargs=REMAINDER, help='package to install')
         return parser
 
     def __call__(self):

dephell/commands/generate_editorconfig.py

@@ -1,5 +1,5 @@
 # built-in
-from argparse import ArgumentParser, REMAINDER
+from argparse import ArgumentParser
 from pathlib import Path
 
 # external
@@ -48,7 +48,6 @@ def get_parser(cls):
         builders.build_config(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('name', nargs=REMAINDER, help='package to install')
         return parser
 
     def __call__(self):

dephell/commands/generate_license.py

@@ -1,5 +1,5 @@
 # built-in
-from argparse import ArgumentParser
+from argparse import ArgumentParser, REMAINDER
 from datetime import datetime
 from getpass import getuser
 from pathlib import Path
@@ -22,7 +22,7 @@ def get_parser(cls):
         builders.build_config(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('name', nargs=1, help='licnse name')
+        parser.add_argument('name', nargs=REMAINDER, help='licnse name')
         return parser
 
     def __call__(self):

dephell/commands/inspect_config.py

@@ -21,8 +21,7 @@ def get_parser(cls):
         builders.build_venv(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('key', nargs='?')
         return parser
 
     def __call__(self):
-        print(self.get_value(data=self.config._data, key=self.args.key))
+        print(self.get_value(data=self.config._data, key=self.config['filter']))

dephell/commands/inspect_venv.py

@@ -22,7 +22,6 @@ def get_parser(cls):
         builders.build_venv(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('key', nargs='?')
         return parser
 
     def __call__(self):
@@ -43,4 +42,4 @@ def __call__(self):
                 lib=str(venv.lib_path),
                 python=str(venv.python_path),
             ))
-        print(self.get_value(data=data, key=self.args.key))
+        print(self.get_value(data=data, key=self.config['filter']))

dephell/commands/jail_list.py

@@ -19,7 +19,6 @@ def get_parser(cls):
         builders.build_venv(parser)
         builders.build_output(parser)
         builders.build_other(parser)
-        parser.add_argument('key', nargs='?')
         return parser
 
     def __call__(self) -> bool:
@@ -33,5 +32,5 @@ def __call__(self) -> bool:
             if venv_path.match(venvs_path):
                 entrypoints[venv_path.name].append(entrypoint.name)
 
-        print(self.get_value(data=dict(entrypoints), key=self.args.key, sep=None))
+        print(self.get_value(data=dict(entrypoints), key=self.config['filter'], sep=None))
         return True

dephell/commands/install.py → dephell/commands/package_install.py

@@ -13,11 +13,11 @@
 from .base import BaseCommand
 
 
-class InstallCommand(BaseCommand):
+class PackageInstallCommand(BaseCommand):
     @classmethod
     def get_parser(cls):
         parser = ArgumentParser(
-            prog='dephell install',
+            prog='dephell package install',
             description='Download and install package into project environment',
         )
         builders.build_config(parser)

dephell/commands/package_show.py

@@ -0,0 +1,61 @@
+# built-in
+from argparse import ArgumentParser
+from pathlib import Path
+
+# app
+from ..controllers import DependencyMaker
+from ..config import builders
+from ..converters import InstalledConverter
+from ..models import RootDependency
+from ..repositories import WareHouseRepo
+from ..venvs import VEnvs
+from .base import BaseCommand
+
+
+class PackageShowCommand(BaseCommand):
+    @classmethod
+    def get_parser(cls):
+        parser = ArgumentParser(
+            prog='dephell package show',
+            description='Show information about package from PyPI.org.',
+        )
+        builders.build_config(parser)
+        builders.build_output(parser)
+        builders.build_api(parser)
+        builders.build_other(parser)
+        parser.add_argument('name', help='package name (and version)')
+        return parser
+
+    def __call__(self):
+        dep = DependencyMaker.from_requirement(source=RootDependency(), req=self.args.name)[0]
+        repo = WareHouseRepo()
+        releases = repo.get_releases(dep)
+
+        venvs = VEnvs(path=self.config['venv'])
+        venv = venvs.get(Path(self.config['project']), env=self.config.env)
+        path = None
+        if venv.exists():
+            path = venv.lib_path
+        else:
+            self.logger.warning('venv not found, package version will be shown for global python lib')
+
+        converter = InstalledConverter()
+        root = converter.load(path)
+        local_version = None
+        for subdep in root.dependencies:
+            if subdep.name == dep.name:
+                local_version = str(subdep.constraint).lstrip('=')
+
+        data = dict(
+            name=dep.name,
+            version=dict(
+                latest=str(releases[0].version),
+                installed=local_version,
+            ),
+            description=dep.description,
+
+            license=getattr(dep.license, 'id', dep.license),
+            links=dep.links,
+            authors=[str(author) for author in dep.authors],
+        )
+        print(self.get_value(data=data, key=self.config['filter']))

dephell/config/builders.py

@@ -51,6 +51,7 @@ def build_output(parser):
     output_group.add_argument('--nocolors', action='store_true', help='do not color output.')
     output_group.add_argument('--silent', action='store_true', help='suppress any output except errors.')
     output_group.add_argument('--traceback', action='store_true', help='show traceback for exceptions.')
+    output_group.add_argument('--filter', help='filter for JSON output.')
 
 
 def build_venv(parser):

dephell/config/scheme.py

@@ -45,6 +45,7 @@
     'format':       dict(type='string', required=True, allowed=LOG_FORMATTERS),
     'nocolors':     dict(type='boolean', required=True),
     'traceback':    dict(type='boolean', required=True),
+    'filter':       dict(type='string', required=False),
 
     # venv
     'venv':     dict(type='string', required=True),