RubyGems - fluent-plugin-docker_metadata_filter - Versions diffs - 0.1.0 → 0.1.1 - Mend

fluent-plugin-docker_metadata_filter 0.1.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/README.md +1 -1
data/Rakefile +1 -0
data/fluent-plugin-docker_metadata_filter.gemspec +3 -2
data/test/cassettes/nonexistent_docker_metadata.yml +115 -0
data/test/helper.rb +9 -24
data/test/plugin/test_filter_docker_metadata.rb +11 -3
metadata +17 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d52408bfaa987e90dd6c2580d1fde98dc475dcb
-  data.tar.gz: 2239ccbf754b937d14c7b2441a768ace87b0ec55
+  metadata.gz: 5e3a181437b2dba81ddb5695afa2ff08a398fa4d
+  data.tar.gz: 200420bd81fde33e9db8d065c3d311ad1d08c366
 SHA512:
-  metadata.gz: 5238ebd8328d7c48e26fdffcb2c30da1a02be7bacdc1d07fd622612cc9ec886893ea78f63c258f33a583de5c35490c4819d2f752d4b9ac8a67ebdd22e94c8100
-  data.tar.gz: 9e7c04cb9587d00eefa67385830471a0e217e4b61b937c865e5bccc64d5240ed2d733f15afc751a29755dce4aba7f6fd859c4079372f0573f336ed311c757a49
+  metadata.gz: 48a43e9af6ea3d21bb99b4916f579da1a816c3d4f36f4be713b37dc0b4ca50c0877ae25bf2231914e520d9bd75e38d970768ffb39dc511a50cf31813c3d9ce24
+  data.tar.gz: f13a36c14e7963b0372a47846b7e97f72528d6954c11a51af9f7c2b87781c69b367443beb8aee7d17e3be7d304fbdb3d67e30f381967e250e5418d8cb3f4fc45

data/README.md CHANGED Viewed

@@ -1,5 +1,5 @@
 # fluent-plugin-docker_metadata_filter, a plugin for [Fluentd](http://fluentd.org)
-[![Circle CI](https://circleci.com/gh/fabric8io/fluent-plugin-docker_metadata_filter?style=svg)](https://circleci.com/gh/fabric8io/fluent-plugin-docker_metadata_filter)
+[![Circle CI](https://circleci.com/gh/fabric8io/fluent-plugin-docker_metadata_filter.svg?style=svg)](https://circleci.com/gh/fabric8io/fluent-plugin-docker_metadata_filter)
 [![Code Climate](https://codeclimate.com/github/fabric8io/fluent-plugin-docker_metadata_filter/badges/gpa.svg)](https://codeclimate.com/github/fabric8io/fluent-plugin-docker_metadata_filter)
 [![Test Coverage](https://codeclimate.com/github/fabric8io/fluent-plugin-docker_metadata_filter/badges/coverage.svg)](https://codeclimate.com/github/fabric8io/fluent-plugin-docker_metadata_filter)

data/Rakefile CHANGED Viewed

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "bump/tasks"
 task :test => [:base_test]

data/fluent-plugin-docker_metadata_filter.gemspec CHANGED Viewed

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-docker_metadata_filter"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Docker metadata}
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.has_rdoc = false
+  gem.has_rdoc      = false
   gem.required_ruby_version = '>= 1.9.3'
@@ -32,4 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "copyright-header"
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "vcr"
+  gem.add_development_dependency "bump"
 end

data/test/cassettes/nonexistent_docker_metadata.yml ADDED Viewed

@@ -0,0 +1,115 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://unix/v1.16/containers/1111111111111111111111111111111111111111111111111111111111111111/json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 404
+      message: ''
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Date:
+      - Thu, 07 May 2015 14:37:37 GMT
+      Content-Length:
+      - '77'
+    body:
+      encoding: UTF-8
+      string: |
+        no such id: 1111111111111111111111111111111111111111111111111111111111111111
+    http_version:
+  recorded_at: Thu, 07 May 2015 14:37:37 GMT
+- request:
+    method: get
+    uri: http://unix/v1.16/containers/1111111111111111111111111111111111111111111111111111111111111111/json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 404
+      message: ''
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Date:
+      - Thu, 07 May 2015 14:37:37 GMT
+      Content-Length:
+      - '77'
+    body:
+      encoding: UTF-8
+      string: |
+        no such id: 1111111111111111111111111111111111111111111111111111111111111111
+    http_version:
+  recorded_at: Thu, 07 May 2015 14:37:37 GMT
+- request:
+    method: get
+    uri: http://unix/v1.16/containers/1111111111111111111111111111111111111111111111111111111111111111/json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 404
+      message: ''
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Date:
+      - Thu, 07 May 2015 14:37:37 GMT
+      Content-Length:
+      - '77'
+    body:
+      encoding: UTF-8
+      string: |
+        no such id: 1111111111111111111111111111111111111111111111111111111111111111
+    http_version:
+  recorded_at: Thu, 07 May 2015 14:37:37 GMT
+- request:
+    method: get
+    uri: http://unix/v1.16/containers/1111111111111111111111111111111111111111111111111111111111111111/json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Swipely/Docker-API 1.21.4
+      Content-Type:
+      - text/plain
+  response:
+    status:
+      code: 404
+      message: ''
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Date:
+      - Thu, 07 May 2015 14:37:37 GMT
+      Content-Length:
+      - '77'
+    body:
+      encoding: UTF-8
+      string: |
+        no such id: 1111111111111111111111111111111111111111111111111111111111111111
+    http_version:
+  recorded_at: Thu, 07 May 2015 14:37:37 GMT
+recorded_with: VCR 2.9.3

data/test/helper.rb CHANGED Viewed

@@ -16,29 +16,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# simplecov must be loaded before any of target code
-if ENV['SIMPLE_COV']
-  require 'simplecov'
-  if defined?(SimpleCov::SourceFile)
-    mod = SimpleCov::SourceFile
-    def mod.new(*args, &block)
-      m = allocate
-      m.instance_eval do
-        begin
-          initialize(*args, &block)
-        rescue Encoding::UndefinedConversionError
-          @src = "".force_encoding('UTF-8')
-        end
-      end
-      m
-    end
-  end
-  unless SimpleCov.running
-    SimpleCov.start do
-      add_filter '/test/'
-      add_filter '/gems/'
-    end
-  end
+#
+require "codeclimate-test-reporter"
+SimpleCov.start do
+  formatter SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    CodeClimate::TestReporter::Formatter
+  ]
 end
 require 'rr'
@@ -53,6 +37,7 @@ require 'vcr'
 VCR.configure do |config|
   config.cassette_library_dir = "test/cassettes"
   config.hook_into :webmock # or :fakeweb
+  config.ignore_hosts 'codeclimate.com'
 end
 unless defined?(Test::Unit::AssertionFailedError)
@@ -78,4 +63,4 @@ def ipv6_enabled?
   end
 end
-$log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)
+$log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)

data/test/plugin/test_filter_docker_metadata.rb CHANGED Viewed

@@ -64,11 +64,11 @@ class DockerMetadataFilterTest < Test::Unit::TestCase
       ]
     end
-    def emit(config, msgs)
+    def emit(config, msgs, tag='df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115')
       d = create_driver(config)
       d.run {
         msgs.each { |msg|
-          d.emit_with_tag('df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115', {'foo' => 'bar', 'message' => msg}, @time)
+          d.emit_with_tag(tag, {'foo' => 'bar', 'message' => msg}, @time)
         }
       }.filtered
     end
@@ -84,5 +84,13 @@ class DockerMetadataFilterTest < Test::Unit::TestCase
         assert_equal('fabric8/hawtio-kubernetes:latest', es.instance_variable_get(:@record_array)[0][:docker][:image])
       end
     end
+    test 'nonexistent docker metadata' do
+      VCR.use_cassette('nonexistent_docker_metadata') do
+        es = emit('', messages, '1111111111111111111111111111111111111111111111111111111111111111')
+        assert_equal(4, es.instance_variable_get(:@record_array).size)
+        assert_nil(es.instance_variable_get(:@record_array)[0][:docker])
+      end
+    end
   end
-end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-docker_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jimmi Dyson
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Filter plugin to add Docker metadata
 email:
 - jimmidyson@gmail.com
@@ -180,6 +194,7 @@ files:
 - fluent-plugin-docker_metadata_filter.gemspec
 - lib/fluent/plugin/filter_docker_metadata.rb
 - test/cassettes/docker_metadata.yml
+- test/cassettes/nonexistent_docker_metadata.yml
 - test/helper.rb
 - test/plugin/test_filter_docker_metadata.rb
 homepage: https://github.com/fabric8io/fluent-plugin-docker_metadata_filter
@@ -208,5 +223,6 @@ specification_version: 4
 summary: Filter plugin to add Docker metadata
 test_files:
 - test/cassettes/docker_metadata.yml
+- test/cassettes/nonexistent_docker_metadata.yml
 - test/helper.rb
 - test/plugin/test_filter_docker_metadata.rb