From c99331c9134395bae5e871eaec40cfa1136b78b3 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 16 Mar 2016 17:04:37 -0700 Subject: [PATCH 1/6] Add gemfile for scss_lint --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..eb3ccfda29 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'scss_lint' From abefee2f5062589fa759c519aac241dad7ac964a Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 16 Mar 2016 17:04:47 -0700 Subject: [PATCH 2/6] spike out bootstrap script --- script/bootstrap | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 script/bootstrap diff --git a/script/bootstrap b/script/bootstrap new file mode 100755 index 0000000000..d9016da878 --- /dev/null +++ b/script/bootstrap @@ -0,0 +1,26 @@ +#!/bin/sh +# Usage: script/bootstrap +# Ensures all dependencies are installed locally. + +set -e + +cd "$(dirname "$0")/.." + +git pull + +if [ -f "package.json" ]; then + echo "==> Installing packages…" + npm install +fi + +if [ -f "bower.json"]; then + echo "==> Installing bower components…" + bower install +fi + +if [ -f "Gemfile" ]; then + echo "==> Installing gem dependencies…" + bundle check --path vendor/gems >/dev/null 2>&1 || { + bundle install --path vendor/gems --quiet --without production + } +fi From cd189800ddfb1ea1eae0884ec4116466e4e4b535 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 16 Mar 2016 17:11:06 -0700 Subject: [PATCH 3/6] stop putting in vendor --- Gemfile.lock | 17 +++++++++++++++++ script/bootstrap | 4 +--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..62b087e8bd --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + rake (10.5.0) + sass (3.4.21) + scss_lint (0.47.1) + rake (>= 0.9, < 11) + sass (~> 3.4.15) + +PLATFORMS + ruby + +DEPENDENCIES + scss_lint + +BUNDLED WITH + 1.11.2 diff --git a/script/bootstrap b/script/bootstrap index d9016da878..9068a54c73 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -20,7 +20,5 @@ fi if [ -f "Gemfile" ]; then echo "==> Installing gem dependencies…" - bundle check --path vendor/gems >/dev/null 2>&1 || { - bundle install --path vendor/gems --quiet --without production - } + bundle install fi From cd54fc704b4405fd78f226aa2611910efd59e1b6 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 16 Mar 2016 17:19:23 -0700 Subject: [PATCH 4/6] update readme --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index fbd4eb75f2..3bfbc44a59 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,7 @@ To install the frontend please do the following: 3. Install [ember-cli latest](https://www.npmjs.org/package/ember-cli): `npm install -g ember-cli@latest`. Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install ember-cli. 4. Install [bower](https://www.npmjs.org/package/bower): `npm install -g bower` -5. Clone this repo with `git clone https://github.com/HospitalRun/hospitalrun-frontend`, go to the cloned folder and: - 1. `npm install` to install needed node modules. - 2. `bower install` to install needed bower modules. - 3. `npm install -g phantomjs-prebuilt` to install PhantomJS2, which is needed to run tests. - Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install PhantomJS2. +5. Clone this repo with `git clone https://github.com/HospitalRun/hospitalrun-frontend`, go to the cloned folder and run `script/bootstrap`. (*Note: Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install PhantomJS2.*) 6. Install and configure [CouchDB](http://couchdb.apache.org/) 1. Download and install CouchDB from http://couchdb.apache.org/#download 2. Create admin user: @@ -97,4 +93,3 @@ Contributions are welcome via pull requests and issues. Please see our [contrib * Development Browser Extensions * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi) * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/) - From beac4f45853f7c6b60804e6c6aaa93792b1081e5 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 16 Mar 2016 17:19:50 -0700 Subject: [PATCH 5/6] accomodate phantomjs --- script/bootstrap | 1 + 1 file changed, 1 insertion(+) diff --git a/script/bootstrap b/script/bootstrap index 9068a54c73..7209c2f0a6 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -11,6 +11,7 @@ git pull if [ -f "package.json" ]; then echo "==> Installing packages…" npm install + npm install -g phantomjs-prebuilt fi if [ -f "bower.json"]; then From 4c9dbacf093ce469255b9cef0b2eb6a0a2f05734 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 16 Mar 2016 17:27:46 -0700 Subject: [PATCH 6/6] protip for windows users :dancer: --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3bfbc44a59..aa1a9ef519 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To install the frontend please do the following: 3. Install [ember-cli latest](https://www.npmjs.org/package/ember-cli): `npm install -g ember-cli@latest`. Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install ember-cli. 4. Install [bower](https://www.npmjs.org/package/bower): `npm install -g bower` -5. Clone this repo with `git clone https://github.com/HospitalRun/hospitalrun-frontend`, go to the cloned folder and run `script/bootstrap`. (*Note: Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install PhantomJS2.*) +5. Clone this repo with `git clone https://github.com/HospitalRun/hospitalrun-frontend`, go to the cloned folder and run `script/bootstrap`. (*Note: Depending on your [npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) you might need root access to install PhantomJS2; also, Windows users must run with [Cygwin](http://cygwin.org/)*) 6. Install and configure [CouchDB](http://couchdb.apache.org/) 1. Download and install CouchDB from http://couchdb.apache.org/#download 2. Create admin user: