fluent-plugin-redmine 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f77ef53478fee9950fbedc082a10353074adaad
+  data.tar.gz: 6784a5a16fe6e4b162685d9a7818092e4df1b341
+SHA512:
+  metadata.gz: aefae1cb9d67bf18217fb403a39c707d155fd6b2ef97ab080ed99f9668c8377421129cf0cc1bc77800341de5e1fefbf0d90f798a20a0263573e0493f84c2d47a
+  data.tar.gz: c202eb134d98db49bcff5b54f2870931ca1ec3bfea446193fa107e7464762db646cbaeddf36c3e0fcd599dc37fb6ddb79da359b7c75d76d1fba8169d877bb8a3

data/README.md

@@ -36,10 +36,13 @@ Here is example settings:
 
 and here is optional configuration:
 
-    project_id  myproject # projectId of redmine
-    category_id 70        # categoryId of tickets
-    tag_key my_ tag       # 'tag' is used by default
-    debug_http  true      # set debug_http=true of Net::HTTP module, false is used by default
+    project_id  myproject              # projectId of redmine
+    category_id 70                     # categoryId of tickets
+    project_id_key key_of_priority_id  # value in record for priorityId
+    category_id_key key_of_category_id # value in record for categoryId
+    tag_key my_ tag                    # 'tag' is used by default
+    debug_http  true                   # set debug_http=true of Net::HTTP module, false is used by default
+
 
 ### placeholders
 

data/fluent-plugin-redmine.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-redmine"
-  spec.version       = "0.4.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["Takuma kanari"]
   spec.email         = ["chemtrails.t@gmail.com"]
   spec.summary       = %q{Output filter plugin to create ticket in redmine}

data/lib/fluent/plugin/out_redmine.rb

@@ -1,6 +1,6 @@
 module Fluent
 
-  class RedmineOutput < Output
+  class RedmineOutput < BufferedOutput
     Fluent::Plugin.register_output('redmine', self)
 
     # Define `log` method for v0.10.42 or earlier
@@ -55,17 +55,21 @@ module Fluent
       }
     end
 
-    def emit(tag, es, chain)
-      es.each do |time, record|
+    def format(tag, time, record)
+      [tag, time, record].to_msgpack
+    end
+
+    def write(chunk)
+      chunk.msgpack_each do |tag, time, record|
         subject = @subject_expander.bind(make_record(tag, record))
         desc = @description_expander.bind(make_record(tag, record))
         begin
           submit_ticket(subject, desc, record)
         rescue => e
-          log.warn "out_redmine: failed to create ticket to #{@redmine_uri}, subject: #{subject}, description: #{desc}, error_class: #{e.class}, error_message: #{e.message}, error_backtrace: #{e.backtrace.first}"
+          log.error "out_redmine: failed to create ticket to #{@redmine_uri}, subject: #{subject}, description: #{desc}, error_class: #{e.class}, error_message: #{e.message}, error_backtrace: #{e.backtrace.first}"
+          raise e
         end
       end
-      chain.next
     end
 
     def submit_ticket(subject, desc, record)

data/test/plugin/test_out_redmine.rb

@@ -16,6 +16,22 @@ class RedmineOutputTest < Test::Unit::TestCase
     project_id 1
     tracker_id 2
     priority_id 3
+    category_id 4
+    subject awesome
+    description this is description %{d1} - %{d2} - %{d3}
+  ]
+
+  CONFIG_WITH_PROPERTY_ALIAS_KEYS = %[
+    type redmine
+    url http://localhost:4000
+    api_key test-api-key
+    tag_key test
+    project_id 1
+    tracker_id 2
+    priority_id 3
+    category_id 4
+    priority_id_key key_of_priority_id
+    category_id_key key_of_category_id
     subject awesome
     description this is description %{d1} - %{d2} - %{d3}
   ]
@@ -121,8 +137,18 @@ class RedmineOutputTest < Test::Unit::TestCase
     assert_equal "1", p.project_id
     assert_equal 2, p.tracker_id
     assert_equal 3, p.priority_id
+    assert_equal 4, p.category_id
     assert_equal "awesome", p.subject
     assert_equal "this is description %{d1} - %{d2} - %{d3}", p.description
+    assert_nil p.priority_id_key
+    assert_nil p.category_id_key
+  end
+
+  def test_configure_property_alias_keys
+    p = nil
+    assert_nothing_raised { p = create_driver(CONFIG_WITH_PROPERTY_ALIAS_KEYS).instance }
+    assert_equal "key_of_priority_id", p.priority_id_key
+    assert_equal "key_of_category_id", p.category_id_key
   end
 
   def test_configure_https
@@ -163,7 +189,12 @@ CONFIG
 
   def test_make_payload
     p = create_driver(CONFIG_DEFAULT).instance
-    ret = p.make_payload("subject", "description")
+    record = {
+      "name" => "John",
+      "age" => 25,
+      "message" => "this is message!"
+    }
+    ret = p.make_payload("subject", "description", record)
     assert_equal "subject", ret[:issue][:subject]
     assert_equal "description", ret[:issue][:description]
     assert_equal p.project_id, ret[:issue][:project_id]
@@ -171,6 +202,24 @@ CONFIG
     assert_equal p.priority_id, ret[:issue][:priority_id]
   end
 
+  def test_make_payload_with_alias_keys
+    p = create_driver(CONFIG_WITH_PROPERTY_ALIAS_KEYS).instance
+    record = {
+      "key_of_priority_id" => "123",
+      "key_of_category_id" => "456"
+    }
+    ret = p.make_payload("subject", "description", record)
+    assert_equal 123, ret[:issue][:priority_id]
+    assert_equal 456, ret[:issue][:category_id]
+  end
+
+  def test_make_payload_with_alias_keys_use_default_ids
+    p = create_driver(CONFIG_WITH_PROPERTY_ALIAS_KEYS).instance
+    ret = p.make_payload("subject", "description", {})
+    assert_equal 3, ret[:issue][:priority_id]
+    assert_equal 4, ret[:issue][:category_id]
+  end
+
   def test_emit
     d = create_driver(CONFIG_TO_FORMAT)
     record = {

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redmine
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Takuma kanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Output filter plugin to create ticket in redmine
@@ -50,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,27 +56,26 @@ files:
 - test/plugin/test_out_redmine.rb
 homepage: https://github.com/takumakanari
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-redmine
-rubygems_version: 1.8.23
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Output filter plugin to create ticket in redmine
 test_files:
 - test/helper.rb