Merge branch 'master' into tests

README.md

@@ -121,7 +121,7 @@ Please substitute `$version` with the appropriate package version.
 
     usage: buku [OPTIONS] [KEYWORD [KEYWORD ...]]
 
-    A private command-line bookmark manager. Your mini web!
+    A powerful command-line bookmark manager. Your mini web!
 
     general options:
       -a, --add URL [tags ...]
@@ -190,9 +190,8 @@ Please substitute `$version` with the appropriate package version.
   - **$XDG_DATA_HOME/buku/bookmarks.db**, if XDG_DATA_HOME is defined (first preference) or
   - **$HOME/.local/share/buku/bookmarks.db**, if HOME is defined (second preference) or
   - the **current directory**.
-- Before version 1.9, buku stored its database in $HOME/.cache/buku/bookmarks.db. If the file exists, buku automatically moves it to new location.
 - It's  advisable  to copy URLs directly from the browser address bar, i.e., along with the leading `http://` or `https://` token. buku looks up title data (found within <title></title> tags of HTML) from the web ONLY for fully-formed HTTP(S) URLs.
-- If the URL contains characters like `;`, `&` or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double (`'`/`"`) quotes.
+- If the URL contains characters like `;`, `&` or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double quotes (`'`/`"`).
 - URLs are unique in DB. The same URL cannot be added twice. You can update tags and re-fetch title data.
 - **Tags**:
   - Comma (`,`) is the tag delimiter in DB. Any tag cannot have comma(s) in it. Tags are filtered (for unique tags) and sorted.

buku

@@ -44,7 +44,7 @@ pipeargs = []           # Holds arguments piped to the program
 noninteractive = False  # Show the prompt or not
 interrupted = False     # Received SIGINT
 DELIMITER = ','         # Delimiter used to store tags in DB
-_VERSION_ = '2.2'       # Program version
+_VERSION_ = '2.3'       # Program version
 
 
 # Crypto globals
@@ -1454,7 +1454,7 @@ if __name__ == '__main__':
 
     # Setup custom argument parser
     argparser = ExtendedArgumentParser(
-        description='A private command-line bookmark manager. Your mini web!',
+        description='A powerful command-line bookmark manager. Your mini web!',
         formatter_class=argparse.RawTextHelpFormatter,
         usage='''buku [OPTIONS] [KEYWORD [KEYWORD ...]]''',
         add_help=False
@@ -1583,7 +1583,7 @@ if __name__ == '__main__':
         print('Version %s' % _VERSION_)
 
     # Move pre-1.9 database to new location
-    BukuDb.move_legacy_dbfile()
+    #BukuDb.move_legacy_dbfile()
 
     # Handle encrypt/decrypt options at top priority
     if args.encrypt is not None:

buku.1

@@ -1,6 +1,6 @@
-.TH "BUKU" "1" "Jun 2016" "Version 2.2" "User Commands"
+.TH "BUKU" "1" "Jun 2016" "Version 2.3" "User Commands"
 .SH NAME
-buku \- A private command-line bookmark manager. Your mini web!
+buku \- A powerful command-line bookmark manager. Your mini web!
 .SH SYNOPSIS
 .B buku [OPTIONS] [KEYWORD [KEYWORD ...]]
 .SH DESCRIPTION
@@ -13,11 +13,9 @@ The SQLite3 database file is stored in:
   - \fI$HOME/.local/share/buku/bookmarks.db\fR, if HOME is defined (second preference) or
   - the \fIcurrent directory\fR.
 .PP
-Before version 1.9, buku stored its database in $HOME/.cache/buku/bookmarks.db. If the file exists, buku automatically moves it to new location.
-.PP
 It's advisable to copy URLs directly from the browser address bar, i.e., along with the leading 'http://' or 'https://' token. buku looks up title data (found within <title></title> tags of HTML) from the web ONLY for fully-formed HTTP(S) URLs.
 .PP
-If the URL contains characters like ';', '&' or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double ('/") qoutes.
+If the URL contains characters like ';', '&' or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double quotes ('/").
 .PP
 URLs are unique in DB. The same URL cannot be added twice. You can update tags and re-fetch title data.
 .PP
@@ -94,12 +92,12 @@ Search bookmarks by tag. List all tags alphabetically, if no arguments.
 .BI \-l " " \--lock " [N]"
 Encrypt (lock) the DB file with
 .I N
-(> 0, defualt 8) hash passes to generate key.
+(> 0, default 8) hash passes to generate key.
 .TP
 .BI \-k " " \--unlock " [N]"
 Decrypt (unlock) the DB file with
 .I N
-(> 0, defualt 8) hash passes to generate key.
+(> 0, default 8) hash passes to generate key.
 .SH POWER OPTIONS
 .TP
 .BI \-p " " \--print " [N]"

tests/test_bukuDb.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# Unit test cases for buku
 # -*- coding: utf-8 -*-
 from genericpath import exists
 import imp