travis (#4)

* travis

* modify yml

* py3 support

Author: ls0f

.gitignore

@@ -1,23 +1,54 @@
-*.log
-*.pot
-*.pyc
-*~
-*.swp
-*tmp
-*.ini
-*.pid
-*.txt
-*DS_Store
-settings.py
-rundev.sh
-*.csv
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
 .project
 .pydevproject
-.settings/*
+
+# Rope
+.ropeproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
 .idea/*
-tags
-cscope.*
-[sS]itemap.xml
-secure_settings.py
-/static/payment_flow_attachments/
-secure_settings.py

.travis.yml

@@ -0,0 +1,16 @@
+# https://travis-ci.org/lovedboy/pwm
+language: python
+python:
+    - 2.7.8
+    - 2.7
+    - 3.3
+    - 3.4
+    - 3.5
+    - nightly
+
+script:
+    - python -m unittest discover
+    - python setup.py  install
+    - cd travis
+    - export PWM_DB_PATH="pwm.db"
+    - /bin/sh setup.sh

pwm/__init__.py

@@ -1 +1 @@
-from pwm import *
+from .pwm import *

pwm/pwm.py

@@ -1,6 +1,7 @@
-#!coding:utf-8
+# coding:utf-8
 
 from hashlib import sha1
+from base64 import b64encode
 import sys
 import hmac
 import re
@@ -11,7 +12,7 @@
 
 
 __author = 'lovedb0y'
-__version = '0.1'
+__version = '0.2'
 __package = 'pwm'
 
 
@@ -22,12 +23,15 @@ def __init__(self, key, db_path=None):
         self.passwd_length = 15
         self.db_path = db_path
         self.table = 'pwm'
-        self._create_table()
 
     def gen_passwd(self, raw):
 
-        h = hmac.new(self.key, raw, sha1)
-        base64 = h.digest().encode("base64")
+        if sys.version_info > (3, 0):
+            h = hmac.new(self.key.encode(), raw.encode(), sha1)
+            base64 = b64encode(h.digest()).decode()
+        else:
+            h = hmac.new(self.key, raw, sha1)
+            base64 = h.digest().encode("base64")
         _passwd = base64[0: self.passwd_length]
         return self._format_passwd(_passwd)
 
@@ -55,13 +59,12 @@ def _format_passwd(self, passwd):
 
     def _get_conn(self):
         if self.db_path is None:
-            print "You didn't set you PWD_DB_PATH ENV"
+            print ("You didn't set you PWD_DB_PATH ENV")
             sys.exit(1)
         try:
             conn = sqlite3.connect(self.db_path)
         except sqlite3.OperationalError:
-            print "PWD_DB_PATH: %s is invalid! "\
-                    "(Is it a directory or a file?)" % self.db_path
+            print ("PWD_DB_PATH: {} is invalid! (Is it a directory or a file?)".format(self.db_path))
             sys.exit(1)
         return conn
 
@@ -129,12 +132,14 @@ def _delete(self, id):
         sql = "delete from {} where id={}".format(self.table, id)
         with self:
             cur = self.conn.cursor()
-            raw_count = cur.execute(sql)
-            return raw_count
+            cur.execute(sql)
+            row_count = cur.rowcount
+            return row_count
 
     def insert(self, domain, account, batch):
+        self._create_table()
         self._insert_account(domain, account, batch or '')
-        print "save success"
+        print ("save success")
 
     @staticmethod
     def gen_sign_raw(domain, account, batch):
@@ -149,35 +154,36 @@ def gen_account_passwd(self, domain, account, batch):
         return self.gen_passwd(raw)
 
     def delete(self, id):
+        self._create_table()
         row_count = self._delete(id)
-        print "remove success, %s record(s) removed" % (row_count)
+        print ("remove success, {} record(s) removed".format(row_count, ))
 
     def search(self, keyword):
 
+        self._create_table()
         if keyword == '*':
             keyword = ''
 
         result = self._query_account(keyword)
-        fmt = "%-5s|%-40s|%-35s|%-20s|%-5s"
-        print fmt % ("ID", "DOMAIN", "ACCOUNT", "PASWORD", "BATCH")
-        print fmt % ("-"*5, "-"*40, "-"*35, "-"*20, "-"*5)
+        fmt = "{:5s}|{:40s}|{:35s}|{:20s}|{:5s}"
+        print (fmt.format("ID", "DOMAIN", "ACCOUNT", "PASWORD", "BATCH"))
+        print (fmt.format("-"*5, "-"*40, "-"*35, "-"*20, "-"*5))
         for item in result:
-            print fmt % (item[0], item[1], item[2],
-                         self.gen_account_passwd(item[1], item[2], item[3]),
-                         item[3])
+            passwd = self.gen_account_passwd(item[1], item[2], item[3])
+            print (fmt.format(str(item[0]), item[1], item[2], passwd, item[3]))
 
-        print "\n{} records found.\n".format(len(result))
+        print ("\n{} records found.\n".format(len(result)))
 
 
 def main():
 
     db_path = os.getenv("PWM_DB_PATH", None)
     if db_path is None:
-        print "##########WARNING:############"
-        print "You didn't set you PWD_DB_PATH ENV"
-        print "echo \"export PWM_DB_PATH=your_path\" >> ~/.bashrc"
-        print "source ~/.bashrc"
-        print "###############################"
+        print ("##########WARNING:############")
+        print ("You didn't set you PWD_DB_PATH ENV")
+        print ("echo \"export PWM_DB_PATH=your_path\" >> ~/.bashrc")
+        print ("source ~/.bashrc")
+        print ("###############################")
     parse = OptionParser(version="{} {}".format(__package, __version))
 
     parse.add_option('-k', '--key', help="your secret key", nargs=0)
@@ -194,7 +200,7 @@ def main():
         help="remove your account and domain by id", nargs=1, type=int)
     parse.add_option(
         '-b', '--batch',
-        help="add batch to generate diffrent passwd with same domain and account",  # noqa
+        help="add batch to generate different passwd with same domain and account",  # noqa
         nargs=1, type=int)
     (options, args) = parse.parse_args()
 
@@ -220,9 +226,9 @@ def main():
         parse.print_help()
         return
 
-    print "passwd is :\n{}".format(
+    print ("passwd is :{}".format(
         pwm.gen_account_passwd(
-            options.domain, options.account, options.batch))
+            options.domain, options.account, options.batch)))
 
     # 保存
     if options.save is not None:

pwm/test_pwm.py

@@ -0,0 +1,48 @@
+# coding:utf-8
+
+from unittest import TestCase
+from pwm import PWM
+import re
+import os
+
+
+class TestPwm(TestCase):
+
+    def setUp(self):
+        self.db_path = os.path.join(os.path.dirname(__file__), "tmp.dat")
+        self.p = PWM(key='123456',  db_path= self.db_path)
+
+    def tearDown(self):
+        if os.path.exists(self.db_path):
+            os.unlink(os.path.join(os.path.dirname(__file__), "tmp.dat"))
+
+    def test_gen_passwd(self):
+
+        passwd = self.p.gen_passwd('1234')
+        self.assertTrue(re.search(r"[0-9]", passwd) is not None)
+        self.assertTrue(re.search(r"[a-z]", passwd) is not None)
+        self.assertTrue(re.search(r"[A-Z]", passwd) is not None)
+
+    def test_insert(self):
+        self.p.insert(domain='github.com', account='lovedboy', batch='')
+        res = self.p._query_account('github.com')
+        self.assertEqual(res, [(1, 'github.com', 'lovedboy', '')])
+
+    def test_search(self):
+        self.p.insert(domain='github.com', account='lovedboy', batch='')
+        self.p.search('*')
+
+    def test_delete(self):
+        self.p.insert(domain='github.com', account='lovedboy', batch='')
+        res = self.p._query_account('github.com')
+        self.assertEqual(res, [(1, 'github.com', 'lovedboy', '')])
+        self.p.delete(1)
+        res = self.p._query_account('github.com')
+        self.assertEqual(res, [])
+
+    def test_gen_account_password(self):
+
+        p = self.p.gen_account_passwd('github.com', 'lovedboy', '')
+        self.assertEqual(p, 'lcrv5vttjqOk7c3')
+
+

setup.py

@@ -1,13 +1,14 @@
-#coding:utf-8
-from setuptools import setup,find_packages
+# coding:utf-8
+
+from setuptools import setup, find_packages
 
 PACKAGE = "pwm-tool"
 NAME = "pwm-tool"
-DESCRIPTION = "passwd manager tool"
+DESCRIPTION = "password manager tool"
 AUTHOR = "lovedboy"
 AUTHOR_EMAIL = "[email protected]"
 URL = "https://github.com/lovedboy/pwm"
-VERSION = '0.1.1'
+VERSION = '0.2'
 
 setup(
     name=NAME,
@@ -17,10 +18,10 @@
     author_email=AUTHOR_EMAIL,
     license="BSD",
     url=URL,
-    include_package_data = True,
+    include_package_data=True,
     scripts=['bin/pwm'],
-    packages = find_packages(),
-    classifiers = [
+    packages=find_packages(),
+    classifiers=[
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
         'Intended Audience :: Developers',

travis/setup.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e;
+
+# check pwm exists;
+pwm;
+
+# save;
+
+pwm -d github.com -a lovedboy -w;
+
+# search;
+
+pwm -s github | grep github.com;
+pwm -s github | grep LNXStZoEGuHi9rb;
+pwm -s github | grep "1 records";
+
+# delete;
+
+pwm -r 1 | grep '1 record(s) removed';
+pwm -s github | grep "0 records";