fluent-plugin-github-activities 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6ee8ed9280b6965e10bd6ebf3248aba5a945de
-  data.tar.gz: 58e9f85025bcab3c4094203eb8ebca1133faed30
+  metadata.gz: 8d4c4dfb2ff1abe4ead0899ef10dab5b644a429f
+  data.tar.gz: 060eaa62c186efa222dda29b0019d1f3f97ef540
 SHA512:
-  metadata.gz: 3a357bc0e21a4eda4069a8eee4df00e7fe7508de55cd51f9251e529d3d54ef27d3e7613d87e6ce8069afb19d2200aee458914038a9a41dc845d32541758290b7
-  data.tar.gz: 0177ef399a2d19968e3628c6ad3686c2e2f1e99a581be729521c85977ca1e609136c8b5742c0bab43d985a8f984be122749fe05d31d55df6a7c9d45d1861b175
+  metadata.gz: 7095098c73a21c38afa298242141904a7c966c80d69d43b13e8bada9745c1b76c43d073c0a3865da93321022d1c581cbc6466afb1924aa2492671043c9f29d68
+  data.tar.gz: b82126b18196b60649ea97ef57acafcba9329f469b750f57cce594efa8d358d1ad6707a3cb639301c5e1c040b45e59e472c7276c0a7411958e97845bf40de60a

data/README.md

@@ -1,5 +1,8 @@
 # fluent-plugin-github-activities
 
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-github-activities.svg)](https://badge.fury.io/rb/fluent-plugin-github-activities)
+[![Build Status](https://travis-ci.org/clear-code/fluent-plugin-github-activities.svg?branch=master)](https://travis-ci.org/clear-code/fluent-plugin-github-activities)
+
 Provides ability to watch public activities on GitHub.
 This crawls GitHub activities of specified users and forward each activity as a record.
 
@@ -80,7 +83,7 @@ Then the value of the `token` field is the access key to be written to the confi
 
 ~~~
 <source>
-  type github-activities
+  @type github-activities
 
   # Access token for this instance. See also the previous section.
   access_token access-token-for-this-instance

data/fluent-plugin-github-activities.gemspec

@@ -19,13 +19,13 @@
 
 Gem::Specification.new do |spec|
   spec.name = "fluent-plugin-github-activities"
-  spec.version = "0.5.0"
+  spec.version = "0.6.0"
   spec.authors = ["YUKI Hiroshi"]
   spec.email = ["yuki@clear-code.com"]
   spec.summary = "Fluentd plugin to crawl public activities on the GitHub."
   spec.description = "This provides ability to crawl public " +
                        "activities of users."
-  spec.homepage = "https://github.com/groonga/fluent-plugin-groonga"
+  spec.homepage = "https://github.com/clear-code/fluent-plugin-github-activities"
   spec.license = "LGPL-3.0"
 
   spec.files = ["README.md", "Gemfile", "#{spec.name}.gemspec"]
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.test_files += Dir.glob("test/**/*")
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency("fluentd")
+  spec.add_runtime_dependency("fluentd", [">= 0.12.0", "< 0.14.0"])
 
   spec.add_development_dependency("rake")
   spec.add_development_dependency("bundler")

data/lib/fluent/plugin/github-activities/crawler.rb

@@ -214,7 +214,7 @@ module Fluent
           if push_event["org"]
             commit[RELATED_ORGANIZATION_IMAGE_KEY] = push_event["org"]["avatar_url"]
           end
-          commit[RELATED_EVENT] = push_event
+          commit[RELATED_EVENT] = push_event.reject {|k, _| k == "payload" }
           emit("commit", commit)
         end
 

data/lib/fluent/plugin/github-activities/users_manager.rb

@@ -55,7 +55,7 @@ module Fluent
                                             options[:previous_entity_tag]
           request[:process_after] = time_to_process
         else
-          request[:previous_entity_tag] = options[:previous_entity_tag]
+          request[:previous_entity_tag] = options[:previous_entity_tag] if options.key?(:previous_entity_tag)
         end
         request
       end

data/lib/fluent/plugin/in_github-activities.rb

@@ -24,7 +24,7 @@ module Fluent
 
     Plugin.register_input("github-activities", self)
 
-    config_param :access_token, :string, :default => nil
+    config_param :access_token, :string, :default => nil, :secret => true
     config_param :users, :string, :default => nil
     config_param :users_list, :string, :default => nil
     config_param :include_commits_from_pull_request, :bool, :default => false
@@ -74,7 +74,7 @@ module Fluent
           }
           crawler = ::Fluent::GithubActivities::Crawler.new(crawler_options)
           crawler.on_emit = lambda do |tag, record|
-            Engine.emit("#{@base_tag}.#{tag}", Engine.now, record)
+            router.emit("#{@base_tag}.#{tag}", Engine.now, record)
           end
 
           loop do

data/test/test_crawler.rb

@@ -44,6 +44,14 @@ class CrawlerTest < Test::Unit::TestCase
   end
 
   def fill_extra_fields(event, parent_event=nil)
+    if parent_event and parent_event["type"] == "PushEvent"
+      push_event = fill_extra_fields(parent_event)
+      push_event = push_event.reject {|k, _| k == "payload" }
+      event = event.merge(
+        "$github-activities-related-event" => push_event
+      )
+    end
+
     parent_event ||= event
 
     event = event.merge(
@@ -207,24 +215,24 @@ class CrawlerTest < Test::Unit::TestCase
       expected = {
         :request_queue => [
           { :type => ::Fluent::GithubActivities::TYPE_COMMIT,
-            :uri  => "#{base}/8e90721ff5d89f52b5b3adf0b86db01f03dc5588",
-            :sha  => "8e90721ff5d89f52b5b3adf0b86db01f03dc5588",
+            :uri  => "#{base}/c908f319c7b6d5c5a69c8b675bde40dd990ee364",
+            :sha  => "c908f319c7b6d5c5a69c8b675bde40dd990ee364",
             :push => expected_push },
           { :type => ::Fluent::GithubActivities::TYPE_COMMIT,
-            :uri  => "#{base}/63e085b7607a3043cfbf9a866561807fbdda8a10",
-            :sha  => "63e085b7607a3043cfbf9a866561807fbdda8a10",
+            :uri  => "#{base}/8ce6de7582376187e17e233dbae13575311a8c0b",
+            :sha  => "8ce6de7582376187e17e233dbae13575311a8c0b",
             :push => expected_push },
           { :type => ::Fluent::GithubActivities::TYPE_COMMIT,
             :uri  => "#{base}/c85e33bace040b7b42983e14d2b11a491d102072",
             :sha  => "c85e33bace040b7b42983e14d2b11a491d102072",
             :push => expected_push },
           { :type => ::Fluent::GithubActivities::TYPE_COMMIT,
-            :uri  => "#{base}/8ce6de7582376187e17e233dbae13575311a8c0b",
-            :sha  => "8ce6de7582376187e17e233dbae13575311a8c0b",
+            :uri  => "#{base}/63e085b7607a3043cfbf9a866561807fbdda8a10",
+            :sha  => "63e085b7607a3043cfbf9a866561807fbdda8a10",
             :push => expected_push },
           { :type => ::Fluent::GithubActivities::TYPE_COMMIT,
-            :uri  => "#{base}/c908f319c7b6d5c5a69c8b675bde40dd990ee364",
-            :sha  => "c908f319c7b6d5c5a69c8b675bde40dd990ee364",
+            :uri  => "#{base}/8e90721ff5d89f52b5b3adf0b86db01f03dc5588",
+            :sha  => "8e90721ff5d89f52b5b3adf0b86db01f03dc5588",
             :push => expected_push },
         ],
         :emitted_records => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-github-activities
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - YUKI Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +131,7 @@ files:
 - test/fixture/push-event.json
 - test/run-test.rb
 - test/test_crawler.rb
-homepage: https://github.com/groonga/fluent-plugin-groonga
+homepage: https://github.com/clear-code/fluent-plugin-github-activities
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -145,25 +151,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to crawl public activities on the GitHub.
 test_files:
-- test/test_crawler.rb
-- test/fixture.rb
-- test/run-test.rb
+- test/fixture/commit-comment-event.json
+- test/fixture/pull-request-comment-event.json
 - test/fixture/pull-request-event.json
+- test/fixture/line-note-event.json
+- test/fixture/pull-request-accepted-event.json
+- test/fixture/issue-comment-event.json
+- test/fixture/commit.json
 - test/fixture/push-event-multiple-commits.json
+- test/fixture/branch-event.json
 - test/fixture/push-event.json
-- test/fixture/issue-comment-event.json
 - test/fixture/fork-event.json
-- test/fixture/line-note-event.json
-- test/fixture/commit-comment-event.json
-- test/fixture/branch-event.json
-- test/fixture/accept-pull-request-event.json
 - test/fixture/issues-event.json
-- test/fixture/commit.json
-- test/fixture/pull-request-comment-event.json
-- test/fixture/pull-request-accepted-event.json
-has_rdoc: 
+- test/fixture/accept-pull-request-event.json
+- test/run-test.rb
+- test/fixture.rb
+- test/test_crawler.rb