0.4.2 wip

anki-code · anki-code · commit e805afcb4d80 · 2020-03-06T16:58:20.000+03:00
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ usage: xxh [ssh arguments] [user@]host[:port] [xxh arguments]
 
 usage: xxh [-h] [-V] [-p SSH_PORT] [-l SSH_LOGIN] [-i SSH_PRIVATE_KEY] [-o SSH_OPTION -o ...] 
            [user@]host[:port]
-           [+i] [+if] [+P PASSWORD] [+PP] [+lh LOCAL_XXH_HOME] [+hh HOST_XXH_HOME] 
+           [+i] [+if] [+xc XXH_CONFIG] [+P PASSWORD] [+PP] [+lh LOCAL_XXH_HOME] [+hh HOST_XXH_HOME] 
            [+he HOST_EXECUTE_FILE] [+s SHELL] [+v] [+vv]
 
 Your favorite shell wherever you go through the ssh. 
diff --git a/setup.py b/setup.py
@@ -14,7 +14,8 @@
     python_requires='>=3.6',
     install_requires=[
         'xonsh >= 0.9.13',
-        'pexpect >= 4.8.0'
+        'pexpect >= 4.8.0',
+        'pyyaml'
     ],
     platforms='Unix-like',
     scripts=['xxh'],
diff --git a/xxh b/xxh
@@ -274,7 +274,7 @@ class Xxh:
         argp.add_argument('destination', metavar='[user@]host[:port]', help="Destination may be specified as [user@]host[:port] or host from ~/.ssh/config")
         argp.add_argument('+i','++install', default=False, action='store_true', help="Install xxh to destination host.")
         argp.add_argument('+if','++install-force', default=False, action='store_true', help="Removing the host xxh home and install xxh again.")
-        argp.add_argument('+c','++config', default=self.config_file, help=f"Xxh config file in yaml. Default: " + self.config_file)
+        argp.add_argument('+xc','++xxh-config', default=self.config_file, help=f"Xxh config file in yaml. Default: " + self.config_file)
         argp.add_argument('+P','++password', help="Password for ssh auth.")
         argp.add_argument('+PP','++password-prompt', default=False, action='store_true', help="Enter password manually using prompt.")
         argp.add_argument('+lh','++local-xxh-home', default=self.local_xxh_home, help=f"Local xxh home path. Default: {self.local_xxh_home}")
@@ -301,7 +301,7 @@ class Xxh:
         self.vverbose = opt.vverbose
         self.url = url = self.parse_destination(opt.destination)
 
-        xxh_config_file = pf"{opt.config}"
+        xxh_config_file = pf"{opt.xxh_config}"
 
         if xxh_config_file:
             if not xxh_config_file.exists():
@@ -313,7 +313,7 @@ class Xxh:
                 with open(xxh_config_file) as f:
                     xxh_config = yaml.safe_load(f)
 
-                if 'hosts' in xxh_config:
+                if xxh_config and 'hosts' in xxh_config:
                     sys_args = sys.argv[1:]
                     conf_args = []
                     for h, hc in xxh_config['hosts'].items():
