Skip to content

Commit f948b96

Browse files
committed
Improve setup_ember script
* Don't overwrite `gemfiles/` changes with `appraisal install` * Localize Ember setup to `bin/setup_ember` * Always invoke, let `bin/setup_ember` decide whether or not to no-op
1 parent b47db7b commit f948b96

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

bin/setup

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,6 @@ if ! command -v bower > /dev/null; then
1313
npm install -g bower
1414
fi
1515

16-
if ! [ -d spec/dummy/my-app ]; then
17-
git clone https://github.com/kellyselden/ember-cli-output.git spec/dummy/my-app
16+
bin/setup_ember spec/dummy/my-app
1817

19-
bin/setup_ember
20-
fi
21-
22-
# Only if this isn't CI
23-
if [ -z "$CI" ]; then
24-
bin/appraisal install
25-
fi
26-
27-
root="$(pwd)"
28-
29-
cd ${root}/spec/dummy/my-app &&
30-
npm install --save-dev ember-cli-rails-addon@rondale-sc/ember-cli-rails-addon
31-
bower install
32-
33-
cd ${root}/spec/dummy && bundle exec rake ember:install
18+
cd spec/dummy && bundle exec rake ember:install

bin/setup_ember

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,24 @@
22

33
set -e
44

5-
# make router catchall routes
6-
sed -i -e 's/auto/hash/' spec/dummy/my-app/config/environment.js
5+
setup_ember() {
6+
local target="${1-spec/dummy/my-app}"
77

8-
# add an image to a template
9-
echo '<img src="assets/logo.png">' >> spec/dummy/my-app/app/templates/application.hbs
10-
mkdir -p spec/dummy/my-app/public/assets
11-
cp spec/fixtures/logo.png spec/dummy/my-app/public/assets
8+
if ! [ -d $target ]; then
9+
git clone https://github.com/kellyselden/ember-cli-output.git $target
10+
11+
# make router catchall routes
12+
sed -i -e 's/auto/hash/' $target/config/environment.js
13+
14+
# add an image to a template
15+
echo '<img src="assets/logo.png">' >> $target/app/templates/application.hbs
16+
mkdir -p $target/public/assets
17+
cp spec/fixtures/logo.png $target/public/assets
18+
19+
cd $target &&
20+
npm install --save-dev ember-cli-rails-addon@rondale-sc/ember-cli-rails-addon
21+
bower install
22+
fi
23+
}
24+
25+
setup_ember

0 commit comments

Comments
 (0)