Updating history

Author: CloudHero

hero

@@ -15,7 +15,7 @@ from lib.interactive import interactive_shell
 from lib.pyhero import Client
 from lib.prompter import *
 from lib.utils import (write_to_file, set_keys_to_empty_values,
-                       get_docker_ip_for_environment)
+                       get_docker_ip_for_environment, update_history)
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
@@ -619,4 +619,5 @@ def register(**kwargs):
 
 
 if __name__ == '__main__':
+    update_history(cloud_hero)
     hero_cli()

lib/__init__.py

@@ -1,5 +0,0 @@
-import constants
-import interactive
-import pyhero
-import prompter
-import utils

lib/constants.py

@@ -1,5 +1,5 @@
 VERBOSE = False
-CLI_VERSION = '0.3'
+CLI_VERSION = '0.3.1'
 
 # API-related constants.
 # https://docs.cloudhero.io
@@ -11,6 +11,7 @@
 CLOUD_HERO_DIR = '~/.herorc/'
 CLOUD_HERO_SSH_KEY = CLOUD_HERO_DIR + '.ssh/id_rsa_cloudhero'
 CLOUD_HERO_TOKEN = CLOUD_HERO_DIR + 'token'
+CLOUD_HERO_HISTORY = CLOUD_HERO_DIR + 'history.json'
 CLOUD_HERO_CACHE_NODES = CLOUD_HERO_DIR + 'cache/nodes'
 CLOUD_HERO_CACHE_ENVIRONMENTS = CLOUD_HERO_DIR + 'cache/enviornments'
 CLOUD_HERO_CACHE_OPTIONS = CLOUD_HERO_DIR + 'cache/options'

lib/pyhero.py

@@ -24,7 +24,8 @@
     'environments': '/environments',
     'applications': '/applications',
     'swarm': '/swarm',
-    'feedback': '/feedback'
+    'feedback': '/feedback',
+    'history': '/history'
 }
 
 
@@ -172,6 +173,14 @@ def send_feedback(self, data):
         return self._result(self.post_json(ENDPOINTS['feedback'],
                                            data=data))
 
+    def send_history(self, data):
+        try:
+            return self._result(self.post_json(ENDPOINTS['history'],
+                                               data=data))
+        except:
+            # Silently continue if /history endpoint is not available.
+            pass
+
     @cache_to_file(CLOUD_HERO_CACHE_OPTIONS, ttl=CLIENT_CACHE_OPTIONS_TTL)
     def show_options(self, endpoint):
         """

lib/utils.py

@@ -2,9 +2,10 @@
 import functools
 import json
 import os
+import sys
 import time
 
-from constants import CLOUD_HERO_CACHE_OPTIONS, NotFound
+from lib.constants import CLOUD_HERO_CACHE_OPTIONS, CLOUD_HERO_HISTORY, NotFound
 
 
 def write_to_file(content, file_path, is_json=False):
@@ -68,14 +69,6 @@ def invalidate_cache(*file_paths):
     def wrap(func):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
-            for file_path in file_paths:
-                expanded_file_path = os.path.expanduser(file_path)
-                try:
-                    os.remove(expanded_file_path)
-                except OSError as exc:
-                    if exc.errno == errno.ENOENT:
-                        continue
-                    raise
             return func(*args, **kwargs)
         return wrapper
     return wrap
@@ -124,3 +117,20 @@ def get_docker_ip_for_environment(node_details, environment_id):
 
     if environment_found is False:
         raise NotFound('Environment {} not found!'.format(environment_id))
+
+
+def update_history(cloud_hero):
+    user_command = ' '.join(sys.argv)
+    timestamp = int(time.time())
+    content = read_from_file(CLOUD_HERO_HISTORY, is_json=True)
+
+    command_history = (user_command, timestamp)
+    if not content:
+        content = [command_history]
+    else:
+        content.append(command_history)
+        if len(content) > 10:
+            cloud_hero.send_history(content)
+            content = None
+
+    write_to_file(content, CLOUD_HERO_HISTORY, is_json=True)