Packaging: Fix PyInstaller spec to import local-packages

.travis.yml

@@ -42,7 +42,8 @@ before_install:
   - pip3 install coveralls
   #- pip3 install pydocstyle
   - pip3 install mkdocs
-  - pip3 install pyinstaller
+  # We need a newer unreleased version of PyInstaller for Python 3.5
+  - pip3 install https://github.com/pyinstaller/pyinstaller/archive/964547cd92cabe28150d52c2ca809de74a5ddbaa.zip
 
   # Check Python, pip and package versions
   - python -c "import sys; print(sys.executable)"

ardublockly/ardublockly.js

@@ -27,8 +27,10 @@ Ardublockly.init = function() {
   Ardublockly.bindBlocklyEventListeners();
 
   // Hackish way to check if not running locally
-  if (document.location.hostname != '127.0.0.1') {
+  if (document.location.hostname != 'localhost') {
     Ardublockly.openNotConnectedModal();
+    console.log('Offline app modal opened as non localhost host name found: ' +
+                document.location.hostname)
   }
 };
 

package/build_pyinstaller.py

@@ -31,9 +31,7 @@
     os.path.dirname(                                  # going up 1 level
         os.path.dirname(os.path.realpath(__file__)))  # folder dir of this
 sys.path.append(project_root_dir)
-# Add the local-packages to sys path
-from ardublocklyserver import local_packages_path
-sys.path.insert(0, local_packages_path)
+
 
 spec_coll_name = "server"
 exec_folder_name = "arduexec"

package/pyinstaller.spec

@@ -1,14 +1,29 @@
 # -*- mode: python -*-
 
 # This spec file counts on the PyInstaller script being executed from the
-# project root directory, otherwise the start_cef.py file path will have to
+# project root directory, otherwise the start.py file path will have to
 # be updated.
 
+# We have a 'local-packages' folder with modules, need to expand sys.path
+import os
+import sys
+project_root = os.path.realpath('')
+print('PyInstaller defined project root: %s' % project_root)
+local_packages = os.path.join(
+        project_root, 'ardublocklyserver', 'local-packages')
+sys.path.insert(0, project_root)
+sys.path.insert(0, local_packages)
+
+# Import required modules, ensures PyInstaller fails if it cannot find them
+import ardublockly
+import six, configparser, serial, waitress, bottle
+
+
 block_cipher = None
 
 a = Analysis(['../start.py'],
              pathex=None,
-             hiddenimports=["ardublocklyserver"],
+             hiddenimports=['ardublocklyserver', 'waitress'],
              hookspath=None,
              runtime_hooks=None,
              excludes=None)

start.py

@@ -134,7 +134,10 @@ def main():
     """
     print('Running Python %s (%s bit) on %s' % (platform.python_version(),
           (struct.calcsize('P') * 8), platform.platform()))
-    print('Local packages path: %s' % ardublocklyserver.local_packages_path)
+    if os.path.isdir(ardublocklyserver.local_packages_path):
+        print('Local packages: %s' % ardublocklyserver.local_packages_path)
+    else:
+        print('Not using local-packages.')
 
     print('\n======= Parsing Command line arguments =======')
     find_project_root, launch_browser, server_root = parsing_cl_args()