Merge pull request #659 from kanet77/tk/less-chatty-cmdline-option

Add a command line option for --less-chatty. Fix #626.

1 files changed, 10 insertions, 4 deletions

diff --git a/pgcli/main.py b/pgcli/main.py
index e960137f..1e533cc8 100755
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -105,7 +105,7 @@ class PGCli(object):
 
     def __init__(self, force_passwd_prompt=False, never_passwd_prompt=False,
                  pgexecute=None, pgclirc_file=None, row_limit=None,
-                 single_connection=False, prompt=None):
+                 single_connection=False, less_chatty=None, prompt=None):
 
         self.force_passwd_prompt = force_passwd_prompt
         self.never_passwd_prompt = never_passwd_prompt
@@ -137,7 +137,7 @@ class PGCli(object):
         self.syntax_style = c['main']['syntax_style']
         self.cli_style = c['colors']
         self.wider_completion_menu = c['main'].as_bool('wider_completion_menu')
-        self.less_chatty = c['main'].as_bool('less_chatty')
+        self.less_chatty = bool(less_chatty) or c['main'].as_bool('less_chatty')
         self.null_string = c['main'].get('null_string', '<null>')
         self.prompt_format = prompt if prompt is not None else c['main'].get('prompt', self.default_prompt)
         self.on_error = c['main']['on_error'].upper()
@@ -158,6 +158,7 @@ class PGCli(object):
             'asterisk_column_order': c['main']['asterisk_column_order'],
             'qualify_columns': c['main']['qualify_columns'],
             'single_connection': single_connection,
+            'less_chatty': less_chatty,
             'keyword_casing': keyword_casing,
         }
 
@@ -729,11 +730,15 @@ class PGCli(object):
         help='Use DSN configured into the [alias_dsn] section of pgclirc file.')
 @click.option('-R', '--row-limit', default=None, envvar='PGROWLIMIT', type=click.INT,
         help='Set threshold for row limit prompt. Use 0 to disable prompt.')
+@click.option('--less-chatty', 'less_chatty', is_flag=True,
+        default=False,
+        help='Skip intro on startup and goodbye on exit.')
 @click.option('--prompt', help='Prompt format (Default: "\\u@\\h:\\d> ").')
 @click.argument('database', default=lambda: None, envvar='PGDATABASE', nargs=1)
 @click.argument('username', default=lambda: None, envvar='PGUSER', nargs=1)
 def cli(database, user, host, port, prompt_passwd, never_prompt,
-    single_connection, dbname, username, version, pgclirc, dsn, row_limit, prompt):
+    single_connection, dbname, username, version, pgclirc, dsn, row_limit,
+    less_chatty, prompt):
 
     if version:
         print('Version:', __version__)
@@ -756,7 +761,8 @@ def cli(database, user, host, port, prompt_passwd, never_prompt,
                    config_full_path)
 
     pgcli = PGCli(prompt_passwd, never_prompt, pgclirc_file=pgclirc,
-                  row_limit=row_limit, single_connection=single_connection, prompt=prompt)
+                  row_limit=row_limit, single_connection=single_connection,
+                  less_chatty=less_chatty, prompt=prompt)
 
     # Choose which ever one has a valid value.
     database = database or dbname