fluent-plugin-hipchat 0.1.0 → 0.1.1

data/README.rdoc

@@ -12,6 +12,8 @@
       default_room my_room
       default_from fluentd
       default_color yellow
+      default_notify 0
+      default_format html
     </match>
 
 
@@ -20,6 +22,8 @@
       :message  => 'Hello<br>World!',
       :color    => 'red',
       :room     => 'my_room',
+      :notify     => 1,
+      :format     => 'text',
     })
 
 = Copyright

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/fluent/plugin/out_hipchat.rb

@@ -1,13 +1,16 @@
 
 module Fluent
   class HipchatOutput < Output
-    COLORS = %w(yellow green purple random)
+    COLORS = %w(yellow red green purple gray random)
+    FORMAT = %w(html text)
     Fluent::Plugin.register_output('hipchat', self)
 
     config_param :api_token, :string
     config_param :default_room, :string, :default => nil
     config_param :default_color, :string, :default => nil
     config_param :default_from, :string, :default => nil
+    config_param :default_notify, :bool, :default => nil
+    config_param :default_format, :string, :default => nil
 
     attr_reader :hipchat
 
@@ -20,9 +23,11 @@ module Fluent
       super
 
       @hipchat = HipChat::API.new(conf['api_token'])
-      @default_from = conf['default_from'] || 'fluentd'
       @default_room = conf['default_room']
+      @default_from = conf['default_from'] || 'fluentd'
+      @default_notify = conf['default_notify'] || 0
       @default_color = conf['default_color'] || 'yellow'
+      @default_format = conf['default_format'] || 'html'
     end
 
     def emit(tag, es, chain)
@@ -39,9 +44,14 @@ module Fluent
       room = record['room'] || @default_room
       from = record['from'] || @default_from
       message = record['message'] || ''
-      notify = record['notify'] ? 1 : 0
+      if record['notify'].nil?
+        notify = @default_notify
+      else
+        notify = record['notify'] ? 1 : 0
+      end
       color = COLORS.include?(record['color']) ? record['color'] : @default_color
-      @hipchat.rooms_message(room, from, message, notify, color)
+      message_format = FORMAT.include?(record['format']) ? record['format'] : @default_format
+      @hipchat.rooms_message(room, from, message, notify, color, message_format)
     end
   end
 end

data/test/plugin/out_hipchat.rb

@@ -19,7 +19,6 @@ class HipchatOutputTest < Test::Unit::TestCase
   def setup
     super
     Fluent::Test.setup
-    # any_instance_of(HipChat::Client, :redis= => lambda {}, :redis => @subject)
   end
 
   CONFIG = %[
@@ -27,7 +26,7 @@ class HipchatOutputTest < Test::Unit::TestCase
     api_token testtoken
     default_room testroom
     default_from testuser
-    default_color red
+    default_color yellow
   ]
 
   def create_driver(conf = CONFIG)
@@ -41,7 +40,7 @@ class HipchatOutputTest < Test::Unit::TestCase
                       api_token xxx
                       default_room testroom
                       EOF
-    stub(d.instance.hipchat).rooms_message('testroom', 'fluentd', 'foo', 0, 'yellow')
+    stub(d.instance.hipchat).rooms_message('testroom', 'fluentd', 'foo', 0, 'yellow', 'html')
     assert_equal d.instance.hipchat.instance_variable_get(:@token), 'xxx'
     d.emit({'message' => 'foo'})
     d.run
@@ -49,15 +48,15 @@ class HipchatOutputTest < Test::Unit::TestCase
 
   def test_message
     d = create_driver
-    stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'red')
+    stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'red', 'html')
     assert_equal d.instance.hipchat.instance_variable_get(:@token), 'testtoken'
-    d.emit({'message' => 'foo'})
+    d.emit({'message' => 'foo', 'color' => 'red'})
     d.run
   end
 
   def test_message_override
     d = create_driver
-    stub(d.instance.hipchat).rooms_message('my', 'alice', 'aaa', 1, 'random')
+    stub(d.instance.hipchat).rooms_message('my', 'alice', 'aaa', 1, 'random', 'text')
     d.emit(
       {
         'room' => 'my',
@@ -65,6 +64,7 @@ class HipchatOutputTest < Test::Unit::TestCase
         'message' => 'aaa',
         'notify' => true,
         'color' => 'random',
+        'format' => 'text',
       }
     )
     d.run
@@ -72,7 +72,7 @@ class HipchatOutputTest < Test::Unit::TestCase
 
   def test_color_validate
     d = create_driver
-    stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'red')
+    stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'yellow', 'html')
     d.emit({'message' => 'foo', 'color' => 'invalid'})
     d.run
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-hipchat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2172265700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.10.8
   type: :runtime
   prerelease: false
-  version_requirements: *2172265700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.8
 - !ruby/object:Gem::Dependency
   name: hipchat-api
-  requirement: &2172265000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2172265000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2172264540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2172264540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2172280440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2172280440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2172279940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2172279940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2172279560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172279560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: fluent HipChat plugin
 email: hotchpotch@gmail.com
 executables: []
@@ -106,15 +136,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2040291530210343481
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2040291530210343481
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: fluent HipChat plugin