Merge remote-tracking branch 'logstash/master'

Rakefile

@@ -290,7 +290,7 @@ end
 
 task :docindex => [:require_output_env] do
   output = ENV["output"].gsub("VERSION", LOGSTASH_VERSION)
-  sh "ruby docs/generate_index.rb #{ENV["output"]} > #{output}/index.html"
+  sh "ruby docs/generate_index.rb #{output} > #{output}/index.html"
 end
 
 task :docgen => [:require_output_env] do

STYLE.md

@@ -55,7 +55,15 @@ Short example:
           # If it seems unreasonable, wrap and indent 4 spaces.
           some_really_long_function_call_blah_blah_blah(arg1,
               arg2, arg3, arg4)
+
+          case foo
+            when "bar"
+              puts "Hello world"
+            when /testing/
+              puts "testing
+            else
+              puts "I got nothin'"
+          end # case foo
             
         end # def somefunc
       end # class Foo
-

lib/logstash/outputs/stdout.rb

@@ -36,12 +36,12 @@ class LogStash::Outputs::Stdout < LogStash::Outputs::Base
 
     if @debug
       case @debug_format.first
-      when "ruby":
-        @print_method.call(event.to_hash)
-      when "json":
-        puts event.to_json
-      else
-        raise "unknown debug_format #{@debug_format}, this should never happen"
+        when "ruby"
+          @print_method.call(event.to_hash)
+        when "json"
+          puts event.to_json
+        else
+          raise "unknown debug_format #{@debug_format}, this should never happen"
       end
     else
       puts event.to_s