Skip to content

Commit

Permalink
Close #1532 - Remove warbler from dist Gemfile
Browse files Browse the repository at this point in the history
  • Loading branch information
simianhacker committed Nov 1, 2014
1 parent 2ddafa7 commit b1a1003
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 24 deletions.
9 changes: 9 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
source "https://rubygems.org"

gem 'sinatra', :require => 'sinatra/base'
gem 'sinatra-contrib'
gem 'puma'
gem 'warbler'
gem 'elasticsearch'
gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
gem 'colorize'
59 changes: 59 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
GEM
remote: https://rubygems.org/
specs:
backports (3.6.0)
colorize (0.7.3)
elasticsearch (1.0.4)
elasticsearch-api (= 1.0.4)
elasticsearch-transport (= 1.0.4)
elasticsearch-api (1.0.4)
multi_json
elasticsearch-transport (1.0.4)
faraday
multi_json
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
jruby-jars (1.7.13)
jruby-rack (1.1.16)
multi_json (1.10.1)
multipart-post (2.0.0)
puma (2.9.0)
rack (>= 1.1, < 2.0)
rack (1.5.2)
rack-protection (1.5.3)
rack
rack-reverse-proxy (0.4.4)
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
rake (10.1.0)
rubyzip (1.1.6)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
sinatra-contrib (1.4.2)
backports (>= 2.0)
multi_json
rack-protection
rack-test
sinatra (~> 1.4.0)
tilt (~> 1.3)
tilt (1.4.1)
warbler (1.4.4)
jruby-jars (>= 1.5.6, < 2.0)
jruby-rack (>= 1.0.0)
rake (>= 0.9.6)
rubyzip (>= 0.9, < 1.2)

PLATFORMS
ruby

DEPENDENCIES
colorize
elasticsearch
puma
rack-reverse-proxy
sinatra
sinatra-contrib
warbler
2 changes: 0 additions & 2 deletions src/server/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ source "https://rubygems.org"
gem 'sinatra', :require => 'sinatra/base'
gem 'sinatra-contrib'
gem 'puma'
gem 'warbler'
gem 'elasticsearch'
gem 'rack-reverse-proxy', :require => 'rack/reverse_proxy'
gem 'colorize'
22 changes: 0 additions & 22 deletions src/server/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,7 @@ GEM
specs:
backports (3.6.0)
colorize (0.7.3)
elasticsearch (1.0.4)
elasticsearch-api (= 1.0.4)
elasticsearch-transport (= 1.0.4)
elasticsearch-api (1.0.4)
multi_json
elasticsearch-transport (1.0.4)
faraday
multi_json
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
jruby-jars (1.7.13)
jruby-rack (1.1.16)
multi_json (1.10.1)
multipart-post (2.0.0)
puma (2.9.0)
rack (>= 1.1, < 2.0)
puma (2.9.0-java)
Expand All @@ -28,8 +15,6 @@ GEM
rack (>= 1.0.0)
rack-test (0.6.2)
rack (>= 1.0)
rake (10.1.0)
rubyzip (1.1.6)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
Expand All @@ -42,21 +27,14 @@ GEM
sinatra (~> 1.4.0)
tilt (~> 1.3)
tilt (1.4.1)
warbler (1.4.4)
jruby-jars (>= 1.5.6, < 2.0)
jruby-rack (>= 1.0.0)
rake (>= 0.9.6)
rubyzip (>= 0.9, < 1.2)

PLATFORMS
java
ruby

DEPENDENCIES
colorize
elasticsearch
puma
rack-reverse-proxy
sinatra
sinatra-contrib
warbler

0 comments on commit b1a1003

Please sign in to comment.