Merge branch 'master' into heredoc

Author: mattn

.coveragerc

@@ -1,3 +1,5 @@
 [run]
 plugins = covimerage
 data_file = .coverage_covimerage
+include = py/*.py
+branch = 1

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+per-file-ignores =
+    # undefined names for StringReader, VimLParser, Compiler
+    py/vimlfunc.py:F821
+    py/vimlparser.py:E501

.travis.yml

@@ -3,40 +3,63 @@ dist: xenial
 git:
   depth: 10
 
-matrix:
+jobs:
   include:
-    - env:
+    - name: Vim 7.4
+      env:
       - VIM_VERSION=v7.4
-      - MAKE_TARGET=test
+      - MAKE_TARGET=vim/test
       - TEST_PROFILE=vim-profile-v7.4.txt
-    - env:
+    - name: Vim v8
+      env:
       - VIM_VERSION=v8.0.0000
-      - MAKE_TARGET=test
+      - MAKE_TARGET=vim/test
       - TEST_PROFILE=vim-profile-v8.0.txt
-    - env:
+    - name: Vim master
+      env:
       - VIM_VERSION=master
-      - MAKE_TARGET=test
+      - MAKE_TARGET=vim/test
       - TEST_PROFILE=vim-profile-master.txt
-    - env:
+      - TEST_PYTHON=python3
+    - name: Installed Vim with checks
+      env:
       - VIM_VERSION=installed
-      - MAKE_TARGET="clean_compiled check js/test py/test test/node_position/test_position.out"
+      - MAKE_TARGET=test
       - TEST_PROFILE=vim-profile-installed.txt
+      - TEST_PYTHON="python -m coverage run --append"
 
 install:
   - |
-    if [ "$VIM_VERSION" != 'installed' ]; then
+    if [ "$VIM_VERSION" = 'installed' ]; then
+      python -m pip install -q --user flake8 git+https://github.com/Kuniwak/vint
+    else
       bash scripts/install-vim.sh
       export PATH=$HOME/vim/bin:$PATH
     fi
-  - pip install covimerage --user
+  - python -m pip install -q --user covimerage
+  - python -m pip freeze
 
 script:
   - uname -a
   - which -a vim
-  - vim --cmd version --cmd quit
+  - vim --version
   - make --keep-going $MAKE_TARGET
 
 after_success:
+  - curl -s https://codecov.io/bash > /tmp/codecov.sh
+  # Coverage from Python (cannot be combined with non-branch data).
+  - |
+    if [[ -f .coverage_covimerage ]]; then
+      coverage report -m
+      coverage xml
+      bash /tmp/codecov.sh -f coverage.xml -F python
+    fi
+  # Coverage from Vim.
   - covimerage write_coverage $TEST_PROFILE
+  - coverage report -m
   - coverage xml
-  - bash <(curl -s https://codecov.io/bash) -f coverage.xml
+  - bash /tmp/codecov.sh -f coverage.xml -F vimscript
+
+branches:
+  only:
+    - master

Makefile

@@ -2,6 +2,9 @@ COMPILED_FILES:=js/vimlparser.js py/vimlparser.py
 
 all: $(COMPILED_FILES)
 
+test: clean_compiled check fast-test
+fast-test: checkpy checkvim vim/test js/test py/test test/node_position/test_position.out
+
 js/vimlparser.js: autoload/vimlparser.vim js/jscompiler.vim js/vimlfunc.js
 	scripts/jscompile.sh $< $@
 
@@ -16,17 +19,25 @@ check: all
 	  echo 'Compiled files were updated, but should have been included/committed.'; \
 	  exit 1; }
 
-test:
+checkpy: all
+	flake8 py
+
+# Run vint, using py/vimlparser.py.
+checkvim: all
+	PYTHONPATH=py vint autoload py/pycompiler.vim
+
+vim/test:
 	test/run.sh
 
 js/test: js/vimlparser.js
 	test/run_command.sh node js/vimlparser.js
 
+py/test: TEST_PYTHON?=python
 py/test: py/vimlparser.py
-	test/run_command.sh python py/vimlparser.py
+	test/run_command.sh $(TEST_PYTHON) py/vimlparser.py
 
 test/node_position/test_position.out: test/node_position/test_position.vim test/node_position/test_position.ok
 	vim -Nu test/vimrc -S test/node_position/test_position.vim
 	diff -u test/node_position/test_position.ok test/node_position/test_position.out
 
-.PHONY: all clean_compiled check test js/test py/test
+.PHONY: all clean_compiled check test fast-test vim/test js/test py/test