From 12fb985883b444db458c042af252ba2c13525b5a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 19 Sep 2012 23:19:21 -0500 Subject: [PATCH] * moving jam-db to test scope only --- Gemfile | 6 ++++-- lib/jam_ruby.rb | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 28adfeac6..061aa233e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,9 @@ source 'https://rubygems.org' # Look for $WORKSPACE, otherwise use "workspace" as dev path. workspace = ENV["WORKSPACE"] || "~/workspace" -gem 'pg', '0.14.0' -gem 'jam_db', :path=> "#{workspace}/jam-db/target/ruby_package" +gem 'pg', '0.14.0', :platform => [:mri, :mswin, :mingw] +gem 'jdbc_postgres', :platform => [:jruby] + gem 'jampb', :path => "#{workspace}/jam-pb/target/ruby/jampb" gem 'activerecord', '3.2.7' gem 'uuidtools', '2.1.2' @@ -12,6 +13,7 @@ gem 'bcrypt-ruby', '3.0.1' gem 'ruby-protocol-buffers', '1.2.2' group :test do + gem 'jam_db', :path=> "#{workspace}/jam-db/target/ruby_package" gem "factory_girl" gem "rspec", "2.10.0" gem 'spork', '0.9.0' diff --git a/lib/jam_ruby.rb b/lib/jam_ruby.rb index 7863cab18..32786f931 100644 --- a/lib/jam_ruby.rb +++ b/lib/jam_ruby.rb @@ -1,6 +1,5 @@ require "pg" require "active_record" -require "jam_db" require "jampb" require 'uuidtools' require "jam_ruby/version"