From b1a1003546a2a4e0d24bac8401078bf30294a1f3 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Fri, 31 Oct 2014 17:15:53 -0700
Subject: [PATCH] Close #1532 - Remove warbler from dist Gemfile

---
 Gemfile                 |  9 +++++++
 Gemfile.lock            | 59 +++++++++++++++++++++++++++++++++++++++++
 src/server/Gemfile      |  2 --
 src/server/Gemfile.lock | 22 ---------------
 4 files changed, 68 insertions(+), 24 deletions(-)
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000000..4c7990e562ee1
--- /dev/null
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000000000..9d834b63133d5
--- /dev/null
+++ b/Gemfile.lock
@@ -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
diff --git a/src/server/Gemfile b/src/server/Gemfile
index 4c7990e562ee1..b9a532874cf68 100644
--- a/src/server/Gemfile
+++ b/src/server/Gemfile
@@ -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'
diff --git a/src/server/Gemfile.lock b/src/server/Gemfile.lock
index c2fff6b16174c..4dca9f0b96deb 100644
--- a/src/server/Gemfile.lock
+++ b/src/server/Gemfile.lock
@@ -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)
@@ -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)
@@ -42,11 +27,6 @@ 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
@@ -54,9 +34,7 @@ PLATFORMS
 
 DEPENDENCIES
   colorize
-  elasticsearch
   puma
   rack-reverse-proxy
   sinatra
   sinatra-contrib
-  warbler