Merge pull request #46 from OrkoHunter/updates

Remove sync

Author: OrkoHunter

.gitignore

@@ -55,3 +55,5 @@ docs/_build/
 
 # PyBuilder
 target/
+
+.vscode

keep/about.py

@@ -1,2 +1,2 @@
 __name__ = 'keep'
-__version__ = '2.4.2'
+__version__ = '2.5'

keep/commands/cmd_pull.py keep/commands/removed_cmd_pull.pykeep/commands/cmd_pull.py renamed to keep/commands/removed_cmd_pull.py

@@ -35,12 +35,11 @@ def check_update(forced=False):
         r = requests.get("https://pypi.python.org/pypi/keep/json").json()
         version = r['info']['version']
         curr_version = about.__version__
-        if version != curr_version:
+        if version > curr_version:
             click.secho("Keep seems to be outdated. Current version = "
                         "{}, Latest version = {}".format(curr_version, version) +
                         "\n\nPlease update with ", bold=True, fg='red')
-            click.secho("\tpip --no-cache-dir install -U keep==" + str(version), fg='green')
-            sys.exit(0)
+            click.secho("\tpip3 --no-cache-dir install -U keep==" + str(version), fg='green')
 
 
 def first_time_use(ctx):
@@ -52,16 +51,14 @@ def first_time_use(ctx):
 
     os.mkdir(dir_path)
 
-    register()
+    # register()
     sys.exit(0)
 
 
 def list_commands(ctx):
     table_data = [['Command', 'Description', 'Alias']]
     commands = read_commands()
 
-    print(type(commands))
-
     for cmd, fields in commands.items():
         table_data.append(['$ ' + cmd, fields['desc'], fields['alias']])
 
@@ -119,52 +116,52 @@ def pull(ctx, overwrite):
             click.echo("Local database successfully updated.")
 
 
-def register():
-
-    if not os.path.exists(dir_path):
-        click.secho("\n[CRITICAL] {0} does not exits.\nPlease run 'keep init',"
-                    " and try registering again.\n".format(dir_path),
-                    fg="red", err=True)
-        sys.exit(1)
-
-    # User may not choose to register and work locally.
-    # Registration is required to push the commands to server
-    if click.confirm('Proceed to register?', abort=True, default=True):
-        # Verify for existing user
-        click.echo("Your credentials will be saved in the ~/.keep directory.")
-        email = click.prompt('Email', confirmation_prompt=True)
-        json_res = {'email': email}
-        click.echo('Verifying with existing users...')
-        r = requests.post('https://keep-cli.herokuapp.com/check-user', json=json_res)
-        if r.json()['exists']:
-            click.secho('User already exists !', fg='red')
-            email = click.prompt('Email', confirmation_prompt=True)
-            json_res = {'email': email}
-            r = requests.post('https://keep-cli.herokuapp.com/check-user', json=json_res)
-        # Generate password for the user
-        chars = string.ascii_letters + string.digits
-        password = ''.join(random.choice(chars) for _ in range(255))
-        credentials_file = os.path.join(dir_path, '.credentials')
-        credentials = {
-            'email': email,
-            'password': password
-        }
-        click.secho("Generated password for " + email, fg='cyan')
-        # Register over the server
-        click.echo("Registering new user ...")
-        json_res = {
-            'email': email,
-            'password': password
-        }
-        r = requests.post('https://keep-cli.herokuapp.com/register', json=json_res)
-        if r.status_code == 200:
-            click.secho("User successfully registered !", fg='green')
-            # Save the credentials into a file
-            with open(credentials_file, 'w+') as f:
-                f.write(json.dumps(credentials))
-            click.secho(password, fg='cyan')
-            click.secho("Credentials file saved at ~/.keep/.credentials.json", fg='green')
-    sys.exit(0)
+# def register():
+
+#     if not os.path.exists(dir_path):
+#         click.secho("\n[CRITICAL] {0} does not exits.\nPlease run 'keep init',"
+#                     " and try registering again.\n".format(dir_path),
+#                     fg="red", err=True)
+#         sys.exit(1)
+
+#     # User may not choose to register and work locally.
+#     # Registration is required to push the commands to server
+#     if click.confirm('Proceed to register?', abort=True, default=True):
+#         # Verify for existing user
+#         click.echo("Your credentials will be saved in the ~/.keep directory.")
+#         email = click.prompt('Email', confirmation_prompt=True)
+#         json_res = {'email': email}
+#         click.echo('Verifying with existing users...')
+#         r = requests.post('https://keep-cli.herokuapp.com/check-user', json=json_res)
+#         if r.json()['exists']:
+#             click.secho('User already exists !', fg='red')
+#             email = click.prompt('Email', confirmation_prompt=True)
+#             json_res = {'email': email}
+#             r = requests.post('https://keep-cli.herokuapp.com/check-user', json=json_res)
+#         # Generate password for the user
+#         chars = string.ascii_letters + string.digits
+#         password = ''.join(random.choice(chars) for _ in range(255))
+#         credentials_file = os.path.join(dir_path, '.credentials')
+#         credentials = {
+#             'email': email,
+#             'password': password
+#         }
+#         click.secho("Generated password for " + email, fg='cyan')
+#         # Register over the server
+#         click.echo("Registering new user ...")
+#         json_res = {
+#             'email': email,
+#             'password': password
+#         }
+#         r = requests.post('https://keep-cli.herokuapp.com/register', json=json_res)
+#         if r.status_code == 200:
+#             click.secho("User successfully registered !", fg='green')
+#             # Save the credentials into a file
+#             with open(credentials_file, 'w+') as f:
+#                 f.write(json.dumps(credentials))
+#             click.secho(password, fg='cyan')
+#             click.secho("Credentials file saved at ~/.keep/.credentials.json", fg='green')
+#     sys.exit(0)
 
 
 def remove_command(cmd):

keep/commands/cmd_push.py keep/commands/removed_cmd_push.pykeep/commands/cmd_push.py renamed to keep/commands/removed_cmd_push.py

@@ -21,7 +21,7 @@
         description = 'Personal shell command keeper',
         long_description = long_description,
         author = 'Himanshu Mishra',
-        author_email = 'himanshumishra@iitkgp.ac.in',
+        author_email = 'himanshu.mishra.kgp@gmail.com',
         url = "https://github.com/orkohunter/keep",
         download_url = "https://github.com/orkohunter/keep/archive/master.zip",
         include_package_data=True,