Skip to content

Commit

Permalink
Install dev dependencies via package.json as well
Browse files Browse the repository at this point in the history
  • Loading branch information
malept committed Jul 4, 2014
1 parent 6246b0d commit 45cd975
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python:
env:
- NO_FRONTEND=1
install:
- if [[ -z "$NO_FRONTEND" ]]; then sudo add-apt-repository --yes ppa:chris-lea/node.js; sudo apt-get update -qq; sudo apt-get install nodejs; npm install -g coffeelint csslint; npm install; fi
- if [[ -z "$NO_FRONTEND" ]]; then sudo add-apt-repository --yes ppa:chris-lea/node.js; sudo apt-get update -qq; sudo apt-get install nodejs; npm install; fi
- if [[ -z "$NO_FRONTEND" ]]; then gem install scss-lint; fi
- if [[ -z "$NO_FRONTEND" ]]; then bower install; fi
- if [[ -z "$NO_PYTHON" ]]; then export REQ_TXT=requirements/dev.txt; else export REQ_TXT=requirements.txt; fi; pip install -r "$REQ_TXT"
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,5 @@ the server:

.. code-block:: shell-session
(venv)user@host:gmusicprocurator$ npm install
(venv)user@host:gmusicprocurator$ npm install --production
(venv)user@host:gmusicprocurator$ node_modules/.bin/bower install -p
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,10 @@
"coffeeify": "0.6.x",
"uglify-js": "2.x"
},
"devDependencies": {
"coffeedoc": "0.x",
"coffeelint": "1.x",
"csslint": "0.x"
},
"private": true
}
5 changes: 3 additions & 2 deletions run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ SCSS_DIR="${STATIC_DIR}"/scss
MAIN_OUT_CSS="${SCSS_DIR}"/main.out.css
CFG_DIR="$HOME/.config/gmusicapi"
CFG_PATH="$CFG_DIR"/gmusicprocurator.cfg
NODE_BIN_DIR="${BASE_DIR}/node_modules/.bin"

set -x

Expand All @@ -17,10 +18,10 @@ if [[ -z "$NO_PYTHON" ]]; then
fi

if [[ -z "$NO_FRONTEND" ]]; then
coffeelint -f "${BASE_DIR}"/.coffeelint.json "${STATIC_DIR}"/cs
"$NODE_BIN_DIR"/coffeelint -f "${BASE_DIR}"/.coffeelint.json "${STATIC_DIR}"/cs
scss-lint -e '*.css' "${SCSS_DIR}"
scss --style expanded "${SCSS_DIR}"/main.scss "${MAIN_OUT_CSS}"
csslint "${MAIN_OUT_CSS}"
"$NODE_BIN_DIR"/csslint "${MAIN_OUT_CSS}"
if [[ ! -f "$CFG_PATH" ]]; then
mkdir -p "$CFG_DIR"
echo 'GMP_OFFLINE_MODE = True' > "$CFG_PATH"
Expand Down
7 changes: 0 additions & 7 deletions salt/roots/checkers.sls
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
checkers:
npm.installed:
- names:
- coffeedoc
- coffeelint
- csslint
- require:
- pkg: nodejs
gem.installed:
- names:
- scss-lint
Expand Down

0 comments on commit 45cd975

Please sign in to comment.