Merge pull request #167 from peternewman/travis-fixes

Add codespell Travis check

Author: peternewman

.codespellignore

@@ -0,0 +1,2 @@
+(0x1BC0, "ALS Stanislaw Binkiewicz"),
+(0x030F, "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""),

.travis-ci.sh

@@ -35,6 +35,22 @@ elif [[ $TASK = 'spellintian' ]]; then
   else
     echo "Found $spellingerrors spelling errors"
   fi;
+elif [[ $TASK = 'codespell' ]]; then
+  # run codespell only if it is the requested task
+  spellingfiles=$(find ./ -type f -and ! \( \
+      -wholename "./.git/*" -or \
+      -wholename "./node_modules/*" \
+      \) | xargs)
+  # count the number of codespell errors
+  spellingerrors=$(zrun codespell --check-filenames --quiet 2 --regex "[\\-'a-zA-Z0-9]+" --exclude-file .codespellignore $spellingfiles 2>&1 | wc -l)
+  if [[ $spellingerrors -ne 0 ]]; then
+    # print the output for info
+    zrun codespell --check-filenames --quiet 2 --regex "[\\-'a-zA-Z0-9]+" --exclude-file .codespellignore $spellingfiles
+    echo "Found $spellingerrors spelling errors via codespell"
+    exit 1;
+  else
+    echo "Found $spellingerrors spelling errors via codespell"
+  fi;
 elif [[ $TASK = 'flake8' ]]; then
   flake8 --max-line-length 80 --exclude .git,__pycache --ignore E111,E114,E129 $(find ./ -name "*.py" | xargs)
   #,E121,E127

.travis.yml

@@ -20,6 +20,7 @@ install:
   - if [ "$TASK" = "flake8" ]; then pip install flake8; fi
 # If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net
   - if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
+  - if [ "$TASK" = "codespell" ]; then pip install git+https://github.com/lucasdemarchi/codespell.git; fi
 
 matrix:
   fast_finish: true
@@ -42,6 +43,15 @@ matrix:
         apt:
           packages:
             - moreutils
+    - os: linux
+      dist: trusty
+      # Short duration job, use the container/without sudo image as it boots faster
+      sudo: false
+      env: TASK='codespell'
+      addons:
+        apt:
+          packages:
+           - moreutils
     - os: linux
       dist: trusty
       env: TASK='flake8'

admin.py

@@ -655,14 +655,14 @@ def DiffProperty(self, name, key, left_dict, right_dict):
     left = left_dict.get(key)
     right = right_dict.get(key)
     if left and right:
-      left_formated, right_formatted = self._differ.Diff(str(left), str(right))
+      left_formatted, right_formatted = self._differ.Diff(str(left), str(right))
     else:
-      left_formated = left
+      left_formatted = left
       right_formatted = right
     return  {
       'name': name,
       'key': key,
-      'left': left_formated,
+      'left': left_formatted,
       'different': left != right,
       'prefer_left': left is not None and right is None,
       'prefer_right': right is not None and left is None,

model_loader.py

@@ -427,7 +427,7 @@ def UpdateResponder(self, manufacturer, model_info):
     """Add or Update a Responder.
 
     Returns:
-      was_added, was_modifed
+      was_added, was_modified
     """
     was_added = False
     was_modified = False