Merge pull request #78 from tanepiper/refactor

Release v2.0.0

.gitignore

@@ -1,3 +1,10 @@
+.DS_Store
 *.pyc
 *.cache
 node_modules
+.debug_plugin
+.debugger.pid
+package-lock.json
+
+tests/data/node_modules
+tests/data/package-lock.json

.nvmrc

@@ -1 +1 @@
-4.2.2
+8.6.0

.travis.yml

@@ -0,0 +1,87 @@
+env:
+  global:
+    - NVM_SYMLINK_CURRENT=true
+    - PACKAGE="Nodejs" # Package name
+    - SUBLIME_TEXT_VERSION="3"
+    # use UNITTESTING_TAG to specific tag of UnitTesting
+    # - UNITTESTING_TAG="master"
+
+branches:
+  only:
+    - master
+    - refactor
+
+# mutliple os matrix
+# https://docs.travis-ci.com/user/multi-os/#Python-example-(unsupported-languages)
+matrix:
+  include:
+    - os: linux
+      language: node_js
+      node_js: "6"
+      env: 
+        - NODEJS_VERSION="v6.12.0"
+    - os: linux
+      language: node_js
+      node_js: "8"
+      env:
+        - NODEJS_VERSION="v8.9.1"
+    - os: osx
+      language: node_js
+      node_js: "6"
+      env:
+        - NODEJS_VERSION="v6.12.0"
+    - os: osx
+      language: node_js
+      node_js: "8"
+      env:
+        - NODEJS_VERSION="v8.9.1"
+
+
+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
+          export DISPLAY=:99.0;
+          sh -e /etc/init.d/xvfb start;
+    fi
+  - export NVM_SYMLINK_CURRENT=true
+
+install:
+  - nvm alias default $NODEJS_VERSION; nvm use $NODEJS_VERSION
+  # bootstrap the testing environment
+  - sh travis.sh bootstrap
+  # install Package Control and package denepdencies
+  - sh travis.sh install_package_control
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+          touch "$HOME/Library/Application Support/Sublime Text 3/Packages/Nodejs/.debug_plugin";
+    fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+          touch $HOME/.config/sublime-text-3/Packages/Nodejs/.debug_plugin;
+    fi
+
+script:
+  # run tests with test coverage report
+  - sh travis.sh run_tests --coverage
+  # testing syntax_test files
+  # - sh travis.sh run_syntax_tests
+
+after_success:
+  # remove the following if `coveralls` is not needed
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+          brew update;
+          brew install python3;
+          pip3 install python-coveralls;
+          pip3 install codecov;
+    fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+          apt-get update -qq
+          apt-get install -qq python3
+          pip install python-coveralls;
+          pip install codecov;
+    fi
+  - coveralls
+  - codecov
+
+notifications:
+  email: false
+

Default.sublime-commands

@@ -50,17 +50,20 @@
   "caption": "Nodejs::UglifyJS",
   "command": "node_uglify"
 },
+
 {
-  "caption": "Nodejs::Default File Settings",
-  "command": "open_file",
+  "caption": "Nodejs::User File Settings",
+  "command": "edit_settings", 
   "args": {
-    "file": "${packages}/Nodejs/Nodejs.sublime-settings"
+    "base_file": "${packages}/Nodejs/Nodejs.sublime-settings",
+    "default": "// Settings in here override those in \"Nodejs/Nodejs.sublime-settings\",\n// and are overridden in turn by syntax-specific settings.\n{\n\t$0\n}\n"
   }
 },
 {
-  "caption": "Nodejs::User File Settings",
-  "command": "open_file",
+  "caption": "Nodejs::User Key Bindings",
+  "command": "edit_settings", 
   "args": {
-    "file": "${packages}/User/Nodejs.sublime-settings"
+    "base_file": "${packages}/Nodejs/Default ($platform).sublime-keymap",
+    "default": "// Settings in here override those in \"Nodejs/Default.sublime-keymap\"\n{\n\t$0\n}\n"
   }
-}]
+}]

Main.sublime-menu

@@ -48,70 +48,25 @@
     "id": "package-settings",
     "children":[{
       "caption": "Nodejs",
-      "children": [{
-        "command": "open_file",
-        "args": {
-          "file": "${packages}/Nodejs/Nodejs.sublime-settings"
-        },
-        "caption": "Settings – Default"
-      },
+      "children": [
       {
-        "command": "open_file",
+        "command": "edit_settings", 
         "args": {
-          "file": "${packages}/User/Nodejs.sublime-settings"
+          "base_file": "${packages}/Nodejs/Nodejs.sublime-settings",
+          "default": "// Settings in here override those in \"Nodejs/Nodejs.sublime-settings\",\n// and are overridden in turn by syntax-specific settings.\n{\n\t$0\n}\n"
         },
         "caption": "Settings – User"
       },
       {
         "caption": "-"
       },
       {
-        "command": "open_file",
-        "args": {
-            "file": "${packages}/Nodejs/Default (Windows).sublime-keymap",
-            "platform": "Windows"
-        },
-        "caption": "Key Bindings – Default"
-      },
-      {
-        "command": "open_file",
-        "args": {
-            "file": "${packages}/Nodejs/Default (OSX).sublime-keymap",
-            "platform": "OSX"
-        },
-        "caption": "Key Bindings – Default"
-      },
-      {
-        "command": "open_file",
-        "args": {
-            "file": "${packages}/Nodejs/Default (Linux).sublime-keymap",
-            "platform": "Linux"
-        },
-        "caption": "Key Bindings – Default"
-      },
-      {
-        "command": "open_file",
-        "args": {
-            "file": "${packages}/User/Default (Windows).sublime-keymap",
-            "platform": "Windows"
-        },
-        "caption": "Key Bindings – User"
-      },
-      {
-        "command": "open_file",
-        "args": {
-            "file": "${packages}/User/Default (OSX).sublime-keymap",
-            "platform": "OSX"
-        },
-        "caption": "Key Bindings – User"
-      },
-      {
-        "command": "open_file",
+        "command": "edit_settings", 
         "args": {
-            "file": "${packages}/User/Default (Linux).sublime-keymap",
-            "platform": "Linux"
+          "base_file": "${packages}/Nodejs/Default ($platform).sublime-keymap",
+          "default": "// Settings in here override those in \"Nodejs/Default.sublime-keymap\"\n{\n\t$0\n}\n"
         },
-        "caption": "Key Bindings – User"
+       "caption": "Key Bindings – User"
       }]
     }]
   }]