fluent-plugin-gcloud-pubsub-custom 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d5b921e5457be93cc2d3c8876bd11aae90e41b
-  data.tar.gz: f74e1e5ab85e31ee5090cc84ac6926136ad8eb8f
+  metadata.gz: 702ae45ef8246c99127824b67457c6bf2b8a7e15
+  data.tar.gz: 094ed9fbc03b448390e123328a835e6898c97e97
 SHA512:
-  metadata.gz: 553e885ee97a831dffa3441e999865ff039e41e30803e2e0ec29ed7db71ffc178481a38c2dceaa86f965a2f1a484f539c2b671e8c74f842ec27cc7ef2c628bc1
-  data.tar.gz: 39066e1bbca376d1c128dc2f6fa30de54d20fa7ee3b7b1eb795df6054d7f4f041877cd26e47a3043a03df411aecbdd90eee028e24a73491150f79d514675c497
+  metadata.gz: dc1f80d983a3cf20a3205778f0b97ad97a5c866f51f504daeaa7ef70952648d0cf3b20fd6270de4c576f49c2148bd83671c645adc5d3c4dc52c43fb0f8ca76cb
+  data.tar.gz: 6bd444101d59692f9f064fcbe518ac0c5483c47e860ec890e4625d0cb0b7848c3cd7911391a0e1273d1760129cd84cb962bfb4a80f4776a01e68f181c0c19b29

data/README.md

@@ -118,6 +118,8 @@ Use `gcloud_pubsub` input plugin.
 
 ## ChangeLog
 
+- Release 0.1.1 - 2016/08/27
+  - Bump up google-cloud-pubsub (gcloud-ruby) to 0.20
 - Release 0.1.0 - 2016/08/22
   - Use formatter / parser plugin and add format configuration
   - Bump up gcloud-ruby to 0.12

data/fluent-plugin-gcloud-pubsub-custom.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.homepage    = "https://github.com/mia-0032/fluent-plugin-gcloud-pubsub-custom"
   gem.summary     = gem.description
-  gem.version     = "0.1.0"
+  gem.version     = "0.1.1"
   gem.authors     = ["Yoshihiro MIYAI"]
   gem.email       = "msparrow17@gmail.com"
   gem.has_rdoc    = false
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency "fluentd", [">= 0.10.58", "< 2"]
-  gem.add_runtime_dependency "gcloud", "~> 0.12"
+  gem.add_runtime_dependency "google-cloud-pubsub", "~> 0.20.0"
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"

data/lib/fluent/plugin/gcloud_pubsub/client.rb

@@ -1,4 +1,4 @@
-require 'gcloud'
+require 'google/cloud'
 
 module Fluent
   module GcloudPubSub
@@ -6,7 +6,7 @@ module Fluent
 
     class Publisher
       def initialize(project, key, topic, autocreate_topic)
-        pubsub = (Gcloud.new project, key).pubsub
+        pubsub = (Google::Cloud.new project, key).pubsub
 
         @client = pubsub.topic topic, autocreate: autocreate_topic
         raise Fluent::GcloudPubSub::Error.new "topic:#{topic} does not exist." if @client.nil?
@@ -23,8 +23,9 @@ module Fluent
 
     class Subscriber
       def initialize(project, key, topic, subscription)
-        pubsub = (Gcloud.new project, key).pubsub
-        @client = pubsub.subscription subscription
+        pubsub = (Google::Cloud.new project, key).pubsub
+        topic = pubsub.topic topic
+        @client = topic.subscription subscription
         raise Fluent::GcloudPubSub::Error.new "subscription:#{subscription} does not exist." if @client.nil?
       end
 

data/lib/fluent/plugin/in_gcloud_pubsub.rb

@@ -82,7 +82,7 @@ module Fluent
     end
 
     def convert_line_to_event(line, es)
-      line.chomp!  # remove \n
+      line = line.chomp  # remove \n
       @parser.parse(line) { |time, record|
         if time && record
           es.add(time, record)

data/test/plugin/test_out_gcloud_pubsub.rb

@@ -59,7 +59,7 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
       @publisher = mock!
       @pubsub_mock = mock!
       @gcloud_mock = mock!.pubsub { @pubsub_mock }
-      stub(Gcloud).new { @gcloud_mock }
+      stub(Google::Cloud).new { @gcloud_mock }
     end
 
     test '"autocreate_topic" is enabled' do
@@ -80,7 +80,7 @@ class GcloudPubSubOutputTest < Test::Unit::TestCase
       @publisher = mock!
       @pubsub_mock = mock!.topic(anything, anything) { @publisher }
       @gcloud_mock = mock!.pubsub { @pubsub_mock }
-      stub(Gcloud).new { @gcloud_mock }
+      stub(Google::Cloud).new { @gcloud_mock }
     end
 
     setup do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-pubsub-custom
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yoshihiro MIYAI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: gcloud
+  name: google-cloud-pubsub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement