Merge pull request #1164 from jordansissel/LOGSTASH-1918

Add missing 'rack' gem

Makefile

@@ -43,7 +43,7 @@ default:
 	@echo "  tarball -- builds the tarball package"
 	@echo "  tarball-test -- runs the test suite against the tarball package"
 
-TESTS=$(wildcard spec/inputs/file.rb spec/inputs/gelf.rb spec/inputs/imap.rb spec/support/*.rb spec/filters/*.rb spec/examples/*.rb spec/codecs/*.rb spec/conditionals/*.rb spec/event.rb spec/jar.rb)
+TESTS=$(wildcard spec/inputs/file.rb spec/inputs/gelf.rb spec/inputs/imap.rb spec/support/*.rb spec/filters/*.rb spec/examples/*.rb spec/codecs/*.rb spec/conditionals/*.rb spec/event.rb spec/jar.rb spec/web.rb)
 
 # The 'version' is generated based on the logstash version, git revision, etc.
 .VERSION.mk: REVISION=$(shell git rev-parse --short HEAD | tr -d ' ')

bin/logstash.lib.sh

@@ -56,7 +56,8 @@ setup_java() {
   export JAVA_OPTS
   export RUBYLIB="$basedir/lib"
   export GEM_HOME="$basedir/vendor/bundle/jruby/1.9"
-} 
+  export GEM_PATH=
+}
 
 setup_vendored_jruby() {
   RUBYVER=1.9

logstash.gemspec

@@ -26,9 +26,8 @@ Gem::Specification.new do |gem|
 
   # Web dependencies
   gem.add_runtime_dependency "ftw", ["~> 0.0.39"] #(Apache 2.0 license)
-  gem.add_runtime_dependency "haml"               #(MIT license)
-  gem.add_runtime_dependency "sass"               #(MIT license)
   gem.add_runtime_dependency "mime-types"         #(GPL 2.0)
+  gem.add_runtime_dependency "rack"               # (MIT-style license)
 
   # Input/Output/Filter dependencies
   #TODO Can these be optional?

spec/web.rb

@@ -0,0 +1,9 @@
+require "insist"
+
+describe "web tests" do
+  context "rack rubygem" do
+    it "must be available" do
+      require "rack"
+    end
+  end
+end

tools/Gemfile.jruby-1.9.lock

@@ -5,6 +5,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
+    atomic (1.1.15)
     atomic (1.1.15-java)
     avl_tree (1.1.3)
     awesome_print (1.2.0)
@@ -35,9 +36,18 @@ GEM
     docile (1.1.3)
     edn (1.0.2)
       parslet (~> 1.4.0)
+    elasticsearch (1.0.1)
+      elasticsearch-api (= 1.0.1)
+      elasticsearch-transport (= 1.0.1)
+    elasticsearch-api (1.0.1)
+      multi_json
+    elasticsearch-transport (1.0.1)
+      faraday
+      multi_json
     extlib (0.9.16)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.3)
     ffi (1.9.3-java)
     ffi-rzmq (1.0.0)
       ffi
@@ -52,11 +62,11 @@ GEM
     gelfd (0.2.0)
     geoip (1.3.5)
     gmetric (0.1.3)
-    haml (4.0.5)
-      tilt
+    hitimes (1.2.1)
     hitimes (1.2.1-java)
     http (0.5.0)
       http_parser.rb
+    http_parser.rb (0.5.3)
     http_parser.rb (0.5.3-java)
     i18n (0.6.9)
     insist (1.0.0)
@@ -66,6 +76,7 @@ GEM
     jruby-httpclient (1.1.1-java)
     jruby-openssl (0.8.7)
       bouncy-castle-java (>= 1.5.0147)
+    json (1.8.1)
     json (1.8.1-java)
     mail (2.5.3)
       i18n (>= 0.4.0)
@@ -87,16 +98,23 @@ GEM
     multi_json (1.8.4)
     multipart-post (2.0.0)
     murmurhash3 (0.1.4)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     nokogiri (1.6.1-java)
       mini_portile (~> 0.5.0)
     parslet (1.4.0)
       blankslate (~> 2.0)
     polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     pry (0.9.12.6-java)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
       spoon (~> 0.0)
+    rack (1.5.2)
     rbnacl (2.0.0)
       ffi
     redis (3.0.7)
@@ -114,7 +132,6 @@ GEM
       tzinfo (>= 0.3.22)
     rumbster (1.1.1)
       mail (= 2.5.3)
-    sass (3.2.14)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -138,9 +155,10 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.18.1)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     thread_safe (0.2.0-java)
       atomic (>= 1.1.7, < 2)
-    tilt (2.0.0)
     tins (1.0.0)
     treetop (1.4.15)
       polyglot
@@ -175,6 +193,7 @@ DEPENDENCIES
   clamp
   coveralls
   edn
+  elasticsearch
   extlib (= 0.9.16)
   ffi
   ffi-rzmq (= 1.0.0)
@@ -184,7 +203,6 @@ DEPENDENCIES
   gelfd (= 0.2.0)
   geoip (>= 1.3.2)
   gmetric (= 0.1.3)
-  haml
   i18n (>= 0.6.6)
   insist (= 1.0.0)
   jls-grok (= 0.10.12)
@@ -201,12 +219,12 @@ DEPENDENCIES
   msgpack-jruby
   murmurhash3
   pry
+  rack
   rbnacl
   redis
   rspec
   rufus-scheduler (~> 2.0.24)
   rumbster
-  sass
   shoulda
   snmp
   spoon