fast commit

Author: kobibarhanin

Dockerfile

@@ -19,7 +19,7 @@ RUN sudo apt -y install python3-pip && \
 WORKDIR /home/igit
 COPY Pipfile .
 COPY Pipfile.lock .
-RUN pipenv install
+RUN pipenv install --dev
 
 COPY . .
 RUN pipenv install --skip-lock -e .

Pipfile

@@ -4,23 +4,21 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+pytest = "*"
+pylint = "*"
 
 [packages]
-fire = "*"
 termcolor = "*"
-pyyaml = "*"
-pytest = "*"
 gitpython = "*"
+pyinquirer = "*"
 inquirer = "*"
 emoji = "*"
-pylint = "*"
-pyinquirer = "*"
 gitignore-parser = "*"
 psutil = "*"
-python-dotenv = "*"
-click = "*"
 pathlib2 = "*"
+click = "*"
 invoke = "*"
+click-help-colors = "*"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -2,84 +2,107 @@
 from pathlib import Path
 
 import click
+from click_help_colors import HelpColorsGroup, HelpColorsCommand
 
 from igit.core.commands import Igit
 
 
-@click.group()
+@click.group(
+    cls=HelpColorsGroup,
+    help_headers_color='yellow',
+    help_options_color='magenta',
+    help_options_custom_colors={
+        'up': 'cyan',
+        'push': 'cyan',
+        'undo': 'red',
+        'unstage': 'red',
+        'revert': 'red',
+        'diff': 'green',
+        'branch': 'green',
+        'add': 'blue',
+        'commit': 'blue',
+        'save': 'blue',
+    }
+)
 def cli():
+    """\b
+_____        __________
+___(_)______ ___(_)_  /_
+__  /__  __ `/_  /_  __/
+_  / _  /_/ /_  / / /_
+/_/  _\__, / /_/  \__/
+     /____/
     """
-    Interactive Git for better git experience.
-    """
-    pass
 
 
-@cli.command(help='add unstaged files')
+@cli.command(
+    help='Add unstaged files.'
+)
 @click.option('--file', default=[], help='file to add', multiple=True)
 @click.option('--all', '-a', is_flag=True, default=False, help='add all unstaged files')
 def add(file, all):
     Igit().add(file, all)
 
 
-@cli.command(help='commit changes')
+@cli.command(help='Commit changes.')
 @click.option('--message', '-m', default=None, help='commit message')
 @click.option('--add', '-a', is_flag=True, default=False, help='add before commit')
 def commit(message, add):
     Igit().commit(message, add)
 
 
-@cli.command(help='push changes')
+@cli.command(help='Push changes.')
 @click.option('--add', '-a', is_flag=True, default=False, help='add --all and commit before push')
 @click.option('--commit', '-c', is_flag=True, default=False, help='push to remote')
 def push(add, commit):
     Igit().push(add, commit)
 
 
-@cli.command(help='Adds and Commits changes')
+@cli.command(help='Adds and Commits changes.')
 @click.option('--message', default=None, help='commit message (optional)')
 def save(message):
     Igit().save(message)
 
 
-@cli.command(help='Adds, Commits and Pushes changes to remote')
+@cli.command(help='Adds, Commits and Pushes changes to remote.')
 @click.option('--message', default=None, help='commit message (optional)')
 def up(message):
     Igit().up(message)
 
 
-@cli.command(help='Switch to another branch')
+@cli.command(help='Switch to another branch.')
 @click.option('--name', '-n', default=None, help='target branch to switch to')
 @click.option('--hopping_on', '-h', is_flag=True, default=False, help='activate branch hopping')
 def branch(name, hopping_on):
     return Igit().branch(name, hopping_on)
 
 
-@cli.command(help='Prints diff of selected file')
+@cli.command(help='Prints diff of selected file.')
 def diff():
     return Igit().diff()
 
 
-@cli.command(help='Undo un-staged (non added) changes')
+@cli.command(help='Undo un-staged (non added) changes.')
 @click.option('--file', default=[], help='file to add', multiple=True)
 @click.option('--all', is_flag=True, default=False, help='undo all unstaged changes')
 def undo(file, all):
     return Igit().undo(file, all)
 
 
-@cli.command(help='Unstage changes')
+@cli.command(help='Unstage changes.')
 @click.option('--file', default=[], help='file to add', multiple=True)
 @click.option('--all', is_flag=True, default=False, help='unstage all files')
 def unstage(file, all):
     return Igit().unstage(file, all)
 
 
-@cli.command(help='revert commit (NOT IMPLEMENTED)')
+@cli.command(help='Revert commit (NOT IMPLEMENTED).')
 def revert():
     # TODO - implement
     return 'NOT IMPLEMENTED'
 
 
-@cli.command(help='Rename current branch')
+@cli.command(help='Rename current branch.')
 @click.argument('name')
 def rename(name):
     return Igit().rename(name)
@@ -91,7 +114,7 @@ def ignore(reset):
     return Igit().ignore(reset)
 
 
-@cli.command(help='Print igit version')
+@cli.command(help='Prints igit version.')
 def version():
     here = Path(__file__).parent.absolute()
     package_conf = {}

igit/cli.py

@@ -17,7 +17,7 @@ def list(self, text, items, color, icon):
         _emoji, _emoji_render_method = self.emojize(icon)
         self._display(f'{_emoji} - {text}:', color, _emoji_render_method)
         for item in items:
-            self._display("   * " + item, color, _emoji_render_method)
+            self._display("   * " + item, 'white', _emoji_render_method)
 
     def emojize(self, icon):
         icon = f':{icon}:'

igit/interactive/display.py

@@ -0,0 +1,21 @@
+blessed==1.17.6
+click==7.1.2
+click-help-colors==0.8
+emoji==0.6.0
+gitdb==4.0.5
+gitignore-parser==0.0.8
+GitPython==3.1.9
+inquirer==2.7.0
+invoke==1.4.1
+pathlib2==2.3.5
+prompt-toolkit==1.0.14
+psutil==5.7.2
+Pygments==2.7.1
+PyInquirer==1.0.3
+python-editor==1.0.4
+readchar==2.0.1
+regex==2020.10.15
+six==1.15.0
+smmap==3.0.4
+termcolor==1.1.0
+wcwidth==0.2.5

requirements.txt

@@ -1,22 +1,27 @@
-import os
 import setuptools
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
+from pathlib import Path
+import pkg_resources
 
 package_conf = {}
-
-here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, "igit", "__version__.py")) as f:
+with open(Path("igit") / "__version__.py") as f:
     exec(f.read(), package_conf)
+with open("README.md", "r") as fh:
+    package_conf['description'] = fh.read()
+
+with Path('requirements.txt').open() as requirements_txt:
+    install_requires = [
+        str(requirement)
+        for requirement
+        in pkg_resources.parse_requirements(requirements_txt)
+    ]
 
 setuptools.setup(
     name="igit",
     version=package_conf['__version__'],
-    author="kobibarhanin",
+    author="kobi",
     author_email="",
     description="Interactive git and more",
-    long_description=long_description,
+    long_description=package_conf['description'],
     long_description_content_type="text/markdown",
     url="https://github.com/kobibarhanin/igit",
     packages=setuptools.find_packages(),
@@ -30,7 +35,6 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    # TODO - remove unnecessary dependencies
-    install_requires=["astroid==2.4.2" ,"attrs==20.2.0" ,"blessed==1.17.6" ,"click==7.1.2" ,"emoji==0.6.0" ,"fire==0.3.1" ,"gitdb==4.0.5" ,"gitignore-parser==0.0.8" ,"GitPython==3.1.9" ,"importlib-metadata==2.0.0" ,"iniconfig==1.0.1" ,"inquirer==2.7.0" ,"invoke==1.4.1" ,"isort==5.5.4" ,"lazy-object-proxy==1.4.3" ,"mccabe==0.6.1" ,"more-itertools==8.5.0" ,"packaging==20.4" ,"pathlib2==2.3.5" ,"pluggy==0.13.1" ,"prompt-toolkit==1.0.14" ,"psutil==5.7.2" ,"py==1.9.0" ,"Pygments==2.7.1" ,"PyInquirer==1.0.3" ,"pylint==2.6.0" ,"pyparsing==2.4.7" ,"pytest==6.1.0" ,"python-dotenv==0.14.0" ,"python-editor==1.0.4" ,"PyYAML==5.3.1" ,"readchar==2.0.1" ,"regex==2020.9.27" ,"six==1.15.0" ,"smmap==3.0.4" ,"termcolor==1.1.0" ,"toml==0.10.1" ,"typed-ast==1.4.1" ,"wcwidth==0.2.5" ,"wrapt==1.12.1" ,"zipp==3.2.0"],
+    install_requires=install_requires,
     python_requires='>=3.7',
 )