fluent-plugin-nats 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -3,6 +3,9 @@ fluent-plugin-nats
 
 NATS plugin for fluent Event Collector
 
+[![Build Status](https://secure.travis-ci.org/achied/fluent-plugin-nats.png)](http://travis-ci.org/achied/fluent-plugin-nats)
+
+
 # Getting Started
 Setup the NATS input:
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/fluent/plugin/in_nats.rb

@@ -19,6 +19,7 @@ module Fluent
     def configure(conf)
       super
       @conf = conf
+      @uri = "nats://#{user}:#{password}@#{host}:#{port}"
       unless @host && @queue
         raise ConfigError, "'host' and 'queue' must be all specified."
       end
@@ -26,7 +27,7 @@ module Fluent
 
     def start
       super
-      $log.info "listening nats on nats://#{host}:#{port}/#{queue}"
+      $log.info "listening nats on #{@uri}/#{@queue}"
       @thread = Thread.new(&method(:run))
     end
 
@@ -37,7 +38,7 @@ module Fluent
     end
 
     def run
-      NATS.start {
+      NATS.start(:uri => @uri) {
         NATS.subscribe(@queue) do |msg, reply, sub|
           Engine.emit(sub, 0, msg)
         end

data/test/plugin/in_nats.rb

@@ -2,8 +2,10 @@ require 'test/unit'
 require 'fluent/test'
 require 'lib/fluent/plugin/in_nats'
 require 'nats/client'
+require 'test_helper'
 
 class NATSInputTest < Test::Unit::TestCase
+  include NATSTestHelper
 
   CONFIG = %[
     port 4222
@@ -13,10 +15,11 @@ class NATSInputTest < Test::Unit::TestCase
     queue fluent.>
   ]
 
+  
   def create_driver(conf=CONFIG)
     Fluent::Test::InputTestDriver.new(Fluent::NATSInput).configure(conf)
   end
-
+  
   def test_configure
     d = create_driver
     assert_equal 4222, d.instance.port
@@ -26,7 +29,7 @@ class NATSInputTest < Test::Unit::TestCase
     assert_equal 'fluent.>', d.instance.queue
   end
 
-  def test_emit
+  def test_emit_with_credentials
     d = create_driver
 
     time = Time.parse("2011-01-02 13:14:15 UTC").to_i
@@ -35,21 +38,47 @@ class NATSInputTest < Test::Unit::TestCase
     d.expect_emit "fluent.test1", 0, {"message"=>'nats'}.to_json
     d.expect_emit "fluent.test2", 0, {"message"=>'nats'}.to_json
 
+    uri = "nats://#{d.instance.user}:#{d.instance.password}@#{d.instance.host}:#{d.instance.port}"
+
+    start_nats(uri)
     d.run do
       d.expected_emits.each { |tag, time, record|
-        send(tag, record)
+        send(uri, tag, record)
         sleep 0.5
       }
     end
+    kill_nats
   end
 
+  def test_emit_without_credentials
+    d = create_driver
+
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    Fluent::Engine.now = time
+
+    d.expect_emit "fluent.test1", 0, {"message"=>'nats'}.to_json
+    d.expect_emit "fluent.test2", 0, {"message"=>'nats'}.to_json
+
+    uri = "nats://#{d.instance.host}:#{d.instance.port}"
+
+    start_nats(uri)
+    d.run do
+      d.expected_emits.each { |tag, time, record|
+        send(uri, tag, record)
+        sleep 0.5
+      }
+    end
+    kill_nats
+  end
+
+
   def setup
     Fluent::Test.setup
   end
 
-  def send(tag, msg)
+  def send(uri, tag, msg)
     EM.run {
-      n = NATS.connect 
+      n = NATS.connect(:uri => uri) 
       n.publish(tag,msg) 
       n.close
     }

data/test/test_helper.rb

@@ -22,7 +22,50 @@ unless ENV.has_key?('VERBOSE')
   $log = nulllogger
 end
 
-require 'fluent/plugin/in_nats'
-
 class Test::Unit::TestCase
 end
+
+require 'nats/client'
+
+module NATSTestHelper
+
+  def server_pid
+    @pid ||= File.read(@pid_file).chomp.to_i
+  end 
+
+  def setup_nats_server(uri)
+    @uri = URI.parse(uri)
+    @pid_file = '/tmp/test-nats.pid'
+    args = "-p #{@uri.port} -P #{@pid_file}"
+    args += " --user #{@uri.user}" unless (@uri.user.nil? || @uri.user.empty?)
+    args += " --pass #{@uri.password}" unless (@uri.password.nil? || @uri.password.empty?)
+    args += " #{@flags}" if @flags
+    args += ' -d'
+  end
+
+  def kill_nats
+    if File.exists? @pid_file
+      %x[kill -9 #{server_pid} 2> /dev/null]
+      %x[rm #{@pid_file} 2> /dev/null]
+      %x[rm #{NATS::AUTOSTART_LOG_FILE} 2> /dev/null]
+      @pid = nil
+    end
+  end
+  
+  def start_nats(uri)
+    
+    args = setup_nats_server(uri)
+
+    if NATS.server_running? @uri
+      @was_running = true
+      return 0
+    end
+
+    %x[bundle exec nats-server #{args} 2> /dev/null]
+    exitstatus = $?.exitstatus
+    NATS.wait_for_server(@uri, 10)
+    exitstatus
+  end
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-nats
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -83,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - COPYING
 - Gemfile
 - Gemfile.lock