Merge pull request #4 from xingweitian/dev

v0.1.1 -> v0.1.2

Author: xingweitian

README.md

@@ -4,8 +4,6 @@
 
 This is a convenient tool to fund your WatCard easily. I am too lazy to do it by my hand everytime, so I write this tool.
 
-For now, it is only tested in __Ubuntu18.04__ with __Python3.6__.
-
 ## installation
 
 ```bash
@@ -14,31 +12,18 @@ pip install fund-my-watcard
 
 ## usage
 
-First, set the path to your chromedriver as environment variable:
-
-```bash
-export CHROMEDRIVER="/path/to/chromedriver"
-```
-
-Check if the path of chromedriver is correct:
-
 ```bash
-env | grep CHROMEDRIVER
-```
-
-Find and download the corresponding versions of your chrome at [here](http://chromedriver.chromium.org/downloads)
+teachertian@v1040-wn-rt-c-83-249 ~/PycharmProjects/fundmywatcard ±dev⚡ » watcard
+usage: watcard [-h] [-c | -f FUND | -v]
 
-Then, try the following commands:
-
-```bash
-# see the help of watcard
-watcard --help
+Fund my WatCard: A tool to fund WatCard easily.
 
-# gengerate the config file
-watcard --config
+optional arguments:
+  -h, --help            show this help message and exit
+  -c, --config          generate the config file
+  -f FUND, --fund FUND  the fund amount to the WatCard
+  -v, --version         show the version of fund-my-watcard
 
-# fund your WatCard with $10
-watcard --fund 10
 ```
 
 ## contributing

fund-my-watcard/watcard

@@ -6,6 +6,7 @@ import os
 import time
 
 from splinter import Browser
+from webdriver_manager.chrome import ChromeDriverManager
 
 
 def generate_config_file():
@@ -30,7 +31,7 @@ def generate_config_file():
     with open("watcard.json", "w+") as json_file:
         json.dump(_config_info, json_file, indent=2)
     assert os.path.isfile("watcard.json") is True
-    print("Generate config file successfully. Please fill your information in watcard.json")
+    print("[fund-my-watcard] Generate config file successfully. Please fill your information in watcard.json")
 
 
 class MyWatCard:
@@ -55,7 +56,7 @@ class MyWatCard:
 
     def add_fund(self, amount):
         try:
-            with Browser("chrome", **{"executable_path": os.environ["CHROMEDRIVER"]}, incognito=True,
+            with Browser("chrome", **{"executable_path": ChromeDriverManager().install()}, incognito=True,
                          headless=True) as browser:
                 browser.visit("https://watcard.uwaterloo.ca/OneWebUW/addfunds_watiam.asp")
                 browser.fill("UserName", self.userName)
@@ -95,7 +96,7 @@ class MyWatCard:
 class NoConfigFileException(Exception):
     """Raised when watcard.json is not found."""
 
-    def __init__(self, message="Cannot find watcard.json, run 'watcard --config' at first."):
+    def __init__(self, message="[fund-my-watcard] Cannot find watcard.json, try 'watcard --config'."):
         super(NoConfigFileException, self).__init__(message)
         self.message = message
 
@@ -104,6 +105,7 @@ parser = argparse.ArgumentParser(description="Fund my WatCard: A tool to fund Wa
 group = parser.add_mutually_exclusive_group()
 group.add_argument("-c", "--config", help="generate the config file", action="store_true")
 group.add_argument("-f", "--fund", type=float, help="the fund amount to the WatCard", action="store")
+group.add_argument("-v", "--version", help="show the version of fund-my-watcard", action="store_true")
 args = parser.parse_args()
 
 if args.config:
@@ -117,11 +119,14 @@ if args.fund:
         _my_wat_card = MyWatCard(**_config)
         res = _my_wat_card.add_fund(amount)
         if res:
-            print("Adding ${} to account {} successfully.".format(amount, _config["userName"]))
+            print("[fund-my-watcard] Adding ${} to account {} successfully.".format(amount, _config["userName"]))
         else:
-            print("Adding ${} to account {} failed.".format(amount, _config["userName"]))
+            print("[fund-my-watcard] Adding ${} to account {} failed.".format(amount, _config["userName"]))
     else:
         raise NoConfigFileException()
 
-if not args.config and not args.fund:
-    args = parser.parse_args(["-h"])
+if args.version:
+    print("fund-my-watcard v0.1.2")
+
+if not args.config and not args.fund and not args.version:
+    parser.parse_args(["-h"])

requirements.txt

@@ -2,3 +2,4 @@ selenium==3.141.0
 splinter==0.10.0
 urllib3==1.25.3
 six==1.12.0
+webdriver-manager==1.7

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name="fund-my-watcard",
-    version="0.1.1",
+    version="0.1.2",
     packages=find_packages(),
     scripts=["fund-my-watcard/watcard"],
     install_requires=requirements,
@@ -25,8 +25,9 @@
     keywords="WatCard",
     url="https://github.com/xingweitian/fund-my-watcard",
     classifiers=[
-        "Development Status :: 3 - Alpha",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
     ],
 )