Skip to content

Commit

Permalink
Upgrade production dependencies except pliny and grape
Browse files Browse the repository at this point in the history
  • Loading branch information
jirutka committed May 20, 2016
1 parent b788181 commit 6cddd68
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 69 deletions.
11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ gem 'pg'
gem 'sequel', '~> 4.17'
gem 'sequel_pg', require: 'sequel'
gem 'kosapi_client', github: 'cvut/kosapi_client.rb'
# TODO: replace with version after 0.9.0 is released.
gem 'chewy', github: 'toptal/chewy', branch: 'ec41aca'
gem 'chewy', '~> 0.8.2', '< 0.8.4' # 0.8.4 is broken

## REST API
gem 'pliny', '~> 0.11.0'
gem 'dotenv'
gem 'grape', '~> 0.9.0'
gem 'warden', '~> 1.2.3' # authentication middleware
gem 'faraday', '~> 0.8.9'
gem 'faraday_middleware', '~> 0.8.8'
gem 'faraday', '~> 0.9.0'
gem 'faraday_middleware', '~> 0.10.0'

# JSON-API support: https://github.com/apotonick/roar/pull/98
gem 'roar', '~> 1.0.0'
Expand All @@ -38,14 +37,14 @@ gem 'ice_cube' # Date/Time helper
gem 'icalendar', '~> 2.3.0'

## Background tasks & Scheduling
gem 'rufus-scheduler', '~> 3.1.0', require: false
gem 'rufus-scheduler', '~> 3.1', require: false

## Helper stuff
gem 'activesupport'
gem 'corefines', '~> 1.9'
gem 'role_playing', github: 'jnv/role_playing'
gem 'logging'
gem 'oauth2', github: 'cvut/oauth2', ref: '13753d6'
gem 'oauth2', github: 'cvut/oauth2', ref: 'd9f6fc3'

## For console
gem 'pry', require: false
Expand Down
114 changes: 51 additions & 63 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
GIT
remote: git://github.com/cvut/kosapi_client.rb.git
revision: 2fc49c8af3c8d802a949c6e146dfa84e7764dafd
revision: 3c76ff5a389513b4737c1c5d8eb91dd578ed55d0
specs:
kosapi_client (0.3.2)
activesupport
kosapi_client (0.4.0)
corefines (~> 1.6)
escape_utils
faraday (~> 0.8.9)
faraday (~> 0.9.0)
oauth2
ox
uri_template

GIT
remote: git://github.com/cvut/oauth2.git
revision: 13753d67056623c1fe03106a41f400354f904e9d
ref: 13753d6
revision: d9f6fc37eae191b124680361a698d673adff31c0
ref: d9f6fc3
specs:
oauth2 (1.0.0)
oauth2 (1.1.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (>= 1.2, < 3)

GIT
remote: git://github.com/jnv/role_playing.git
Expand All @@ -41,20 +41,11 @@ GIT
rspec (>= 2.13, < 4)
unparser

GIT
remote: git://github.com/toptal/chewy.git
revision: ec41acaeabed57c6d48bb0ec95dcad6ca6a8bf23
branch: ec41aca
specs:
chewy (0.8.1)
activesupport (>= 3.2)
elasticsearch (>= 1.0.0)

GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
activesupport (4.2.3)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -76,6 +67,9 @@ GEM
dependor (>= 0.0.4)
builder (3.2.2)
byebug (9.0.4)
chewy (0.8.3)
activesupport (>= 3.2)
elasticsearch (>= 1.0.0)
codeclimate-test-reporter (0.5.0)
simplecov (>= 0.7.1, < 1.0.0)
coderay (1.1.1)
Expand All @@ -101,30 +95,30 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
docile (1.1.5)
dotenv (2.0.2)
elasticsearch (1.0.12)
elasticsearch-api (= 1.0.12)
elasticsearch-transport (= 1.0.12)
elasticsearch-api (1.0.12)
dotenv (2.1.1)
elasticsearch (1.0.17)
elasticsearch-api (= 1.0.17)
elasticsearch-transport (= 1.0.17)
elasticsearch-api (1.0.17)
multi_json
elasticsearch-extensions (0.0.20)
ansi
ruby-prof
elasticsearch-transport (1.0.12)
elasticsearch-transport (1.0.17)
faraday
multi_json
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
equalizer (0.0.11)
erubis (2.7.0)
escape_utils (1.1.0)
escape_utils (1.2.1)
eventmachine (1.2.0.1)
fabrication (2.15.2)
faraday (0.8.9)
multipart-post (~> 1.2.0)
faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
ffi (1.9.10)
foreman (0.81.0)
thor (~> 0.19.1)
Expand Down Expand Up @@ -165,47 +159,44 @@ GEM
guard-yard (2.1.4)
guard (>= 1.1.0)
yard (>= 0.7.0)
hashie (3.4.2)
hashie (3.4.4)
http_accept (0.1.6)
http_parser.rb (0.6.0)
i18n (0.7.0)
icalendar (2.3.0)
ice_cube (0.13.0)
ice_cube (0.14.0)
ice_nine (0.11.2)
json (1.8.3)
json_schema (0.12.3)
json_spec (1.1.4)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
jwt (1.5.2)
jwt (1.5.4)
kramdown (1.11.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
little-plugger (1.1.3)
logging (2.0.0)
little-plugger (1.1.4)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
lumberjack (1.0.10)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mini_portile (0.6.2)
minitest (5.7.0)
minitest (5.9.0)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (1.2.0)
multipart-post (2.0.0)
nenv (0.3.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
notiffany (0.1.0)
nenv (~> 0.1)
shellany (~> 0.0)
ox (2.2.0)
ox (2.4.1)
parser (2.3.1.0)
ast (~> 2.2)
pg (0.18.2)
pg (0.18.4)
pliny (0.11.2)
activesupport (~> 4.1, >= 4.1.0)
http_accept (~> 0.1, >= 0.1.5)
Expand All @@ -232,8 +223,7 @@ GEM
pry (~> 0.10)
pry-nav (0.2.4)
pry (>= 0.9.10, < 0.11.0)
puma (2.11.3)
rack (>= 1.1, < 2.0)
puma (3.4.0)
rack (1.6.4)
rack-accept (0.4.5)
rack (>= 0.4)
Expand All @@ -243,19 +233,17 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.3.2)
rack-timeout (0.4.2)
rake (10.5.0)
rake-jekyll (1.1.0)
rake (~> 10.0)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
representable (2.2.3)
multi_json
nokogiri
representable (2.3.0)
uber (~> 0.0.7)
roar (1.0.1)
representable (>= 2.0.1, <= 3.0.0)
roar (1.0.4)
representable (>= 2.0.1, < 2.4.0)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
Expand All @@ -276,21 +264,21 @@ GEM
rspec-support (3.4.1)
ruby-prof (0.15.9)
ruby_dep (1.3.1)
rufus-scheduler (3.1.3)
sentry-raven (0.13.3)
rufus-scheduler (3.2.1)
sentry-raven (1.0.0)
faraday (>= 0.7.6)
sequel (4.24.0)
sequel_pg (1.6.13)
sequel (4.34.0)
sequel_pg (1.6.17)
pg (>= 0.8.0)
sequel (>= 3.39.0)
sequel (>= 4.0.0)
shellany (0.0.1)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.4.6)
rack (~> 1.4)
sinatra (1.4.7)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-router (0.2.3)
Expand All @@ -302,12 +290,12 @@ GEM
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
tilt (2.0.4)
timecop (0.8.1)
tins (1.6.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.13)
uber (0.0.15)
unparser (0.2.5)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
Expand All @@ -323,7 +311,7 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.3)
warden (1.2.6)
rack (>= 1.0)
yard (0.8.7.6)

Expand All @@ -334,7 +322,7 @@ DEPENDENCIES
activesupport
awesome_print
bogus
chewy!
chewy (~> 0.8.2, < 0.8.4)
codeclimate-test-reporter
committee
corefines (~> 1.9)
Expand All @@ -343,8 +331,8 @@ DEPENDENCIES
dotenv
elasticsearch-extensions
fabrication
faraday (~> 0.8.9)
faraday_middleware (~> 0.8.8)
faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0)
foreman
grape (~> 0.9.0)
guard-livereload
Expand Down Expand Up @@ -374,7 +362,7 @@ DEPENDENCIES
rspec-collection_matchers
rspec-http (~> 0.11)
rspec-parameterized!
rufus-scheduler (~> 3.1.0)
rufus-scheduler (~> 3.1)
sentry-raven
sequel (~> 4.17)
sequel_pg
Expand Down

0 comments on commit 6cddd68

Please sign in to comment.