fluent-format 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 885cab275f6fb1fd2c3985502fe7c4af090e04f3
-  data.tar.gz: 7bed0b502af72155bec463042b4c76897478cc93
+  metadata.gz: 60872a23fdf2060c3e94c301c8b6f5e1e3eb3a66
+  data.tar.gz: 155f128a5bd00841a294aa2beeb4b3f6718d96ca
 SHA512:
-  metadata.gz: 97d236a5c5afa4a85d568856f254f35c991e0def0721651e776ed543c8492ea9e84921dc03ce006ff10556d5c169311e7e6ce49c3354743960dda61cd07e975d
-  data.tar.gz: abf9334f02803e4a628711c6fb639f2d0470720c519be167e87c830a908f806ed8b5feefbbae84d2ad042bdbd553552e033c09f4faa0fc09db72880f545d49c8
+  metadata.gz: d852f71daed2299560ba8b8bbbdce60eb2ec6d09d27d15fcc455390b79cbf6bc89fb422dc418169e0778ec21a1d6219c4a05f083340fdf610bb813d751230258
+  data.tar.gz: f0c342aebc5a321dd7e59196200a91b5b0a19cee46d4cadb551c91ce01f8f99fdde936b0480e46e17e3c1fc40b49ea2abf0c950090f5601ed22f8fd95a925261

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.1 (2014/02/05)
+
+Enhancement:
+
+* Add tests
+
 ## 0.2.0 (2014/02/05)
 
 Enhancement:

data/README.md

@@ -38,10 +38,6 @@ File.open(path) {|config|
 }
 ```
 
-## ToDo
-
-1. write tests
-
 ## Contributing
 
 1. Fork it

data/lib/fluent/format/check.rb

@@ -26,7 +26,9 @@ module Fluent
 
       # Check config file
       #
-      # @return [Boolean]
+      # @raise Fluent::ConfigParseError if conf has syntax errors
+      # @raise Fluent::ConfigError      if plugin raises config error
+      # @return true if success
       def run
         Fluent::Supervisor.new(@opts).ext_dry_run
       end
@@ -37,6 +39,10 @@ end
 module Fluent
   class Supervisor
     # Extended to accept IO object
+    #
+    # @raise Fluent::ConfigParseError if conf has syntax errors
+    # @raise Fluent::ConfigError      if plugin raises config error
+    # @return true if success
     def ext_dry_run
       ext_read_config
       change_privilege
@@ -44,8 +50,6 @@ module Fluent
       install_main_process_signal_handlers
       run_configure
       true
-    rescue => e
-      false
     end
 
     # Extended to accept IO object
@@ -53,7 +57,6 @@ module Fluent
       if @config_path.respond_to?(:read) # IO object
         @config_data = @config_path.read
       else
-        $log.info "reading config file", :path=>@config_path
         @config_fname = File.basename(@config_path)
         @config_basedir = File.dirname(@config_path)
         @config_data = File.read(@config_path)

data/lib/fluent/format/cli.rb

@@ -9,7 +9,7 @@ module Fluent
       option :config, :aliases => ["-c"], :type => :string, :default => 'fluent.conf', :desc => 'Fluentd configuration file'
       def format
         config = @options[:config]
-        puts Fluent::Format.format(config)
+        taputs Fluent::Format.format(config)
       rescue => e
         $log.error "#{e.class}: #{e}"
         exit 1
@@ -21,11 +21,18 @@ module Fluent
       def check
         config = @options[:config]
         plugin = @options[:plugin]
-        Fluent::Format.check(config, plugin) || exit(1)
+        Fluent::Format.check(config, plugin)
       rescue => e
         $log.error "#{e.class}: #{e}"
         exit 1
       end
+
+      private
+
+      def taputs(str)
+        puts str
+        str
+      end
     end
   end
 end

data/lib/fluent/format/format.rb

@@ -10,6 +10,7 @@ module Fluent
 
       # Format config
       #
+      # @raise Fluent::ConfigParseError if conf has syntax errors
       # @return [String] the formatted config
       def run
         config = read_config(@config_dev)

data/lib/fluent/format/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   class Format
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/fluent/format/check_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Fluent::Format::Check do
+  let(:subject) { Fluent::Format.check(config) }
+
+  context "valid" do
+    let(:config) { StringIO.new(%[<match>\ntype stdout\n</match>]) }
+    it { should be_true }
+  end
+
+  context "syntax error" do
+    let(:config) { StringIO.new(%[<source>\ntype stdout\n</match>]) }
+    it { expect { subject }.to raise_error(Fluent::ConfigParseError) }
+  end
+
+  context "plugin error" do
+    let(:config) { StringIO.new(%[<match>\ntype foobar\n</match>]) }
+    it { expect { subject }.to raise_error(Fluent::ConfigError) }
+  end
+end
+

data/spec/fluent/format/cli_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'fluent/format/cli'
+
+describe Fluent::Format::CLI do
+  let(:cli) { Fluent::Format::CLI.new }
+
+  context "#format" do
+    let(:subject) { cli.invoke(:format, [], opts) }
+
+    context "success" do
+      let(:opts) { {config: "fluent.conf"} }
+      it { expect { subject }.not_to raise_error }
+    end
+
+    context "failure" do
+      let(:opts) { {config: "unknown.conf"} }
+      it { expect { subject }.to raise_error(SystemExit) }
+    end
+  end
+
+  context "#check" do
+    let(:subject) { cli.invoke(:check, [], opts) }
+
+    context "success" do
+      let(:opts) { {config: "fluent.conf"} }
+      it { expect { subject }.not_to raise_error }
+    end
+
+    context "failure" do
+      let(:opts) { {config: "unknown.conf"} }
+      it { expect { subject }.to raise_error(SystemExit) }
+    end
+  end
+end

data/spec/fluent/format/format_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Fluent::Format::Format do
+  let(:subject) { Fluent::Format.format(config) }
+
+  context "valid" do
+    let(:config) { StringIO.new(%[<match>\ntype stdout\n</match>]) }
+    it { should == %[<match>\n  type stdout\n</match>] }
+  end
+
+  context "syntax error" do
+    let(:config) { StringIO.new(%[<source>\ntype stdout\n</match>]) }
+    it { expect { subject }.to raise_error(Fluent::ConfigParseError) }
+  end
+
+  context "plugin error is not checked" do
+    let(:config) { StringIO.new(%[<match>\ntype foobar\n</match>]) }
+    it { should == %[<match>\n  type foobar\n</match>] }
+  end
+end
+
+

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require "bundler/setup"
+require "pry"
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-format
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -121,6 +121,10 @@ files:
 - lib/fluent/format/cli.rb
 - lib/fluent/format/format.rb
 - lib/fluent/format/version.rb
+- spec/fluent/format/check_spec.rb
+- spec/fluent/format/cli_spec.rb
+- spec/fluent/format/format_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/sonots/fluent-format
 licenses:
 - MIT
@@ -145,4 +149,8 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A command line utility to format fluentd configuration beautifully
-test_files: []
+test_files:
+- spec/fluent/format/check_spec.rb
+- spec/fluent/format/cli_spec.rb
+- spec/fluent/format/format_spec.rb
+- spec/spec_helper.rb