Merge branch 'v2'

Author: adorton-adobe

.appveyor/build.ps1 renamed to .build/.appveyor/build.ps1

@@ -15,17 +15,13 @@ if ($env:python.endswith("36-x64")) {
     pip uninstall -y enum34
 }
 
-make 2>&1
+make $env:BUILD_TARGET 2>&1
 dir dist
 mkdir release
-cp dist\user-sync.pex release\
-cd release\
-Get-Command python
-$pyver=$(python -V 2>&1) -replace "Python ","py" -replace "\.",""
-echo "pyver: ${pyver}"
-7z a -ttar "user-sync-${env:APPVEYOR_REPO_TAG_NAME}-win64-${pyver}.tar" user-sync.pex
-7z a -tgzip "user-sync-${env:APPVEYOR_REPO_TAG_NAME}-win64-${pyver}.tar.gz" "user-sync-${env:APPVEYOR_REPO_TAG_NAME}-win64-${pyver}.tar"
-7z a "user-sync-${env:APPVEYOR_REPO_TAG_NAME}-win64-${pyver}.zip" user-sync.pex
+
+cp dist\user-sync.exe release\
+cd release
+7z a "user-sync-${env:APPVEYOR_REPO_TAG_NAME}${env:BUILD_EDITION}-win64.zip" user-sync.exe
 cd ..
 7z a -ttar -r release\examples.tar examples
 7z a -tgzip release\examples.tar.gz release\examples.tar

.appveyor/test.ps1 renamed to .build/.appveyor/test.ps1

@@ -0,0 +1,21 @@
+
+# -----------------------------------------------------------------------------
+# Copyright (c) 2013-2018, PyInstaller Development Team.
+#
+# Distributed under the terms of the GNU General Public License with exception
+# for distributing bootloader.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+# -----------------------------------------------------------------------------
+
+# Temporary implementation until this PR is merged:
+# https://github.com/pyinstaller/pyinstaller/pull/3948/files
+
+# See also https://github.com/jaraco/keyring/issues/324
+
+from PyInstaller.utils.hooks import collect_submodules, copy_metadata
+
+hiddenimports = collect_submodules('keyrings.cryptfile.cryptfile')
+
+# keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt.
+datas = copy_metadata('keyrings.cryptfile')

.build/.build/hook-keyring.cryptfile.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 virtualenv venv -p /usr/bin/python3.6
 source venv/bin/activate
+python -m pip install --upgrade pip
 pip install external/okta-0.0.3.1-py2.py3-none-any.whl
 pip install -e .
 pip install -e .[test]
 pip install -e .[setup]
 pip uninstall -y enum34
-make
+make $BUILD_TARGET
 pwd
-.travis/release.sh
+.build/.travis/release.sh
 python setup.py test

.travis/build-py36-centos.sh renamed to .build/.travis/build-py36-centos.sh

@@ -4,4 +4,4 @@ pip install -e .
 pip install -e .[test]
 pip install -e .[setup]
 pip uninstall -y enum34
-make
+make $BUILD_TARGET

.travis/build-py36.sh renamed to .build/.travis/build-py36.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd dist
+tar czf "user-sync-${TRAVIS_TAG}${BUILD_EDITION}-${IMG}.tar.gz" user-sync
+cd ..
+mkdir -p release
+mv dist/*.tar.gz release/
+ls -al release/

.travis/install-centos.sh renamed to .build/.travis/install-centos.sh

@@ -0,0 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (c) 2013-2018, PyInstaller Development Team.
+#
+# Distributed under the terms of the GNU General Public License with exception
+# for distributing bootloader.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+# -----------------------------------------------------------------------------
+
+# Temporary implementation until this PR is merged:
+# https://github.com/pyinstaller/pyinstaller/pull/3948/files
+
+# See also https://github.com/jaraco/keyring/issues/324
+
+from PyInstaller.utils.hooks import collect_submodules, copy_metadata
+
+hiddenimports = collect_submodules('keyring.backends')
+
+# keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt.
+datas = copy_metadata('keyring')

.travis/install-ubuntu.sh renamed to .build/.travis/install-ubuntu.sh

@@ -1,13 +1,34 @@
+# Copyright (c) 2016-2017 Adobe Inc.  All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 import os
 import shutil
+from backports import configparser
 
 
 def cd():
     os.chdir(os.path.realpath(os.path.join(os.path.dirname(__file__), '..')))
 
 
-def bundle_example_config():
-    examples_dir = os.path.join('examples', 'config files - basic')
+def bundle_example_config(subdir):
+    examples_dir = os.path.join('examples', subdir)
     files = [os.path.join(examples_dir, f) for f in os.listdir(examples_dir) if
              os.path.isfile(os.path.join(examples_dir, f))]
     bundle_dir = os.path.join('user_sync', 'resources', 'examples')
@@ -18,6 +39,29 @@ def bundle_example_config():
         shutil.copy(f, dest)
 
 
+def bundle_feature_flag_config():
+    default_cfg_path = os.path.join('user_sync', 'resources', 'default_flags.cfg')
+    default_cfg = configparser.ConfigParser()
+    default_cfg.optionxform = str
+    default_cfg.read(default_cfg_path)
+
+    flag_data = {}
+
+    for k, v in default_cfg.items('config'):
+        env_val = os.environ.get(k)
+        if env_val is not None:
+            flag_data[k] = env_val
+        else:
+            flag_data[k] = v
+
+    with open(os.path.join('user_sync', 'resources', 'flags.cfg'), 'w') as flag_cfg_file:
+        flag_cfg = configparser.ConfigParser()
+        flag_cfg.optionxform = str
+        flag_cfg['config'] = flag_data
+        flag_cfg.write(flag_cfg_file)
+
+
 if __name__ == '__main__':
     cd()
-    bundle_example_config()
+    bundle_example_config('config files - basic')
+    bundle_example_config('sign')