Update versioning system

.github/workflows/ci.yml

@@ -1,10 +1,14 @@
 name: CI
 
 on:
+  release:
+    types: [published]
   push:
     branches:
       - master
   pull_request:
+    branches:
+      - master
 #  schedule:
 #    - cron: '0 0 * * 1'
 
@@ -50,3 +54,15 @@ jobs:
         $HOME/.r2env/bin/r2 -v
     - name: Uninstalling
       run: sudo pip uninstall -y r2env && rm -rf $HOME/.r2env
+  release-job:
+    name: Publish to pypi
+    runs-on: ubuntu-20.04
+    needs: [integration-tests, flake8, pylint]
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install Dependencies
+        run: pip install -r requirements/dist.txt
+      - name: Release
+        run: make pub

.gitignore

@@ -1,3 +1,8 @@
 .idea
 **/__pycache__/
 venv
+.DS_Store
+AUTHORS
+ChangeLog
+dist/*
+r2env.egg-info

Makefile

@@ -4,7 +4,9 @@ all:
 	pip install .
 
 pub:
-	twine upload --repository-url https://upload.pypi.org/legacy/ --verbose dist/*
+	rm -rf dist
+	$(PYTHON) setup.py sdist
+	twine upload --repository=pypi --verbose dist/*
 
 install:
 	pip install .

r2env/repl.py

@@ -16,7 +16,8 @@ config             - display current .r2env settings
 install   [pkg]    - build and install given package. Use --meson to use it as the build system.
 uninstall [pkg]    - remove selected package
 use [pkg]          - use r2 package defined. pkg should be a release version or latest.
-version            - show the current Radare version and its origin
+path               - show path of current r2 in use
+version            - show version of r2env
 versions           - List all Radare versions installed
 list               - list all Radare packages available to r2env
 shell              - open a new shell with PATH env var set
@@ -28,11 +29,16 @@ def show_help():
     print_console(HELP_MESSAGE)
 
 
+def show_version():
+    print_console(R2Env().version())
+
+
 actions_with_argument = ["install", "uninstall", "use"]
 actions_with_arguments = ["shell"]
 actions = {
     "init": R2Env().init,
-    "version": R2Env().get_r2_path,
+    "version": show_version,
+    "path": R2Env().get_r2_path,
     "config": R2Env().show_config,
     "list": R2Env().list_available_packages,
     "install": R2Env().install,
@@ -45,7 +51,9 @@ actions = {
 
 
 def run_action(action, args, use_meson):
-    if action not in actions:
+    if action == "":
+        show_help()
+    elif action not in actions:
         print_console("[X] Action not found", ERROR)
     elif action in actions_with_arguments:
         actions[action](" ".join(args))
@@ -75,8 +83,8 @@ def main():
     parser.add_argument("action", help="run specified action. (Run r2env help for more information)",
                         action="store", default=["help"])
     parser.add_argument('args', metavar='args', nargs='*', type=str, help='Specified arguments')
-    parser.add_argument("-v", "--version", help="Show r2env version", action="store_true")
-    parser.add_argument("-m", "--meson", help="Use meson as your build system.", action="store_true")
+    parser.add_argument("-v", "--version", dest="version", help="Show r2env version", action="store_true")
+    parser.add_argument("-m", "--meson", dest="meson", help="Use meson as your build system.", action="store_true")
     args = parser.parse_args()
     if args.version:
         print_console(R2Env().version())

requirements/dist.txt

@@ -0,0 +1,5 @@
+-r build.txt
+pip
+pbr
+setuptools
+twine

setup.cfg

@@ -1,11 +1,12 @@
 [metadata]
 license_file = LICENSE
-version = 0.2.2
 name = r2env
-author = 'pancake, murphy'
-author_email = '[email protected], [email protected]'
+author = pancake
+# author_email = '[email protected], [email protected]'
+author_email = [email protected]
 description = radare2 multiple version and environment installation tool
 long_description = file:README.md
+long_description_content_type = text/markdown
 url = https://www.radare.org/
 project_urls =
     Source = https://github.com/radareorg/r2env