diff --git a/admin/Gemfile b/admin/Gemfile index a14387965..7ca5eda28 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -11,6 +11,7 @@ else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end gem 'rails' diff --git a/ruby/Gemfile b/ruby/Gemfile index f8a1643ac..b73acf642 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,6 +6,15 @@ end devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable +if devenv + gem 'jam_db', :path=> "../db/target/ruby_package" + gem 'jampb', :path => "../pb/target/ruby/jampb" +else + gem 'jam_db' + gem 'jampb' + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" +end + gem 'pg', '0.15.1', :platform => [:mri, :mswin, :mingw] gem 'jdbc_postgres', :platform => [:jruby] @@ -33,13 +42,7 @@ gem 'resque-lonely_job', '~> 1.0.0' gem 'oj' gem 'builder' -if devenv - gem 'jam_db', :path=> "../db/target/ruby_package" - gem 'jampb', :path => "../pb/target/ruby/jampb" -else - gem 'jam_db' - gem 'jampb' -end + group :test do gem "factory_girl", '4.1.0' diff --git a/web/Gemfile b/web/Gemfile index c99aa6213..9cf724965 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -17,6 +17,7 @@ else 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 gem 'builder' gem 'rails', '>=3.2.11' diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile index 78131b08a..52e8dd565 100644 --- a/websocket-gateway/Gemfile +++ b/websocket-gateway/Gemfile @@ -15,6 +15,7 @@ else gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" + ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end