cli: support for PYRO_CONFIG_DIR environment variable

Author: pyroscope

docs/setup.rst

@@ -70,6 +70,9 @@ If you need several distinct configuration sets, just add the
 
     pyroadmin --create-config --config-dir ~/rtorrent/special/.pyroscope
 
+Alternatively, you can set the :envvar:`PYRO_CONFIG_DIR` environment variable
+to change the default of :file:`~/.pyrocscope`.
+
 To view your loaded configuration with all the system defaults added,
 use this (again, the ``--config-dir`` option allows non-default
 configuration locations):

src/pyrocore/scripts/base.py

@@ -331,6 +331,7 @@ def mainloop(self):
 class ScriptBaseWithConfig(ScriptBase):  # pylint: disable=abstract-method
     """ CLI tool with configuration support.
     """
+    CONFIG_DIR_DEFAULT = '~/.pyroscope'
     OPTIONAL_CFG_FILES = []
 
 
@@ -340,7 +341,7 @@ def add_options(self):
         super(ScriptBaseWithConfig, self).add_options()
 
         self.add_value_option("--config-dir", "DIR",
-            help="configuration directory [~/.pyroscope]")
+            help="configuration directory [{}]".format(os.environ.get('PYRO_CONFIG_DIR', self.CONFIG_DIR_DEFAULT)))
         self.add_value_option("--config-file", "PATH",
             action="append", default=[],
             help="additional config file(s) to read")
@@ -353,7 +354,11 @@ def get_options(self):
         """ Get program options.
         """
         super(ScriptBaseWithConfig, self).get_options()
-        load_config.ConfigLoader(self.options.config_dir).load(self.OPTIONAL_CFG_FILES + self.options.config_file)
+
+        self.config_dir = os.path.abspath(os.path.expanduser(self.options.config_dir
+            or os.environ.get('PYRO_CONFIG_DIR', None)
+            or self.CONFIG_DIR_DEFAULT))
+        load_config.ConfigLoader(self.config_dir).load(self.OPTIONAL_CFG_FILES + self.options.config_file)
         if self.options.debug:
             config.debug = True
 

src/pyrocore/scripts/pyroadmin.py

@@ -107,7 +107,7 @@ def mainloop(self):
         """
         if self.options.create_config:
             # Create configuration
-            config_loader = load_config.ConfigLoader(self.options.config_dir)
+            config_loader = load_config.ConfigLoader(self.config_dir)
             config_loader.create(self.options.remove_all_rc_files)
 
             # Create directories

src/pyrocore/ui/theming.py

@@ -54,8 +54,7 @@ def add_options(self):
     def mainloop(self):
         """ Handle theme selection changes, or rotate through selection.
         """
-        config_dir = self.options.config_dir or os.path.expanduser("~/.pyroscope")
-        themes_dir = os.path.join(config_dir, 'color-schemes')
+        themes_dir = os.path.join(self.config_dir, 'color-schemes')
         selected_file = os.path.join(themes_dir, '.selected')
         current_file = os.path.join(themes_dir, '.current')