Merge branch 'master' into 'master'

Bug Fixes release

See merge request te/devlab!5

README.md

@@ -27,7 +27,7 @@ There are three options for installing devlab:
 1. **Base Image**: An image that is included with, and managed by devlab
 1. **Runtime Image**: An image that is defined by, and managed by a project that uses devlab
 1. **Script Runner**: An internal reference to a string that can define a script/command to run including where (inside a new container, or an existing component). See [Script Runner Syntax](#script-runner-syntax) for more information.
-1. **Provision**: The act of setting up or completing the set up of a component through the use of scripts. See `pre_scripts` and `scripts` in [Component Config Structure](#component-config-structure)
+1. **Provision**: The act of setting up or completing the setup of a component through the use of scripts. See `pre_scripts` and `scripts` in [Component Config Structure](#component-config-structure)
 1. **Wizard**: A script that is run before the `up` action. After the wizard has been executed a proper [DevlabConfig.json](#devlab-configuration) should exist. It is normal for the wizard to result in more files than just a `DevlabConfig.json`, and those files can be added to the config so that devlab can reset the wizard (forcing it to run again) if so desired.
 
 # Usage
@@ -44,17 +44,17 @@ The format of the command should be:
 
 The "wizard" logic will be invoked the first time you run a `devlab up` command. This can be invoked separately with `wizard` if you so desire.
 
-You can jump right in with a `devlab up`
+You can jump right in with a project by going into the directory and running (Examples are in this repository under the `examples` directory): `devlab up`
 
 If you need to reset everything back to normal just: `devlab reset --full`
 
-*[NOTE]* This will also remove the files under `modules/` so if you have local modifications there, they will be erased with this.
+*[NOTE]* This will also remove the files defined `paths.reset_full` (See [Paths Config Structure](#paths-config-structure))
 
 If you just want to reset a single component: `devlab reset <component>`
 
-If you want to reset a component and force the wizard to run again for it: `devlab reset <component> --reset-wizard`
+If you want to reset a component so that a wizard may notice (depends on whatever wizard your project is using) and possibly force the wizard to run again for it: `devlab reset <component> --reset-wizard`
 
-If you want to reset the devab's configuration (which the wizard will likely notice and ask you which components to start back up): `devlab reset devlab`
+If you want to reset the devab's configuration: `devlab reset devlab`
 
 ## How does it do its thing?
 1. The first thing that happens is devlab looks to see if the action set, will need a configuration or not.
@@ -497,18 +497,23 @@ This will create a new container from the `ubuntu:18.04` image
 
 ### Reset action
 ```
+usage: devlab reset [-h] [--reset-wizard] [--full]
+                    [{my_app_vault,vault,devlab,*} [{my_app_vault,vault,devlab,*} ...]]
+
 positional arguments:
   {vault,my_app,devlab,*}
                         Reset the specific component(s). * means all
                         components, but this does NOT inlcude 'devlab'
 
 optional arguments:
-  -h, --help            show this help message and exit
-  --reset-wizard, -r    Also remove wizard related files so that the wizard
-                        will run again for the specified component
-  --full, -f            Remove all component specific files, wizard files, as
-                        well as devlab files AND the modules/ directory. BE
-                        CAREFUL IF YOU HAVE UN-PUSHED COMMITS IN THERE
+  -h, --help          show this help message and exit
+  --reset-wizard, -r  Also remove wizard related files so that the wizard will
+                      run again for the specified component
+  --full, -f          Remove all component specific files, wizard files, as
+                      well as devlab files AND potentially files you're
+                      working on. BE CAREFUL IF YOU HAVE MANUAL CHANGES PATHS
+                      DEFINED IN in 'paths.reset_full'!!
+
 ```
 
 Example:

devlab

@@ -1150,7 +1150,7 @@ def action_reset(components='*', reset_wizard=False, full=False, **kwargs):
         foreground_comp_name = config['foreground_component']['name']
     add_foreground = False
     components_to_reset = components
-    if not config['components']:
+    if not config['components'] and not foreground_comp_name:
         log.error("No components have been configured. Try running with the 'up' action or the 'wizard' script directly")
         sys.exit(1)
     if 'linux' in sys.platform.lower():
@@ -1252,9 +1252,10 @@ def action_reset(components='*', reset_wizard=False, full=False, **kwargs):
         if comp == foreground_comp_name:
             log.info("Resetting files for foreground component: %s", foreground_comp_name)
             comp_config = config['foreground_component']
+            comp_config['enabled'] = True
         else:
             comp_config = config['components'][comp]
-        if config['components'][comp]['enabled']:
+        if comp_config['enabled']:
             action_down(components=[comp], rm=True)
         else:
             # Always reset wizard files for components that are disabled

installer.py

@@ -45,7 +45,7 @@
 ## Classes
 class FileIndexParser(HTMLParser, object): #pylint: disable=abstract-method
     """
-    Subclass of HTMLParser, for finding a tags with an href and adding them an
+    Subclass of HTMLParser, for finding tags with an href and adding them to an
     internal 'parsed' list attribute.
     """
     def __init__(self, *args, **kwargs):
@@ -290,6 +290,11 @@ def http_request(url, headers=None, payload=None, insecure=False, decode=True, l
         insecure: bool
             Optional flag to indicate whether certificate validation to the
             http server should happen.
+        decode: bool
+            Optional flag to indicat whether the string response should have
+            '.decode()' run on it. Default is True, but if binary data is
+            needed for later processing then setting to False is what you're
+            looking for
         logger:
             Optional logger object
     Returns Tuple