v0.2.1: Also show “no passwords” error message if only dotfiles exist (…

…fix #19) Signed-off-by: Chris Warrick <[email protected]>
Kwpolska · Dec 24, 2017 · 5a8d6b6 · 5a8d6b6
1 parent 98921ee
commit 5a8d6b6
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 110 deletions.
diff --git a/.pypt/AURvm/aurvm_client.py b/.pypt/AURvm/aurvm_client.py
@@ -1,6 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 # AURvm client script
-# Usage: ./aurvm_client.py $PROJECT $PROJECTLC $version use_git[true|false]
+# Usage: ./aurvm_client.py $PROJECT $AUR_PKGNAME $AUR_PKGNAME_GIT $version use_git[true|false]
 # Part of the Python Project Template.
 # Copyright © 2013-2017, Chris Warrick.
 # All rights reserved.
@@ -40,9 +41,9 @@
 import sys
 
 try:
-    _, project, projectlc, version, use_git = sys.argv
+    _, project, aur_pkgname, aur_pkgname_git, version, use_git = sys.argv
 except ValueError:
-    print("Usage: ./aurvm_client.py $PROJECT $PROJECTLC $version use_git[true|false]")
+    print("Usage: ./aurvm_client.py $PROJECT $AUR_PKGANME $AUR_PKGNAME_GIT $version use_git[true|false]")
 
 use_git = True if use_git == 'true' else False
 if use_git:
@@ -56,11 +57,13 @@
 
 data = json.dumps({
     'project': project,
-    'projectlc': projectlc,
+    'aur_pkgname': aur_pkgname,
+    'aur_pkgname_git': aur_pkgname_git,
     'version': version,
     'use_git': use_git,
     'gitver': gitver,
-    'pkgbuild': pkgbuild
+    'pkgbuild': pkgbuild,
+    '_api': '2'
 }, ensure_ascii=True, sort_keys=True).encode('utf-8')
 
 print(base64.b64encode(data).decode('utf-8'))
diff --git a/.pypt/AURvm/aurvm_heartbeat.sh b/.pypt/AURvm/aurvm_heartbeat.sh
diff --git a/.pypt/AURvm/aurvm_host.py b/.pypt/AURvm/aurvm_host.py
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015-2017, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-06-10
-:Version: 0.2.0
+:Date: 2017-12-24
+:Version: 0.2.1
 
 .. index:: CHANGELOG
 
@@ -19,6 +19,9 @@ More information can be found on GitHub in the `releases section
 Version History
 ===============
 
+0.2.1
+    * Also show “no passwords” error message if only dotfiles exist (fix #19)
+
 0.2.0
     More granular copying features: users can now choose between copying the first line (old default), copying the entire text, or copying specific fields that are separated with ``: `` (colon, space).
 

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chris Warrick <[email protected]>
 pkgname=upass
 _pyname=upass
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc='Console UI for pass'
 arch=('any')

diff --git a/PKGBUILD-git b/PKGBUILD-git
@@ -2,7 +2,7 @@
 pkgname=upass-git
 _pyname=upass
 _gitname=upass
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc='Console UI for pass (git version)'
 arch=('any')

diff --git a/README b/README
@@ -4,8 +4,8 @@ upass.  Console UI for pass.
 :Info: This is the README file for upass.
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015-2017, Chris Warrick.
-:Date: 2017-06-10
-:Version: 0.2.0
+:Date: 2017-12-24
+:Version: 0.2.1
 
 .. image:: https://chriswarrick.com/galleries/upass/directory-listing.png
 

diff --git a/README.rst b/README.rst
@@ -4,8 +4,8 @@ upass.  Console UI for pass.
 :Info: This is the README file for upass.
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015-2017, Chris Warrick.
-:Date: 2017-06-10
-:Version: 0.2.0
+:Date: 2017-12-24
+:Version: 0.2.1
 
 .. image:: https://chriswarrick.com/galleries/upass/directory-listing.png
 

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -5,8 +5,8 @@ Appendix C. Changelog
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015-2017, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-06-10
-:Version: 0.2.0
+:Date: 2017-12-24
+:Version: 0.2.1
 
 .. index:: CHANGELOG
 
@@ -19,6 +19,9 @@ More information can be found on GitHub in the `releases section
 Version History
 ===============
 
+0.2.1
+    * Also show “no passwords” error message if only dotfiles exist (fix #19)
+
 0.2.0
     More granular copying features: users can now choose between copying the first line (old default), copying the entire text, or copying specific fields that are separated with ``: `` (colon, space).
 

diff --git a/docs/LICENSE.rst b/docs/LICENSE.rst
@@ -5,8 +5,8 @@ Appendix B. License for upass
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015-2017, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2017-06-10
-:Version: 0.2.0
+:Date: 2017-12-24
+:Version: 0.2.1
 
 .. index:: LICENSE
 

diff --git a/docs/README.rst b/docs/README.rst
@@ -4,8 +4,8 @@ upass.  Console UI for pass.
 :Info: This is the README file for upass.
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015-2017, Chris Warrick.
-:Date: 2017-06-10
-:Version: 0.2.0
+:Date: 2017-12-24
+:Version: 0.2.1
 
 .. image:: https://chriswarrick.com/galleries/upass/directory-listing.png
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.0'
+version = '0.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = '0.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     dependencies = [l.strip() for l in fh]
 
 setup(name='upass',
-      version='0.2.0',
+      version='0.2.1',
       description='Console UI for pass.',
       keywords='upass',
       author='Chris Warrick',

diff --git a/upass/__init__.py b/upass/__init__.py
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# upass v0.2.0
+# upass v0.2.1
 # Console UI for pass.
 # Copyright © 2015-2017, Chris Warrick.
 # All rights reserved.
@@ -44,7 +44,7 @@
 import configparser
 
 __title__ = 'upass'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 __author__ = 'Chris Warrick'
 __license__ = '3-clause BSD'
 __docformat__ = 'restructuredtext en'

diff --git a/upass/__main__.py b/upass/__main__.py
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# upass v0.2.0
+# upass v0.2.1
 # Console UI for pass.
 # Copyright © 2015-2017, Chris Warrick.
 # See /LICENSE for licensing information.
@@ -177,11 +177,7 @@ def __init__(self):
             self.current = '.'
             self.dir_load(None, self.current)
         else:
-            self._clear_box()
-            self.box.body.extend([
-                urwid.Text(("error", 'Your Password Store is empty.')),
-                urwid.Text('Please use the `pass` command to create passwords. upass is a read-only browser.'),
-                urwid.Text('Press q to exit.')])
+            self.show_empty_error()
 
         column_data = [
             urwid.Button('DiSplay', self.display_selected),
@@ -366,6 +362,8 @@ def dir_load(self, originator, dirname):
             self.box.body.append(BackButton('..', self.dir_load, prevdir,
                                             self))
         else:
+            if not new_directories and not new_passwords:
+                self.show_empty_error()
             self.back_callback = None
         self._make_directory_buttons(new_directories)
         self._make_password_buttons(new_passwords)
@@ -467,6 +465,14 @@ def downlevel(self, event=None):
         b = self.box.get_focus()[0]
         b._emit('click')
 
+    def show_empty_error(self):
+        """Show an error when the store is empty."""
+        self._clear_box()
+        self.box.body.extend([
+            urwid.Text(("error", 'Your Password Store is empty.')),
+            urwid.Text('Please use the `pass` command to create passwords. upass is a read-only browser.'),
+            urwid.Text('Press q to exit.')])
+
     def _make_directory_buttons(self, new_directories):
         """Add directory buttons to the box."""
         for i in new_directories: