Merge pull request #13 from voltgrid/feature/add-debug

Feature/add debug

.travis.yml

@@ -5,6 +5,7 @@ python:
   - 2.7
   - 3.3
   - 3.4
+  - 3.6
 
 install:
   - pip install -r requirements.txt

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017, Volt Grid Pty Ltd
+Copyright (c) 2014-2018, Volt Grid Pty Ltd
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -25,4 +25,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

docs/configuration.md

@@ -1,5 +1,9 @@
 # Configuration
 
+### Environment
+
+- `VOLTGRID_PIE_DEBUG` set to `true` to enable environment variable debugging.
+
 ### voltgrid.conf
 
 An example is provided [here](examples/voltgrid.conf.example).

voltgrid.py

@@ -11,7 +11,7 @@
 from distutils.dir_util import copy_tree
 
 
-__version__ = '1.0.6'
+__version__ = '1.0.7'
 
 # Config
 VG_CONF_PATH = '/usr/local/etc/voltgrid.conf'
@@ -31,7 +31,6 @@ class ConfigManager(object):
     config = {}
     environment = os.environ
 
-
     def __init__(self, cfg_file=None):
         # Assume same dir as voltgrid.py if not specified
         cfg_file = cfg_file or os.path.join(os.path.abspath(os.path.split(__file__)[0]), 'voltgrid.conf')
@@ -308,6 +307,15 @@ def execute(arg, user, group):
         sys.stdout.flush()
         os.execvpe(arg[1], arg[1:], os.environ)  # replace current process, inherit environment
 
+    def vg_debug():
+        debug = bool(os.environ.get('VOLTGRID_PIE_DEBUG', 'False').lower() in ("true", "yes", "t", "1"))
+        print("voltgrid.py debug %s" % str(debug))
+        if debug:
+            for env in os.environ:
+                val = os.getenv(env)
+                print("Environment: %s='%s'" % (env, val))
+        return debug
+
     # Unset inherited environment variables that dont need to be configured
     for e in ['HOME',]:
         print("Unsetting %s" % e)
@@ -323,6 +331,8 @@ def execute(arg, user, group):
     files = local_config.get('files', {})
     dirs = local_config.get('dirs', {})
 
+    VOLTGRID_PIE_DEBUG = vg_debug()
+
     # Checkout Git
     if c.git_url is not None:
         g = GitManager(url=c.git_url, git_dst=c.git_dst, git_branch=c.git_branch, git_tag=c.git_tag, git_hash=c.git_hash)