From 80a090c7664013085cdbca40a0dd74d4903fc4e6 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sun, 11 Dec 2011 11:48:47 -0800 Subject: [PATCH 1/6] update twitter gem --- Gemfile | 2 +- Gemfile.lock | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 71c74de37..f1350229b 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'omniauth-facebook' gem 'omniauth-tumblr' gem 'omniauth-twitter' -gem 'twitter', '2.0.1' +gem 'twitter', '2.0.2' # backups diff --git a/Gemfile.lock b/Gemfile.lock index 9b37172b5..030d725ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,7 +307,6 @@ GEM parallel (0.5.11) parallel_tests (0.6.11) parallel - pg (0.11.0) polyglot (0.3.3) rack (1.2.4) rack-mobile-detect (0.3.0) @@ -409,7 +408,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - twitter (2.0.1) + twitter (2.0.2) activesupport (>= 2.3.9, < 4) faraday (~> 0.7) multi_json (~> 1.0) @@ -491,7 +490,6 @@ DEPENDENCIES omniauth-tumblr omniauth-twitter parallel_tests - pg rails (= 3.0.11) rails-i18n redcarpet (= 2.0.0) @@ -513,7 +511,7 @@ DEPENDENCIES sod! sqlite3 thin (~> 1.3.1) - twitter (= 2.0.1) + twitter (= 2.0.2) typhoeus vanna! webmock From 03feec5eb38ce82caede8ff4a3e6baaf137ef593 Mon Sep 17 00:00:00 2001 From: David Kettler <21echoes@gmail.com> Date: Sun, 11 Dec 2011 12:05:19 -0800 Subject: [PATCH 2/6] jasmine out of group into top-level --- Gemfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f1350229b..5dd5047bf 100644 --- a/Gemfile +++ b/Gemfile @@ -113,11 +113,11 @@ gem 'faraday-stack' gem 'em-synchrony', :platforms => :ruby_19 gem 'em-websocket' -### GROUPS #### +# jazzy jasmine -group :test, :development do - gem 'jasmine', '~> 1.1.2' -end +gem 'jasmine', '~> 1.1.2' + +### GROUPS #### group :test do gem 'capybara', '~> 1.1.2' From 62833595da232863dcb55d1c8d4330cc6cd09ea3 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 11 Dec 2011 12:25:01 -0800 Subject: [PATCH 3/6] Specify version of rubygems in .rvmrc --- .rvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rvmrc b/.rvmrc index 60c7c9a56..b9e5bc5e4 100644 --- a/.rvmrc +++ b/.rvmrc @@ -2,5 +2,5 @@ if [ -e '.rvmrc_custom' ]; then source .rvmrc_custom; else - rvm --create use ree-1.8.7-2011.03@diaspora; + rvm --create use ree-1.8.7-2011.03@diaspora && rvm rubygems 1.8.12 fi From 82fd591b072773b616945325d17a40a4f3ec4049 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 11 Dec 2011 12:34:52 -0800 Subject: [PATCH 4/6] There is no production group to exclude --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96b812a2..e1a6f287e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - DB=mysql BUILD_TYPE=cucumber before_install: gem install bundler --pre -bundler_args: "--without development production" +bundler_args: "--without development" before_script: "./config/ci/before-travis.sh" script: "bundle exec rake travis" From bb3c6f31207b21bb9d4eaf13672f4d7b078ed66a Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 11 Dec 2011 13:31:31 -0800 Subject: [PATCH 5/6] Add production group back in and move what we can in there so that travis gem installs don't take as long --- .travis.yml | 2 +- Gemfile | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index e1a6f287e..f96b812a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - DB=mysql BUILD_TYPE=cucumber before_install: gem install bundler --pre -bundler_args: "--without development" +bundler_args: "--without development production" before_script: "./config/ci/before-travis.sh" script: "bundle exec rake travis" diff --git a/Gemfile b/Gemfile index 5dd5047bf..f1b629c5e 100644 --- a/Gemfile +++ b/Gemfile @@ -22,13 +22,27 @@ gem 'omniauth-twitter' gem 'twitter', '2.0.2' # backups - gem 'cloudfiles', '1.4.10', :require => false -# chef +# mail +gem 'messagebus_ruby_api', '0.4.8' -gem 'chef', '~> 0.10.4', :require => false -gem 'ohai', '~> 0.6.10', :require => false + +# web sockets +gem 'em-synchrony', :platforms => :ruby_19 + +group :production do # we don't install these on travis to speed up test runs + # chef + gem 'chef', '~> 0.10.4', :require => false + gem 'ohai', '~> 0.6.10', :require => false + + # reporting + gem 'hoptoad_notifier' + gem 'newrelic_rpm', :require => false + + # web sockets + gem 'em-websocket' +end # configuration @@ -76,15 +90,6 @@ gem 'resque-ensure-connected' gem 'resque-timeout', '1.0.0' gem 'SystemTimer', '1.2.3', :platforms => :ruby_18 -# reporting - -gem 'hoptoad_notifier' -gem 'newrelic_rpm', :require => false - -#mail - -gem 'messagebus_ruby_api', '0.4.8' - # tags gem 'acts-as-taggable-on', :git => 'git://github.com/diaspora/acts-as-taggable-on.git' @@ -108,11 +113,6 @@ gem 'client_side_validations' gem 'faraday' gem 'faraday-stack' -# web sockets - -gem 'em-synchrony', :platforms => :ruby_19 -gem 'em-websocket' - # jazzy jasmine gem 'jasmine', '~> 1.1.2' From 5494cf1fded84360ff9cfc085d2cbdde6b28e980 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 11 Dec 2011 13:54:43 -0800 Subject: [PATCH 6/6] Move websockets out of production group for ruby 1.8.7 --- Gemfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f1b629c5e..743350d23 100644 --- a/Gemfile +++ b/Gemfile @@ -30,6 +30,7 @@ gem 'messagebus_ruby_api', '0.4.8' # web sockets gem 'em-synchrony', :platforms => :ruby_19 +gem 'em-websocket' group :production do # we don't install these on travis to speed up test runs # chef @@ -39,9 +40,6 @@ group :production do # we don't install these on travis to speed up test runs # reporting gem 'hoptoad_notifier' gem 'newrelic_rpm', :require => false - - # web sockets - gem 'em-websocket' end # configuration