fluent-format 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42c489ee8e91e24fb8b3b29be8c9ca70299686a
-  data.tar.gz: 81f2f02994f5b81cc889c8407b455fd84c998d88
+  metadata.gz: f7af2e17ee19cfeb863500c8449b08c961fb4f7d
+  data.tar.gz: c1c85c00356df958e831957c843a526e22086db5
 SHA512:
-  metadata.gz: 981ceaa4700db2e66380c7ad31cb7f9942d1aa456eff1ae55c2d4a3cca52ebb817eed28b66659d3f958edad5a4dec19d4f12804607cbc917575d13b3f3dde7d2
-  data.tar.gz: e32491a42548be2950038742a41ac89e8ed98eb30ac7777bbc23b3d619ea22201891d6bb16234867c49f802418cdff15f5d2415a48fef7f4abc3f1b04d3bdda4
+  metadata.gz: a72136527cd6c7bf6e9dfc05a5ae47964ba6c08ce868d54d69a234d029473c464c31802643d099c9aaacb048cf8e0cdeadc1c6630bf101c949349bc2ad623c26
+  data.tar.gz: 04881f4268b511155bd2bcbe9cae962c959edd4059f0f44439d13cb9a1e8bd53dd7b1d947de158b092411e67ccaf60535d75db7ce46ae6c444ea268c74cd09f3

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 (2014/11/27)
+
+Enhancements:
+
+* Add --use-v1-config option
+
 ## 0.2.6 (2014/09/22)
 
 Fixes:

data/README.md

@@ -47,6 +47,10 @@ Output Example:
 </match>
 ```
 
+See help for more options
+
+    $ fluent-format help format
+
 ### Check
 
     $ fluent-format check -c fluent.conf -p plugin_dir
@@ -55,6 +59,10 @@ Output Example:
 This returns the status code 0 if check passed,
 and status code 1 with error messages if check failed. 
 
+See help for more options
+
+    $ fluent-format help check
+
 ## As a library
 
 ### Format

data/lib/fluent/format.rb

@@ -5,9 +5,10 @@ module Fluent
     # Format config file
     #
     # @param [IO|String] config_dev
+    # @param [Hash] opts
     # @return [String] the formatted config
-    def self.format(config_dev)
-      Fluent::Format::Format.new(config_dev).run
+    def self.format(config_dev, opts = {})
+      Fluent::Format::Format.new(config_dev, opts).run
     end
 
     # Check config file

data/lib/fluent/format/check.rb

@@ -19,6 +19,7 @@ module Fluent
           :chgroup => nil,
           :suppress_interval => 0,
           :suppress_repeated_stacktrace => false,
+          :use_v1_config => true,
         }
         @opts[:plugin_dirs] += opts[:plugin_dirs] if opts[:plugin_dirs] and !opts[:plugin_dirs].empty?
         @opts[:libs] += opts[:libs] if opts[:libs] and !opts[:libs].empty?
@@ -28,6 +29,7 @@ module Fluent
         if config_dev.respond_to?(:read) # IO object
           @opts[:config_path] = Tempfile.open('fluent-format') {|f| f.puts(config_dev.read); f.path }
         end
+        @opts[:use_v1_config] = opts[:use_v1_config]
       end
 
       # Check config file

data/lib/fluent/format/cli.rb

@@ -7,9 +7,10 @@ module Fluent
       default_command :format
       desc "format", "Format fluent.conf"
       option :config, :aliases => ["-c"], :type => :string, :default => 'fluent.conf', :desc => 'Fluentd configuration file'
+      option :use_v1_config, :type => :boolean, :default => false, :desc => 'use v1 config format'
       def format
         config = @options[:config]
-        taputs Fluent::Format.format(config)
+        taputs Fluent::Format.format(config, @options)
       rescue => e
         $stderr.puts "#{e.class} #{e.message} #{e.backtrace.first}"
         exit 1
@@ -22,6 +23,7 @@ module Fluent
       option :inline_config, :aliases => ["-i"], :type => :string, :desc => 'inline config which is appended to the config file on-fly'
       option :gemfile, :aliases => ["-g"], :type => :string, :desc => 'Gemfile path'
       option :gem_install_path, :aliases => ["-G"], :type => :string, :desc => 'Gem install path (default: $(dirname $gemfile)/vendor/bundle)'
+      option :use_v1_config, :type => :boolean, :default => false, :desc => 'use v1 config format'
       def check
         config = @options[:config]
         Fluent::Format.check(config, @options)

data/lib/fluent/format/format.rb

@@ -3,18 +3,39 @@ module Fluent
     class Format
       # Initialize
       #
-      # @param [IO|String] config_dev
-      def initialize(config_dev)
+      # @param [IO|String] config filename or IO Object
+      def initialize(config_dev, opts = {})
         @config_dev = config_dev
+        @use_v1_config = opts[:use_v1_config]
       end
 
       # Format config
       #
       # @raise Fluent::ConfigParseError if conf has syntax errors
+      # @raise Fluent::ConfigError      if plugin raises config error
       # @return [String] the formatted config
       def run
-        config = Fluent::ExtConfig.read(@config_dev)
-        indent(config)
+        formatted = read(@config_dev, @use_v1_config)
+        indent(formatted)
+      end
+
+      # Read config (this does formatting)
+      #
+      # @param [IO|String] config_dev config filename or IO Object
+      # @raise Fluent::ConfigParseError if conf has syntax errors
+      # @raise Fluent::ConfigError      if plugin raises config error
+      # @return [String] the formatted config
+      def read(config_dev, use_v1_config)
+        if config_dev.respond_to?(:read) # IO object
+          str = config_dev.read
+          fname = '-'
+          basename = '-'
+        else
+          str = File.read(config_dev)
+          fname = File.basename(config_dev)
+          basename = File.dirname(config_dev)
+        end
+        Fluent::Config.parse(str, fname, basename, use_v1_config)
       end
 
       private
@@ -28,34 +49,3 @@ module Fluent
     end
   end
 end
-
-# lib/fluent/config.rb
-module Fluent
-  module ExtConfig
-    # Extended to accept IO object
-    #
-    # @raise Fluent::ConfigParseError if conf has syntax errors
-    # @raise Fluent::ConfigError      if plugin raises config error
-    # @return [String] parsed config string
-    def self.read(dev)
-      if dev.respond_to?(:read) # IO object
-        parse(dev, '-', '-')
-      else
-        File.open(dev) {|io| parse(io, File.basename(dev), File.dirname(dev)) }
-      end
-    end
-
-    # Extended to accept config dsl
-    #
-    # @raise Fluent::ConfigParseError if conf has syntax errors
-    # @raise Fluent::ConfigError      if plugin raises config error
-    # @return [String] parsed config string
-    def self.parse(io, fname, basepath=Dir.pwd)
-      if fname =~ /\.rb$/
-        Fluent::Config::DSL::Parser.parse(io, File.join(basepath, fname))
-      else
-        Fluent::Config.parse(io, fname, basepath)
-      end
-    end
-  end
-end

data/lib/fluent/format/version.rb

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

data/spec/fluent/format/cli_spec.rb

@@ -20,13 +20,13 @@ describe Fluent::Format::CLI do
 
     context "success" do
       let(:opts) { {config: "fluent.conf"} }
-      it { capture_stderr { subject }.should == "" }
+      it { expect(capture_stderr { subject }).to eq "" }
       it { expect { subject }.not_to raise_error }
     end
 
     context "failure" do
       let(:opts) { {config: "unknown.conf"} }
-      it { capture_stderr { subject }.should include "No such file or directory" }
+      it { expect(capture_stderr { subject }).to include "No such file or directory" }
       it { expect { subject }.to raise_error(SystemExit) }
     end
   end
@@ -36,38 +36,38 @@ describe Fluent::Format::CLI do
 
     context "success" do
       let(:opts) { {config: "fluent.conf"} }
-      it { capture_stderr { subject }.should == "" }
+      it { expect(capture_stderr { subject }).to eq "" }
       it { expect { subject }.not_to raise_error }
     end
 
     context "-p option" do
       let(:opts) { {config: "fluent.conf", plugin_dirs: ["example"]} }
-      it { capture_stderr { subject }.should == "" }
+      it { expect(capture_stderr { subject }).to eq "" }
       it { expect { subject }.not_to raise_error }
     end
 
     context "-r option" do
       let(:libs) { [File.expand_path('../../../example/out_example', File.dirname(__FILE__))] }
       let(:opts) { {config: "fluent.conf", libs: libs } }
-      it { capture_stderr { subject }.should == "" }
+      it { expect(capture_stderr { subject }).to eq "" }
       it { expect { subject }.not_to raise_error }
     end
 
     context "syntax error" do
       let(:opts) { {config: "example/syntax_error.conf"} }
-      it { capture_stderr { subject }.should include("parse error") }
+      it { expect(capture_stderr { subject }).to include("parse error") }
       it { expect { subject }.to raise_error(SystemExit) }
     end
 
     context "plugin error" do
       let(:opts) { {config: "example/plugin_error.conf"} }
-      it { capture_stderr { subject }.should include("Unknown input plugin") }
+      it { expect(capture_stderr { subject }).to include("Unknown input plugin") }
       it { expect { subject }.to raise_error(SystemExit) }
     end
 
     context "param error" do
       let(:opts) { {config: "example/param_error.conf", plugin_dirs: ["example"]} }
-      it { capture_stderr { subject }.should include("out_example.rb") }
+      it { expect(capture_stderr { subject }).to include("out_example.rb") }
       it { expect { subject }.to raise_error(SystemExit) }
     end
   end

data/spec/spec_helper.rb

@@ -5,8 +5,3 @@ require 'fluent-format'
 
 ROOT = File.dirname(__FILE__)
 Dir[File.expand_path("support/**/*.rb", ROOT)].each {|f| require f }
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-format
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor