Merge pull request #15 from InnoFang/dev

❇️ 🎨 🔧 ✅ update the config to support for updating access tokens

Author: InnoFang

code_counter/conf/config.json

@@ -1,56 +1,56 @@
 {
     "suffix": [
-        "go",
-        "lua",
-        "java",
-        "swift",
-        "cu",
-        "h",
-        "pde",
-        "dart",
-        "cs",
-        "rb",
-        "cuh",
+        "asm",
         "php",
-        "lisp",
-        "cpp",
-        "rust",
-        "R",
-        "clj",
-        "jl",
-        "py",
-        "js",
+        "cu",
+        "swift",
+        "java",
+        "scala",
         "vb",
         "hpp",
-        "sh",
+        "r",
+        "cpp",
+        "js",
         "cc",
+        "jl",
+        "ts",
         "m",
-        "scala",
-        "kt",
-        "rs",
         "c",
-        "ts"
+        "dart",
+        "sh",
+        "pde",
+        "kt",
+        "cuh",
+        "rb",
+        "lua",
+        "lisp",
+        "cs",
+        "h",
+        "py",
+        "clj",
+        "go",
+        "rs"
     ],
     "comment": [
         "/*",
-        ";",
-        "\"\"\"\"",
-        "*/",
         ":",
+        "%",
         "//",
         "#",
-        "*"
+        ";",
+        "'",
+        "*",
+        "--"
     ],
     "ignore": [
-        ".idea",
+        "node_modules",
         "dist",
         "target",
-        ".git",
+        "build",
         "venv",
+        ".git",
         ".vscode",
-        "node_modules",
-        "out",
-        "build"
+        ".idea"
     ],
     "access_tokens": {
         "github": "",

code_counter/conf/config.py

@@ -43,6 +43,8 @@ def invoke(self, args):
         if args.restore:
             self.restore()
         else:
+            if any([args.github_token, args.gitee_token]):
+                self.__update_access_token(args.github_token, args.gitee_token)
             if any([args.suffix_reset, args.comment_reset, args.ignore_reset]):
                 self.__reset_config(args.suffix_reset, args.comment_reset, args.ignore_reset)
             if any([args.suffix_add, args.comment_add, args.ignore_add]):
@@ -59,6 +61,16 @@ def __confirm(self, tips):
         check = input(tips)
         return check.strip().lower() == 'y'
 
+    def __update_access_token(self, github_access_token, gitee_access_token):
+        if github_access_token:
+            if self.__confirm("the old Github access token will be updated to `{}` . (y/n) ".format(github_access_token)):
+                self.access_tokens.github = github_access_token
+        if gitee_access_token:
+            if self.__confirm("the old Gitee access token will be updated to `{}` . (y/n) ".format(gitee_access_token)):
+                self.access_tokens.gitee = gitee_access_token
+
+        self.__update()
+
     def __reset_config(self, suffix_reset, comment_reset, ignore_reset):
         if suffix_reset:
             if self.__confirm("'suffix' will be replaced with {} . (y/n) ".format(suffix_reset)):
@@ -146,11 +158,11 @@ def request_gitee_access_token(self):
         print('======================\n')
 
     def restore(self):
-        self.suffix = {"c", "cc", "clj", "cpp", "cs", "cu", "cuh", "dart", "go", "h", "hpp", "java", "jl", "js", "kt",
-                       "lisp", "lua", "pde", "m", "php", "py", "R", "rb", "rs", "rust", "sh", "scala", "swift", "ts",
+        self.suffix = {"asm", "c", "cc", "clj", "cpp", "cs", "cu", "cuh", "dart", "go", "h", "hpp", "java", "jl", "js",
+                       "kt", "lisp", "lua", "pde", "m", "php", "py", "r", "rb", "rs", "sh", "scala", "swift", "ts",
                        "vb"}
-        self.comment = {"#", "//", "/*", "*", "*/", ":", ";", '""""'}
-        self.ignore = {"out", "venv", ".git", ".idea", "build", "target", "node_modules", ".vscode", "dist"}
+        self.comment = {"#", "//", "/*", "*", ":", ";", '--', ';', '%', "'"}
+        self.ignore = {"venv", ".git", ".idea", "build", "target", "node_modules", ".vscode", "dist"}
 
         if self.__confirm('The default configuration will be restored. (y/n) '):
             self.__update()

code_counter/core/args.py

@@ -177,6 +177,11 @@ def __config(self):
         parser.add_argument('--ignore-del', dest='ignore_del', type=split_args,
                             help="delete some values of the 'ignore' in the config")
 
+        parser.add_argument('--github-token', dest='github_token',
+                            help="update the Github access token")
+        parser.add_argument('--gitee-token', dest='gitee_token',
+                            help="update the Gitee access token")
+
         parser.add_argument('--restore', dest='restore', action='store_true',
                             help="restore default config")
 

setup.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8  -*-
+
 import os
 from setuptools import setup, find_packages
 
@@ -27,15 +30,14 @@ def read_readme(file_name):
       long_description_content_type="text/markdown",
       license='Apache License',
       install_requires=["matplotlib", "numpy"],
-      python_requires='>=3.6',
+      python_requires='>=3.7',
       classifiers=[
           "Development Status :: 5 - Production/Stable",
           'Intended Audience :: Developers',
           'License :: OSI Approved :: Apache Software License',
           'Environment :: Console',
           'Topic :: Utilities',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
           'Programming Language :: Python :: 3.9',

tests/test_config.py

@@ -17,11 +17,11 @@
 
 class CodeCounterConfigTest(unittest.TestCase):
     def setUp(self):
-        self.default_suffix = {"c", "cc", "clj", "cpp", "cs", "cu", "cuh", "dart", "go", "h",
-                               "hpp", "java", "jl", "js", "kt", "lisp", "lua", "pde", "m", "php",
-                               "py", "R", "rb", "rs", "rust", "sh", "scala", "swift", "ts", "vb"}
-        self.default_comment = {"#", "//", "/*", "*", "*/", ":", ";", '""""'}
-        self.default_ignore = {"out", "venv", ".git", ".idea", "build", "target", "node_modules", ".vscode", "dist"}
+        self.default_suffix = {"asm", "c", "cc", "clj", "cpp", "cs", "cu", "cuh", "dart", "go", "h", "hpp", "java", "jl", "js",
+                       "kt", "lisp", "lua", "pde", "m", "php", "py", "r", "rb", "rs", "sh", "scala", "swift", "ts",
+                       "vb"}
+        self.default_comment = {"#", "//", "/*", "*", ":", ";", '--', ';', '%', "'"}
+        self.default_ignore = {"venv", ".git", ".idea", "build", "target", "node_modules", ".vscode", "dist"}
 
     @patch('builtins.input')
     def test_Config_restore(self, mock_input):

tests/test_remote.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+# coding:utf8
+
+import sys
+import os
+import unittest
+from unittest.mock import patch
+from code_counter.__main__ import main
+
+test_path = os.path.abspath('.')
+bin_path = os.path.dirname(os.path.join(os.pardir, '..'))
+lib_path = os.path.abspath(os.path.join(bin_path, 'code_counter'))
+app_path = os.path.join(lib_path, '__main__.py')
+
+
+class CodeCounterRemoteTest(unittest.TestCase):
+    @patch('builtins.input')
+    def test_remote_case1(self, mock_input):
+        mock_input.side_effect = ['']
+        options = ['python', app_path,
+                   'remote',
+                   'https://github.com/innofang/code-counter.git',
+                   '-v',
+                   '-o=output.txt']
+        sys.argv[1:] = options[2:]
+        try:
+            main()
+        except:
+            print('Occur Error!')
+
+        output_path = os.path.join(test_path, 'output.txt')
+        self.assertTrue(os.path.exists(output_path))
+        os.remove(output_path)