From 4d4d04b3438076be1fbfdecdb1826fae18bd7453 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Wed, 7 May 2014 08:30:41 -0500
Subject: [PATCH] VRFS-1651 - test-www should not use build_number

---
 admin/Gemfile             | 8 +-------
 ruby/Gemfile              | 6 +-----
 web/Gemfile               | 8 +-------
 websocket-gateway/Gemfile | 7 +------
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index 79f539f53..4d03673a3 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -1,18 +1,12 @@
 source 'http://rubygems.org'
 
 source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
-devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
+devenv = ENV["BUILD_NUMBER"].nil? || ENV["TEST_WWW"] == "1"
 
 if devenv
   gem 'jam_db', :path=> "../db/target/ruby_package"
   gem 'jampb', :path => "../pb/target/ruby/jampb"
   gem 'jam_ruby', :path => "../ruby"
-elsif ENV["TEST_WWW"] == "1"
-  #gem 'jam_db'
-  #gem 'jampb'
-  #gem 'jam_ruby'
-  #gem 'jam_websockets'
-  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 else
   gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
   gem 'jampb',  "0.1.#{ENV["BUILD_NUMBER"]}"
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 65e0891a0..7a53e7f6b 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -4,15 +4,11 @@ unless ENV["LOCAL_DEV"] == "1"
 	source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
 end
 
-devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
+devenv = ENV["BUILD_NUMBER"].nil? || ENV["TEST_WWW"] == "1"
 
 if devenv
   gem 'jam_db', :path=> "../db/target/ruby_package"
   gem 'jampb', :path => "../pb/target/ruby/jampb"
-elsif ENV["TEST_WWW"] == "1"
-  #gem 'jam_db'
-  #gem 'jampb'
-  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 else
   gem 'jam_db'
   gem 'jampb'
diff --git a/web/Gemfile b/web/Gemfile
index 406e4db1b..1ff24b15f 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -5,19 +5,13 @@ unless ENV["LOCAL_DEV"] == "1"
 end
 # Look for $WORKSPACE, otherwise use "workspace" as dev path.
 
-devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
+devenv = ENV["BUILD_NUMBER"].nil? || ENV["TEST_WWW"] == "1"
 
 if devenv
   gem 'jam_db', :path=> "../db/target/ruby_package"
   gem 'jampb', :path => "../pb/target/ruby/jampb"
   gem 'jam_ruby', :path => "../ruby"
   gem 'jam_websockets', :path => "../websocket-gateway"
-elsif ENV["TEST_WWW"] == "1"
-  #gem 'jam_db'
-  #gem 'jampb'
-  #gem 'jam_ruby'
-  #gem 'jam_websockets'
-  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 else
   gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
   gem 'jampb',  "0.1.#{ENV["BUILD_NUMBER"]}"
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index e76e66265..4952d17e7 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -5,17 +5,12 @@ unless ENV['LOCAL_DEV'] == '1'
 end
 
 # Look for $WORKSPACE, otherwise use "workspace" as dev path.
-devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
+devenv = ENV["BUILD_NUMBER"].nil? || ENV["TEST_WWW"] == "1"
 
 if devenv
   gem 'jam_db', :path=> "../db/target/ruby_package"
   gem 'jampb', :path => "../pb/target/ruby/jampb"
   gem 'jam_ruby', :path => "../ruby"
-elsif ENV["TEST_WWW"] == "1"
-  #gem 'jam_db'
-  #gem 'jampb'
-  #gem 'jam_ruby'
-  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 else
   gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
   gem 'jampb',  "0.1.#{ENV["BUILD_NUMBER"]}"