Skip to content

Commit

Permalink
Upgrading uglifier
Browse files Browse the repository at this point in the history
Fixing dev to consider implicit gem updates
  • Loading branch information
hugocorbucci committed Dec 23, 2017
1 parent 6144def commit 65e1f8f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ gem 'rails', '~> 5.0'
gem 'sass-rails', '~>5.0'
gem 'therubyracer'
gem 'turbolinks'
gem 'uglifier', '~>3.0'
gem 'uglifier', '~>4.0'
gem 'will_paginate', '~> 3.1'

group :production do
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ GEM
turbolinks-source (5.0.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (3.2.0)
uglifier (4.0.2)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.0)
uniform_notifier (1.10.0)
Expand Down Expand Up @@ -431,7 +431,7 @@ DEPENDENCIES
terminal-notifier-guard
therubyracer
turbolinks
uglifier (~> 3.0)
uglifier (~> 4.0)
web-console
will_paginate (~> 3.1)

Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8b7a2436bfe0b2fd36fd71a447179ac4
1 change: 0 additions & 1 deletion Gemfile.md5

This file was deleted.

18 changes: 11 additions & 7 deletions dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,21 @@ if [ "$OSX" == "true" ]; then
eval "$(docker-machine env)"
fi

if [ ! -f "${MY_DIR}/Gemfile.md5" ]; then
touch "${MY_DIR}/Gemfile.md5"
if [ ! -f "${MY_DIR}/Gemfile.lock" ]; then
touch "${MY_DIR}/Gemfile.lock"
fi
if [ ! -f "${MY_DIR}/Gemfile.lock.md5" ]; then
touch "${MY_DIR}/Gemfile.lock.md5"
fi
if [ "${OSX}" == "true" ]; then
MD5_SUM_COMMAND="md5 -q Gemfile"
MD5_SUM_COMMAND="md5 -q Gemfile.lock"
else
MD5_SUM_COMMAND="md5sum Gemfile | awk '{print \$1}'"
MD5_SUM_COMMAND="md5sum Gemfile.lock | awk '{print \$1}'"
fi
${MD5_SUM_COMMAND} > "${MY_DIR}/Gemfile.md5.new"
if [ ! -z "$(diff -q "${MY_DIR}/Gemfile.md5" "${MY_DIR}/Gemfile.md5.new")" ]; then
mv "${MY_DIR}/Gemfile.md5.new" "${MY_DIR}/Gemfile.md5"
TEMP_MD5=$(mktemp)
${MD5_SUM_COMMAND} > "${TEMP_MD5}"
if [ ! -z "$(diff -q "${MY_DIR}/Gemfile.lock.md5" "${TEMP_MD5}")" ]; then
cp "${TEMP_MD5}" "${MY_DIR}/Gemfile.lock.md5"
docker-compose build
fi

Expand Down

0 comments on commit 65e1f8f

Please sign in to comment.