From 92d43fb2aaa652d9c856f2207061eadf8625b5ae Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 3 Jun 2013 07:03:31 -0500 Subject: [PATCH] * take out acciddentaly devise debugging stuff --- Gemfile | 2 ++ Gemfile.lock | 71 +++++++++++++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/Gemfile b/Gemfile index 095d1efd6..6f358610a 100644 --- a/Gemfile +++ b/Gemfile @@ -45,6 +45,8 @@ gem "meta_search", '>= 1.1.0.pre' gem 'fog', "~> 1.3.1" gem 'country-select' gem 'aasm', '3.0.16' +gem 'postgres-copy' +gem 'aws-sdk' gem 'eventmachine', '1.0.0' gem 'amqp', '0.9.8' diff --git a/Gemfile.lock b/Gemfile.lock index 0811b290f..19cdf8a61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: ~/workspace/jam-db/target/ruby_package specs: jam_db (0.0.1) - pg_migrate (= 0.1.6) + pg_migrate (= 0.1.7) PATH remote: ~/workspace/jam-pb/target/ruby/jampb @@ -62,7 +62,7 @@ GEM amq-client (0.9.12) amq-protocol (>= 1.2.0) eventmachine - amq-protocol (1.3.0) + amq-protocol (1.6.0) amqp (0.9.8) amq-client (~> 0.9.5) amq-protocol (>= 0.9.4) @@ -72,16 +72,21 @@ GEM arel (3.0.2) arr-pm (0.0.8) cabin (> 0) - backports (2.6.2) + aws-sdk (1.11.0) + json (~> 1.4) + nokogiri (>= 1.4.4) + uuidtools (~> 2.1) + backports (2.3.0) bcrypt-ruby (3.0.1) bootstrap-sass (2.0.4.0) bootstrap-will_paginate (0.0.6) will_paginate - bourbon (3.1.4) + bourbon (3.1.6) sass (>= 3.2.0) thor builder (3.0.4) - cabin (0.6.0) + cabin (0.4.4) + json capybara (2.1.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -93,7 +98,7 @@ GEM activesupport (>= 3.2.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) - clamp (0.3.1) + clamp (0.6.1) coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -105,7 +110,7 @@ GEM country-select (1.1.1) daemons (1.1.9) database_cleaner (0.7.0) - devise (2.2.3) + devise (2.2.4) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (~> 3.1) @@ -122,7 +127,7 @@ GEM factory_girl (~> 4.1.0) railties (>= 3.0.0) fastercsv (1.5.5) - ffi (1.7.0) + ffi (1.8.1) fog (1.3.1) builder excon (~> 0.13.0) @@ -136,13 +141,12 @@ GEM formatador (0.2.4) formtastic (2.2.1) actionpack (>= 3.0) - fpm (0.4.33) - arr-pm (~> 0.0.8) - backports (= 2.6.2) - cabin (>= 0.6.0) - clamp (= 0.3.1) - json (~> 1.7.7) - open4 + fpm (0.4.6) + arr-pm (~> 0.0.7) + backports (= 2.3.0) + cabin (~> 0.4.3) + clamp + json guard (1.8.0) formatador (>= 0.2.4) listen (>= 1.0.0) @@ -164,10 +168,10 @@ GEM selenium-webdriver (>= 0.1.3) jasmine-core (1.3.1) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (3.0.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (1.8.0) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -175,7 +179,7 @@ GEM launchy (2.3.0) addressable (~> 2.3) libv8 (3.11.8.17) - listen (1.0.2) + listen (1.1.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) @@ -185,8 +189,7 @@ GEM logging-rails (0.4.0) logging (~> 1.6) lumberjack (1.0.3) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) meta_search (1.1.3) @@ -196,22 +199,26 @@ GEM polyamorous (~> 0.5.0) method_source (0.8.1) mime-types (1.23) - multi_json (1.7.2) + multi_json (1.7.5) net-scp (1.0.4) net-ssh (>= 1.99.1) net-ssh (2.6.7) nokogiri (1.5.9) - open4 (1.3.0) orm_adapter (0.4.0) pg (0.14.0) - pg_migrate (0.1.6) + pg_migrate (0.1.7) logging (= 1.7.2) pg (= 0.14.0) thor (= 0.15.4) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) - pry (0.9.12.1) + postgres-copy (0.6.0) + activerecord (>= 3.0.0) + pg + rails (>= 3.0.0) + responders + pry (0.9.12.2) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) @@ -248,7 +255,7 @@ GEM ffi (>= 0.5.0) rdoc (3.12.2) json (~> 1.4) - ref (1.0.4) + ref (1.0.5) responders (0.9.3) railties (~> 3.1) rspec (2.13.0) @@ -259,7 +266,7 @@ GEM rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.13.1) - rspec-rails (2.13.0) + rspec-rails (2.13.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -269,12 +276,12 @@ GEM ruby-hmac (0.4.0) ruby-protocol-buffers (1.2.2) rubyzip (0.9.9) - sass (3.2.8) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.32.1) + selenium-webdriver (2.33.0) childprocess (>= 0.2.5) multi_json (~> 1.0) rubyzip @@ -282,7 +289,7 @@ GEM sendgrid (1.1.0) json json - slop (3.4.4) + slop (3.4.5) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -296,12 +303,12 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.15.4) - tilt (1.3.7) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) tzinfo (0.3.37) - uglifier (2.0.1) + uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicorn (4.6.2) @@ -323,6 +330,7 @@ DEPENDENCIES aasm (= 3.0.16) activeadmin amqp (= 0.9.8) + aws-sdk bcrypt-ruby (= 3.0.1) bootstrap-sass (= 2.0.4) bootstrap-will_paginate (= 0.0.6) @@ -348,6 +356,7 @@ DEPENDENCIES logging-rails meta_search (>= 1.1.0.pre) pg_migrate + postgres-copy pry rails rails3-jquery-autocomplete