fluent-format 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9b4d49318935b89c482356b9b14679175ba59f
-  data.tar.gz: 3c8e282eee678d7e0194110ba09d4a4d0cafc296
+  metadata.gz: a42c489ee8e91e24fb8b3b29be8c9ca70299686a
+  data.tar.gz: 81f2f02994f5b81cc889c8407b455fd84c998d88
 SHA512:
-  metadata.gz: 1f4f7adf04117be4d7d2c1df0b3d0d855efcd1723719f67ee6d76257aaf57146c8edb1f4a1e33d346c2fdd31360cdd8182b96636d48019c2c53b20291725d6a0
-  data.tar.gz: a670c16cd65563af5a88d294cb65c0517dfc4c9d0a173e4df2514aab63853d8369b9bde28c91c14dbf4372ea2cb62f54298891886be103dd107f30ebe4f41d19
+  metadata.gz: 981ceaa4700db2e66380c7ad31cb7f9942d1aa456eff1ae55c2d4a3cca52ebb817eed28b66659d3f958edad5a4dec19d4f12804607cbc917575d13b3f3dde7d2
+  data.tar.gz: e32491a42548be2950038742a41ac89e8ed98eb30ac7777bbc23b3d619ea22201891d6bb16234867c49f802418cdff15f5d2415a48fef7f4abc3f1b04d3bdda4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.6 (2014/09/22)
+
+Fixes:
+
+* Support gem 'fluentd', '>= 0.10.51'
+
 ## 0.2.5 (2014/09/22)
 
 Fixes:

data/fluent-format.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "thor"
-  s.add_runtime_dependency "fluentd", "= 0.10.50"
+  s.add_runtime_dependency "fluentd"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/lib/fluent/format/check.rb

@@ -25,6 +25,9 @@ module Fluent
         @opts[:inline_config] = opts[:inline_config]
         @opts[:gemfile] = opts[:gemfile]
         @opts[:gem_install_path] = opts[:gem_install_path]
+        if config_dev.respond_to?(:read) # IO object
+          @opts[:config_path] = Tempfile.open('fluent-format') {|f| f.puts(config_dev.read); f.path }
+        end
       end
 
       # Check config file
@@ -33,6 +36,11 @@ module Fluent
       # @raise Fluent::ConfigError      if plugin raises config error
       # @return true if success
       def run
+        if @opts[:config_path].respond_to?(:read) # IO object
+          @opts[:config_path] = Tempfile.open('fluent-format') {|fp|
+            fp.puts(@opts[:config_path].read); fp.path
+          }
+        end
         Fluent::Format::BundlerInjection.new(@opts).run
         Fluent::Supervisor.new(@opts).extended_dry_run
       end
@@ -89,34 +97,18 @@ end
 # Open the existing class and define new methods
 module Fluent
   class Supervisor
-    # Extended to accept IO object
+    # Extended not to exit
     #
     # @raise Fluent::ConfigParseError if conf has syntax errors
     # @raise Fluent::ConfigError      if plugin raises config error
     # @return true if success
     def extended_dry_run
-      extended_read_config
+      read_config
       change_privilege
       init_engine
       install_main_process_signal_handlers
       run_configure
       true
     end
-
-    # Extended to accept IO object
-    def extended_read_config
-      if @config_path.respond_to?(:read) # IO object
-        @config_data = @config_path.read
-      else
-        @config_fname = File.basename(@config_path)
-        @config_basedir = File.dirname(@config_path)
-        @config_data = File.read(@config_path)
-      end
-      if @inline_config == '-'
-        @config_data << "\n" << STDIN.read
-      elsif @inline_config
-        @config_data << "\n" << @inline_config.gsub("\\n","\n")
-      end
-    end
   end
 end

data/lib/fluent/format/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   class Format
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-format
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -28,16 +28,16 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.50
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.50
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement