From e409f1b623cea57b9a8f8a9c7a7e93e00bdfa709 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Mon, 8 Jul 2013 13:03:31 +0200
Subject: [PATCH] big bundle update
primarily for core, but also for GH and puma
---
Gemfile | 16 ++++++------
Gemfile.lock | 73 ++++++++++++++++++++++++----------------------------
2 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/Gemfile b/Gemfile
index 2a04da65..5c85d6db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,26 +6,26 @@ gemspec
gem 'travis-core', github: 'travis-ci/travis-core'
gem 'travis-support', github: 'travis-ci/travis-support'
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
-gem 'sinatra' #github: 'sinatra/sinatra'
+gem 'sinatra'
gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
-gem 'puma', '1.6.3'
-gem "sentry-raven", github: 'getsentry/raven-ruby'
+gem 'puma', '2.3.1'
+gem 'sentry-raven', github: 'getsentry/raven-ruby'
gem 'yard-sinatra', github: 'rkh/yard-sinatra'
gem 'rack-contrib', github: 'rack/rack-contrib'
gem 'rack-cache', '~> 1.2'
-gem 'gh', github: 'rkh/gh'
+gem 'gh'
gem 'bunny'
gem 'dalli'
gem 'pry'
-gem 'metriks', '0.9.9.2'
+gem 'metriks', '0.9.9.5'
gem 'ar-octopus', github: 'travis-ci/octopus', require: nil
group :test do
- gem 'rspec', '~> 2.11'
- gem 'factory_girl', '~> 2.4.0'
- gem 'mocha', '~> 0.12'
+ gem 'rspec', '~> 2.11'
+ gem 'factory_girl', '~> 2.4.0'
+ gem 'mocha', '~> 0.12'
gem 'database_cleaner', '~> 0.8.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 288015d7..b29e2bd7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
GIT
remote: git://github.com/getsentry/raven-ruby.git
- revision: a07adb1fcbe4b11d938e2af236eb2063d2a22c32
+ revision: 299f326b420f9d80cfeea9d4e7bfd66ac93f5ad2
specs:
- sentry-raven (0.4.8)
+ sentry-raven (0.5.0)
faraday (>= 0.7.6)
hashie (>= 1.1.0)
multi_json (~> 1.0)
@@ -10,23 +10,11 @@ GIT
GIT
remote: git://github.com/rack/rack-contrib.git
- revision: 1026181ca6bbe01e7daad43d15b701296abf95b8
+ revision: 951760b1710634623ebbccef8d65df9139bb41c2
specs:
rack-contrib (1.2.0)
rack (>= 0.9.1)
-GIT
- remote: git://github.com/rkh/gh.git
- revision: 6eec1a730700d7e94bb288742ad23822d2d28604
- specs:
- gh (0.11.2)
- addressable
- backports
- faraday (~> 0.8)
- multi_json (~> 1.0)
- net-http-persistent (>= 2.7)
- net-http-pipeline
-
GIT
remote: git://github.com/rkh/yard-sinatra.git
revision: e61831bca0431b35eaa62fdd18acbc65f81322af
@@ -44,7 +32,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-core.git
- revision: d1b1eb478c2850b4a069b939657dfbd785f02152
+ revision: 32e6e09ac69db3cb96c93a63d0faf8b1c88806a6
specs:
travis-core (0.0.1)
actionmailer (~> 3.2.12)
@@ -140,13 +128,13 @@ GEM
coderay (1.0.9)
connection_pool (0.9.3)
daemons (1.1.9)
- dalli (2.6.3)
+ dalli (2.6.4)
data_migrations (0.0.1)
activerecord
rake
database_cleaner (0.8.0)
diff-lcs (1.2.4)
- dotenv (0.7.0)
+ dotenv (0.8.0)
erubis (2.7.0)
eventmachine (1.0.3)
facter (1.7.1)
@@ -154,10 +142,17 @@ GEM
activesupport
faraday (0.8.7)
multipart-post (~> 1.1)
- ffi (1.8.1)
+ ffi (1.9.0)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
+ gh (0.11.3)
+ addressable
+ backports
+ faraday (~> 0.8)
+ multi_json (~> 1.0)
+ net-http-persistent (>= 2.7)
+ net-http-pipeline
hashie (2.0.5)
hashr (0.0.22)
hike (1.2.3)
@@ -165,7 +160,7 @@ GEM
i18n (0.6.1)
journey (1.0.4)
json (1.8.0)
- listen (1.1.3)
+ listen (1.2.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
@@ -174,7 +169,7 @@ GEM
treetop (~> 1.4.8)
metaclass (0.0.1)
method_source (0.8.1)
- metriks (0.9.9.2)
+ metriks (0.9.9.5)
atomic (~> 1.0)
avl_tree (~> 1.1.2)
hitimes (~> 1.1)
@@ -192,8 +187,8 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- puma (1.6.3)
- rack (~> 1.2)
+ puma (2.3.1)
+ rack (>= 1.1, < 2.0)
pusher (0.11.3)
multi_json (~> 1.0)
signature (~> 0.1.6)
@@ -228,14 +223,14 @@ GEM
rerun (0.8.1)
listen (>= 1.0.3)
rollout (1.1.0)
- rspec (2.13.0)
- rspec-core (~> 2.13.0)
- rspec-expectations (~> 2.13.0)
- rspec-mocks (~> 2.13.0)
- rspec-core (2.13.1)
- rspec-expectations (2.13.0)
+ rspec (2.14.0)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ rspec-core (2.14.0)
+ rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.13.1)
+ rspec-mocks (2.14.1)
sidekiq (2.5.4)
celluloid (~> 0.12.0)
connection_pool (~> 0.9.2)
@@ -246,16 +241,16 @@ GEM
simple_states (1.0.0)
activesupport
hashr (~> 0.0.10)
- sinatra (1.3.6)
+ sinatra (1.4.3)
rack (~> 1.4)
- rack-protection (~> 1.3)
- tilt (~> 1.3, >= 1.3.3)
- sinatra-contrib (1.3.2)
+ rack-protection (~> 1.4)
+ tilt (~> 1.3, >= 1.3.4)
+ sinatra-contrib (1.4.0)
backports (>= 2.0)
eventmachine
rack-protection
rack-test
- sinatra (~> 1.3.0)
+ sinatra (~> 1.4.2)
tilt (~> 1.3)
slop (3.4.5)
sprockets (2.2.2)
@@ -275,7 +270,7 @@ GEM
polyglot (>= 0.3.1)
tzinfo (0.3.37)
uuidtools (2.1.4)
- yard (0.8.6.1)
+ yard (0.8.6.2)
PLATFORMS
ruby
@@ -287,12 +282,12 @@ DEPENDENCIES
database_cleaner (~> 0.8.0)
factory_girl (~> 2.4.0)
foreman
- gh!
- metriks (= 0.9.9.2)
+ gh
+ metriks (= 0.9.9.5)
micro_migrations!
mocha (~> 0.12)
pry
- puma (= 1.6.3)
+ puma (= 2.3.1)
rack-cache (~> 1.2)
rack-contrib!
rake (~> 0.9.2)