Skip to content

Commit

Permalink
Merge pull request #100 from varp/master
Browse files Browse the repository at this point in the history
The future release v2.0.4
  • Loading branch information
varp authored Apr 8, 2020
2 parents 0b5e683 + e84d9a9 commit 97d9974
Show file tree
Hide file tree
Showing 9 changed files with 728 additions and 559 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,11 @@ node_modules
package-lock.json

tests/data/node_modules
tests/data/package-lock.json
tests/data/package-lock.json

.idea/

*.sublime-project
*.sublime-workspace

*.log
27 changes: 14 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,34 @@ matrix:
include:
- os: linux
language: node_js
node_js: "6.12.2"
env:
- NODEJS_VERSION="v6.12.2"
node_js: "10"
env:
- NODEJS_VERSION="v10"
- os: linux
language: node_js
node_js: "8.9.3"
node_js: "11"
env:
- NODEJS_VERSION="v8.9.3"
- NODEJS_VERSION="v11"
- os: osx
language: node_js
node_js: "6.12.2"
node_js: "10"
env:
- NODEJS_VERSION="v6.12.2"
- NODEJS_VERSION="v10"
- os: osx
language: node_js
node_js: "8.9.3"
node_js: "11"
env:
- NODEJS_VERSION="v8.9.3"
- NODEJS_VERSION="v11"


before_install:
- curl -OL https://raw.githubusercontent.com/randy3k/UnitTesting/master/sbin/travis.sh
# enable gui, see https://docs.travis-ci.com/user/gui-and-headless-browsers
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
export DISPLAY=:99.0;
sh -e /etc/init.d/xvfb start;
sleep 3;
fi
- curl -OL https://raw.githubusercontent.com/randy3k/UnitTesting/master/sbin/travis.sh
- export NVM_SYMLINK_CURRENT=true

install:
Expand All @@ -61,7 +62,7 @@ install:

script:
# run tests with test coverage report
- sh travis.sh run_tests --coverage
- sh travis.sh run_tests
# testing syntax_test files
# - sh travis.sh run_syntax_tests

Expand All @@ -84,4 +85,4 @@ after_success:

notifications:
email: false

12 changes: 11 additions & 1 deletion Nodejs.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ def generate_completions():
sublime.active_window().run_command('node_builddocs')


def is_there_node_exe():
# TODO: check if there is a some NODE executable exists on the system
pass


def is_there_npm_exe():
# TODO: check if there is a some NPM executable exists on the system
pass


def check_and_install_dependencies():
"""
The function is dosen't check whether npm/node is installed or not.
Expand Down Expand Up @@ -62,7 +72,7 @@ def create_output_panel():

def plugin_loaded():
check_and_install_dependencies()
generate_completions()
generate_completions()
if Nvm.is_installed():
info('Node.js version from NVM is ' + Nvm.node_version())

Expand Down
Loading

0 comments on commit 97d9974

Please sign in to comment.