Merge pull request #796 from dadav/fix/version_parsing

Fix/version parsing

bin/pwnagotchi

@@ -115,7 +115,7 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     if args.version:
-        print(pwnagotchi.version)
+        print(pwnagotchi.__version__)
         sys.exit(0)
 
     config = utils.load_config(args)

builder/pwnagotchi.yml

@@ -218,7 +218,7 @@
 
   - name: fetch pwnagotchi version
     set_fact:
-      pwnagotchi_version: "{{ lookup('file', '/usr/local/src/pwnagotchi/pwnagotchi/__init__.py') | replace('\n', ' ') | regex_replace('.*version.*=.*''([0-9]+\\.[0-9]+\\.[0-9]+[A-Za-z0-9]*)''.*', '\\1') }}"
+      pwnagotchi_version: "{{ lookup('file', '/usr/local/src/pwnagotchi/pwnagotchi/_version.py') | regex_replace('.*__version__.*=.*''([0-9]+\\.[0-9]+\\.[0-9]+[A-Za-z0-9]*)''.*', '\\1') }}"
 
   - name: pwnagotchi version found
     debug:
@@ -228,7 +228,7 @@
     command: "python3 setup.py sdist bdist_wheel"
     args:
       chdir: /usr/local/src/pwnagotchi
-    when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi.version)
+    when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: install opencv-python
     pip:
@@ -246,7 +246,7 @@
     pip:
       name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
       extra_args: "--no-cache-dir"
-    when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi.version)
+    when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: download and install pwngrid
     unarchive:

pwnagotchi/__init__.py

@@ -6,7 +6,7 @@ import re
 import pwnagotchi.ui.view as view
 import pwnagotchi
 
-version = '1.4.3'
+from _version import __version__
 
 _name = None
 

pwnagotchi/_version.py

@@ -0,0 +1 @@
+__version__ = '1.4.3'

pwnagotchi/agent.py

@@ -49,7 +49,7 @@ class Agent(Client, Automata, AsyncAdvertiser, AsyncTrainer):
         if not os.path.exists(config['bettercap']['handshakes']):
             os.makedirs(config['bettercap']['handshakes'])
 
-        logging.info("%s@%s (v%s)", pwnagotchi.name(), self.fingerprint(), pwnagotchi.version)
+        logging.info("%s@%s (v%s)", pwnagotchi.name(), self.fingerprint(), pwnagotchi.__version__)
         for _, plugin in plugins.loaded.items():
             logging.debug("plugin '%s' v%s", plugin.__class__.__name__, plugin.__version__)
 

pwnagotchi/grid.py

@@ -85,7 +85,7 @@ def update_data(last_session):
         },
         'uname': subprocess.getoutput("uname -a"),
         'brain': brain,
-        'version': pwnagotchi.version
+        'version': pwnagotchi.__version__
     }
 
     logging.debug("updating grid data: %s" % data)

pwnagotchi/mesh/utils.py

@@ -17,7 +17,7 @@ class AsyncAdvertiser(object):
         self._keypair = keypair
         self._advertisement = {
             'name': pwnagotchi.name(),
-            'version': pwnagotchi.version,
+            'version': pwnagotchi.__version__,
             'identity': self._keypair.fingerprint,
             'face': faces.FRIEND,
             'pwnd_run': 0,

pwnagotchi/plugins/default/auto-update.py

@@ -183,7 +183,7 @@ class AutoUpdate(plugins.Plugin):
                 to_check = [
                     ('bettercap/bettercap', parse_version('bettercap -version'), True, 'bettercap'),
                     ('evilsocket/pwngrid', parse_version('pwngrid -version'), True, 'pwngrid-peer'),
-                    ('evilsocket/pwnagotchi', pwnagotchi.version, False, 'pwnagotchi')
+                    ('evilsocket/pwnagotchi', pwnagotchi.__version__, False, 'pwnagotchi')
                 ]
 
                 for repo, local_version, is_native, svc_name in to_check:

pwnagotchi/ui/view.py

@@ -136,7 +136,7 @@ class View(object):
         return self._state.get(key)
 
     def on_starting(self):
-        self.set('status', self._voice.on_starting() + ("\n(v%s)" % pwnagotchi.version))
+        self.set('status', self._voice.on_starting() + ("\n(v%s)" % pwnagotchi.__version__))
         self.set('face', faces.AWAKE)
 
     def on_ai_ready(self):

scripts/release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # nothing to see here, just a utility i use to create new releases ^_^
 
-VERSION_FILE=$(dirname "${BASH_SOURCE[0]}")/../pwnagotchi/__init__.py
+VERSION_FILE=$(dirname "${BASH_SOURCE[0]}")/../pwnagotchi/_version.py
 echo "version file is $VERSION_FILE"
 CURRENT_VERSION=$(cat $VERSION_FILE | grep version | cut -d"'" -f2)
 TO_UPDATE=(
@@ -25,4 +25,4 @@ git tag -a v$NEW_VERSION -m "release v$NEW_VERSION"
 git push origin v$NEW_VERSION
 
 echo
-echo "All done, v$NEW_VERSION released ^_^"
+echo "All done, v$NEW_VERSION released ^_^"

setup.py

@@ -4,6 +4,7 @@ from setuptools import setup, find_packages
 import os
 import glob
 import shutil
+import re
 
 
 def install_file(source_filename, dest_filename):
@@ -42,16 +43,27 @@ def installer():
     # for people updating https://github.com/evilsocket/pwnagotchi/pull/551/files
     os.system("systemctl enable fstrim.timer")
 
+def version(version_file):
+    with open(version_file, 'rt') as vf:
+        version_file_content = vf.read()
+
+    version_match = re.search(r"__version__\s*=\s*[\"\']([^\"\']+)", version_file_content)
+    if version_match:
+        return version_match.groups()[0]
+
+    return None
+
 
 installer()
 
 with open('requirements.txt') as fp:
     required = [line.strip() for line in fp if line.strip() != ""]
 
-import pwnagotchi
+VERSION_FILE = 'pwnagotchi/_version.py'
+pwnagotchi_version = version(VERSION_FILE)
 
 setup(name='pwnagotchi',
-      version=pwnagotchi.version,
+      version=pwnagotchi_version,
       description='(⌐■_■) - Deep Reinforcement Learning instrumenting bettercap for WiFI pwning.',
       author='evilsocket && the dev team',
       author_email='evilsocket@gmail.com',