fluent-plugin-redmine 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1717557dfbb5ad9bba62595e3bf2d8dc092fd9fb
-  data.tar.gz: 2a32bff9984acb4aac564396269453f8555b16d5
+  metadata.gz: 81811a6cf328c34cf36502e0fd6fdf9dabe81dba
+  data.tar.gz: 7b91b3e6f40bac9d4e87cf5bb68e6a82069e69d6
 SHA512:
-  metadata.gz: d0d3d6d2e72d252ef8386bc7ce2e485e8a8a4607de562b3cd188a7cf986f45c81f0ed550cab940dd6e0e7aa4380544e63052f77a6bc5cb474a4fc004b20cc339
-  data.tar.gz: bf1429ce7cdbc9fa766e323088716198e09f853223152436554a6ebcdf6eada8ff8151fd5cf47a3fd129acea0196a1f5e28d6d70bdb797222e5e0a5292c31a03
+  metadata.gz: a837b3521dca8933dbaa97bc279f82978a061a9686afd00160cc9bad4c1fc3350b33216c94515957e505f652c755d93b7d37a412856801a77a54f09bc88a43fb
+  data.tar.gz: dc7bd64a75d82b492a103c258a5b8e47c8def9276eba2a7becd15bd7e80c067012af32ca58bfaf3057099fdafaf086c93ceaceb466a738cfcd97dba60656da95

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.6.1"
+  spec.version       = "0.7.0"
   spec.authors       = ["Takuma kanari"]
   spec.email         = ["chemtrails.t@gmail.com"]
   spec.summary       = %q{Fluentd output plugin to create ticket in redmine}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "fluentd", [">= 0.12", "< 2"]
+  spec.add_runtime_dependency "fluentd", [">= 0.14", "< 2"]
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "test-unit"

data/lib/fluent/plugin/out_redmine.rb

@@ -1,6 +1,9 @@
-module Fluent
+require "json"
+require "net/http"
 
-  class RedmineOutput < BufferedOutput
+module Fluent::Plugin
+
+  class RedmineOutput < Fluent::Plugin::Output
     Fluent::Plugin.register_output('redmine', self)
 
     desc "Redmine url"
@@ -45,21 +48,15 @@ module Fluent
     desc "Key name in the record for Redmine custom fields"
     config_param :custom_fields_key, :string, default: nil
 
-    def initialize
-      super
-      require "json"
+    config_section :buffer do
+      config_set_default :@type, :memory
+      config_set_default :chunk_keys, ["tag"]
     end
 
     def configure(conf)
       super
 
-      @use_ssl = (@url =~ /^https:/) ? true : false
-
-      if @use_ssl
-        require "net/https"
-      else
-        require "net/http"
-      end
+      @use_ssl = @url.start_with?("https:")
 
       @subject_expander = TemplateExpander.new(@subject)
       @description_expander = TemplateExpander.new(@description)
@@ -71,12 +68,9 @@ module Fluent
       }
     end
 
-    def format(tag, time, record)
-      [tag, time, record].to_msgpack
-    end
-
     def write(chunk)
-      chunk.msgpack_each do |tag, time, record|
+      tag = chunk.metadata.tag
+      chunk.each do |_time, record|
         subject = @subject_expander.bind(make_record(tag, record))
         desc = @description_expander.bind(make_record(tag, record))
         begin
@@ -91,7 +85,7 @@ module Fluent
     def submit_ticket(subject, desc, record)
       request = Net::HTTP::Post.new(
         @redmine_uri.request_uri,
-        initheader = @redmine_request_header
+        @redmine_request_header
       )
       request.body = JSON.generate(make_payload(subject, desc, record))
 
@@ -107,7 +101,7 @@ module Fluent
       client.start do |http|
         res = http.request(request)
         unless res.code.to_i == 201
-          raise Exception.new("Error: #{res.code}, #{res.body}")
+          raise Error, "Error: #{res.code}, #{res.body}"
         end
         return res.body
       end
@@ -162,6 +156,7 @@ module Fluent
       end
     end
 
+    class Error < StandardError
+    end
   end
-
 end

data/test/helper.rb

@@ -1,28 +1,12 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require "bundler/setup"
 require 'test/unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
-
+require 'fluent/test/helpers'
+require 'fluent/test/driver/output'
 require 'fluent/plugin/out_redmine'
 
-class Test::Unit::TestCase
-end
+Test::Unit::TestCase.include(Fluent::Test::Helpers)
+Test::Unit::TestCase.extend(Fluent::Test::Helpers)

data/test/plugin/test_out_redmine.rb

@@ -121,7 +121,7 @@ class RedmineOutputTest < Test::Unit::TestCase
 
     cv = ConditionVariable.new
 
-    watcher = Thread.new {
+    Thread.new {
       connected = false
       while not connected
         begin
@@ -148,8 +148,8 @@ class RedmineOutputTest < Test::Unit::TestCase
     @dummy_redmine.join
   end
 
-  def create_driver(conf=CONFIG_OUT_KEYS,tag='test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::RedmineOutput, tag).configure(conf)
+  def create_driver(conf=CONFIG_OUT_KEYS)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::RedmineOutput).configure(conf)
   end
 
   def test_configure_http
@@ -277,16 +277,15 @@ CONFIG
     assert_false ret[:issue].key?(:custom_fields)
   end
 
-  def test_emit
+  def test_feed
     d = create_driver(CONFIG_TO_FORMAT)
     record = {
       "name" => "John",
       "age" => 25,
       "message" => "this is message!"
     }
-    t = Time.now
-    d.run do
-      d.emit(record, t.to_i)
+    d.run(default_tag: "test") do
+      d.feed(record)
     end
 
     assert_equal @tickets.size, 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redmine
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Takuma kanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.14'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'