Merge branch 'single-tv' into dev

Conflicts:
	bin/ssh.py
	stash.py

bin/ssh.py

@@ -19,6 +19,8 @@
   --password PASSWORD   Password for rsa/dsa key or password login
   -p PORT, --port PORT  port for ssh default: 22
 '''
+import os
+import sys
 import argparse
 import threading
 import time
@@ -96,6 +98,7 @@ def connect(self,host='', passwd=None, port=22):
 
     def find_ssh_keys(self):
         files = []
+        APP_DIR = os.environ['STASH_ROOT']
         for file in os.listdir(APP_DIR+'/.ssh'):
             if '.' not in file:
                 files.append(APP_DIR+'/.ssh/'+file)
@@ -122,10 +125,8 @@ def update_screen(self):
             if str(item) != ' '*100:
                 break
             count -=1
-        text = '\n'.join(self.screen.display[:count])
-        # clear the screen and write output
-        self.stash.term.seek(0)
-        self.stash.term.truncate()
+        text = '\n'.join(self.screen.display[:count]).rstrip() + ' '
+        self.stash.term.truncate(0, flush=False)
         self.stash.term.write(text)
 
     def single_exec(self,command):
@@ -170,14 +171,14 @@ def edit_file(self,remote_file):
         import editor
 
         try:
-            temp = tempfile.NamedTemporaryFile(dir=os.path.expanduser('~/Documents') , suffix='.py')
+            temp = tempfile.NamedTemporaryFile(dir=os.path.expanduser('~/Documents'), suffix='.py')
             cur_path = editor.get_path()
             sftp = self.ssh.open_sftp()
             path = self.get_remote_path()
             res = sftp.getfo(path+remote_file,temp)
             #editor.open_file(temp.name)
             temp.seek(0)
-            print '***When you are finished editing the file, you must come back to console to confim changes***'
+            print '***When you are finished editing the file, you must come back to console to confirm changes***'
             editor.open_file(temp.name)
             time.sleep(1.5)
             console.hide_output()
@@ -187,7 +188,7 @@ def edit_file(self,remote_file):
                 with open(temp.name,'r') as f:
                     sftp.putfo(f,path+remote_file)
                     print 'File transfered.'
-        except exception, e:
+        except Exception, e:
             print e
         finally: 
             temp.close()
@@ -204,8 +205,8 @@ def interactive(self):
         t1 = threading.Thread(target=self.stdout_thread)
         t1.start()
         while True:
-            if self.chan.send_ready():        
-                tmp = sys.stdin.readline().replace('\n','')
+            if self.chan.send_ready():   
+                tmp = raw_input()     
                 ssh_args = tmp.split(' ')
                 if ssh_args[0] == 'exit':
                     self.exit()

dummyui.py

@@ -9,7 +9,7 @@ def in_background(func):
     return func
 
 def get_screen_size():
-    return (100, 100)
+    return 100, 100
 
 
 class View(object):
@@ -26,6 +26,9 @@ def add_subview(self, v):
         self.subviews.append(v)
         v.superview = self
 
+    def remove_subview(self, v):
+        self.subviews.remove(v)
+
     def present(self, style='popover'):
         pass
 
@@ -41,8 +44,6 @@ def send_to_back(self):
     def bring_to_front(self):
         pass
 
-    def begin_editing(self):
-        pass
 
 class TextField(View):
     def __init__(self, *args, **kwargs):
@@ -53,6 +54,22 @@ class TextView(View):
     def __init__(self, *args, **kwargs):
         super(TextView, self).__init__(*args, **kwargs)
         self.text = ''
+        self.selected_range = (0, 0)
+
+    def replace_range(self, rng, s):
+        self.text = self.text[:rng[0]] + s + self.text[rng[1]:]
+        tot_len = len(self.text)
+        self.selected_range = (tot_len, tot_len)
+
+    def begin_editing(self):
+        pass
+
+    def end_editing(self):
+        pass
+
+class ScrollView(View):
+    pass
+
 
 class Button(View):
     def __init__(self, *args, **kwargs):