Replace other mentions of ArdublocklyServer with ardublocklyserver.

77bcc2b9 · carlosperate · 28475e5b · 77bcc2b9 · 77bcc2b9 · 77bcc2b9
Commit 77bcc2b9 authored Jun 17, 2015 by carlosperate
9 changed files
--- a/ardublockly/classic/index.html
+++ b/ardublockly/classic/index.html
@@ -44,7 +44,7 @@
  <!-- Load Blockly's language strings -->
  <script src="../../blockly/msg/js/en.js"></script>
  <!-- Arduino Server Compiler -->
-  <script src="../../ArdublocklyServer/js/ArduServerCompiler.js"></script>
+  <script src="../../ardublocklyserver/js/ArduServerCompiler.js"></script>
  <!-- Prettify -->
  <link rel="stylesheet" href="../../blockly/demos/prettify.css">
  <script src="../../blockly/demos/prettify.js"></script>

--- a/ardublockly/classic/settings.html
+++ b/ardublockly/classic/settings.html
@@ -6,7 +6,7 @@
  <title>Ardublockly: Arduino Code Settings</title>
  <link rel="stylesheet" href="settings.css">
  <!-- Arduino Server Compiler -->
-  <script src="../../ArdublocklyServer/js/ArduServerCompiler.js"></script>
+  <script src="../../ardublocklyserver/js/ArduServerCompiler.js"></script>
 </head>

 <body>

--- a/ardublockly/index.html
+++ b/ardublockly/index.html
@@ -53,7 +53,7 @@
  <script src="../blockly/generators/arduino/variables.js"></script>
  <script src="../blockly/msg/js/en.js"></script>
  <!-- Arduino Server Compiler -->
-  <script src="../ArdublocklyServer/js/ArduServerCompiler.js"></script>
+  <script src="../ardublocklyserver/js/ArduServerCompiler.js"></script>
  <!-- Arduino Material design app -->
  <link href="ardublockly.css" rel="stylesheet" media="screen,projection">
  <script src="ardublockly_design.js"></script>

--- a/ardublocklyserver/pyserialports/README.md
+++ b/ardublocklyserver/pyserialports/README.md
 # Pyserial modules

-To be able to run this application without having to install additional packages, we have included these modules with the Ardublockly ArdublocklyServer Python package.
+To be able to run this application without having to install additional packages, we have included these modules with the Ardublockly ardublocklyserver Python package.

 These modules have been extracted and modified from the pyserial package
 version 2.7: [https://pypi.python.org/pypi/pyserial](https://pypi.python.org/pypi/pyserial)

--- a/ardublocklyserver/tests/compilersettings_test.py
+++ b/ardublocklyserver/tests/compilersettings_test.py
@@ -70,7 +70,7 @@ class ServerCompilerSettingsTestCase(unittest.TestCase):
        mock_os_path_exists.return_value = True
        new_dir = os.getcwd()
        ServerCompilerSettings().compiler_dir = new_dir
-        self.assertEqual(new_dir, ServerCompilerSettings().compiler_dir)
+        self.assertTrue(new_dir in ServerCompilerSettings().compiler_dir)
        self.assertNotEqual(original_dir, ServerCompilerSettings().compiler_dir)

    @mock.patch('ardublocklyserver.compilersettings.os.path.exists')
@@ -78,7 +78,7 @@ class ServerCompilerSettingsTestCase(unittest.TestCase):
        mock_os_path_exists.return_value = True
        new_dir = os.path.join(os.getcwd(), 'arduino.exe')
        ServerCompilerSettings().compiler_dir = new_dir
-        self.assertEqual(new_dir, ServerCompilerSettings().compiler_dir)
+        self.assertTrue(new_dir in ServerCompilerSettings().compiler_dir)

    #
    # Testing the settings file

--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,7 @@ dependencies:
    # Install tkinker and mock
    - sudo apt-get install -y python-support
    - sudo apt-get install python-tk
-    - pip install mock
+    - sudo pip install mock

    # Install node.js
    - curl -sL https://deb.nodesource.com/setup_0.12 | sudo bash -

--- a/package/build_py2exe.py
+++ b/package/build_py2exe.py
@@ -43,7 +43,7 @@ project_root_dir = \
        os.path.dirname(os.path.realpath(__file__)))  # folder dir of this
 executable_dir = os.path.join(project_root_dir, exec_folder_name)

-# Enable the ArdublocklyServer package access the sys path for py2exe to find
+# Enable the ardublocklyserver package access the sys path for py2exe to find
 sys.path.append(project_root_dir)


@@ -122,7 +122,7 @@ def get_py2exe_options():
                   "bundle_files": 3,
                   "skip_archive": True,
                   "optimize": 0,
-                   "packages": ["ArdublocklyServer"],
+                   "packages": ["ardublocklyserver"],
                   "dll_excludes": dll_excludes,
                   "excludes": excludes}}
    return py2exe_options

--- a/package/pyinstaller.spec
+++ b/package/pyinstaller.spec
@@ -8,7 +8,7 @@ block_cipher = None

 a = Analysis(['start.py'],
             pathex=None,
-             hiddenimports=["ArdublocklyServer", "cefpython3", "wx"],
+             hiddenimports=["ardublocklyserver", "cefpython3", "wx"],
             hookspath=None,
             runtime_hooks=None,
             excludes=None)

--- a/start_cef.py
+++ b/start_cef.py
@@ -36,7 +36,7 @@ import codecs
 import inspect
 import platform
 import traceback
-from ArdublocklyServer.BlocklyHTTPServer import start_server
+from ardublocklyserver.server import start_server

 # Needed for packaging the application on self contained executable
 __file__ = sys.argv[0]