From 02a96e93e8a9ec4296fb6f10cdf8785ad898765a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 9 Jun 2015 09:48:31 -0500 Subject: [PATCH] * use source block in gemfile --- web/Gemfile | 17 +++++++---------- web/build | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/web/Gemfile b/web/Gemfile index c407c7d6e..c7862be73 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -1,7 +1,4 @@ source 'http://rubygems.org' -unless ENV["LOCAL_DEV"] == "1" - source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' -end # Look for $WORKSPACE, otherwise use "workspace" as dev path. devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable @@ -12,11 +9,13 @@ if devenv gem 'jam_ruby', :path => "../ruby" gem 'jam_websockets', :path => "../websocket-gateway" else - gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" - gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" - gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" - gem 'jam_websockets', "0.1.#{ENV["BUILD_NUMBER"]}" - ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" + source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' do + gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" + gem 'jam_websockets', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" + end end gem 'oj', '2.10.2' @@ -94,8 +93,6 @@ gem 'react-rails', '~> 1.0' gem "browserify-rails", "~> 0.7" source 'https://rails-assets.org' do - #gem 'rails-assets-fluxxor' - gem 'rails-assets-es5-shim' gem 'rails-assets-reflux' end diff --git a/web/build b/web/build index f82cec874..18f6eebdf 100755 --- a/web/build +++ b/web/build @@ -137,7 +137,6 @@ EOF # cache all gems local, and tell bundle to use local gems only #bundle install --path vendor/bundle --local # prepare production acssets - RAILS_ENV=production bundle install --path vendor/bundle rm -rf $DIR/public/assets bundle exec rake assets:precompile RAILS_ENV=production