fluent-format 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c146d76922041322724ecc30226d50f82a10233
-  data.tar.gz: b9f8974f98d0c56705ae57a0d936d6f470a49f28
+  metadata.gz: 45e9edeceed0b41a528b44e55f62acc590c10511
+  data.tar.gz: f1f8d83c06393f8e1711f09d518df075cda1d9b8
 SHA512:
-  metadata.gz: b969c2059241258ce3c03a5c043805d3696726c0c1a2ff2b0cfa6409dda770649f65760bc07ae468943831609060c57f97fed9cae2d25c10550832df5b0c6fba
-  data.tar.gz: 1f09c86414d97aac4186616cf677c4d05b68652eca921ea2da12ea99e735040ea02b51c5459fd3d568ddfc150a543de134d5f3fe2f42d0c9cab13da21903bf96
+  metadata.gz: 0214b3c0202711b8524ba1aa1224adc9423660fb480582967f5c274f99a50eacd7f8765cfb20fa659e85470681b309424fa24150de7733a26aacf637ddf9eca5
+  data.tar.gz: 4c4d3e307d2f1c45708da99e444c36d3a09f5c29aced24c84a06bb35315845eefa610f3bc7f28cc119b2d7c31eb329257f98781a61c0d21cab55cef52b299c20

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.4 (2014/04/14)
+
+Enhancements:
+
+* Add `gemfile` option and `inline_config` option for fluent-format check
+
 ## 0.2.3 (2014/04/10)
 
 Enhancement:

data/lib/fluent/format.rb

@@ -13,11 +13,10 @@ module Fluent
     # Check config file
     #
     # @param [IO|String] config_dev
-    # @param [String] plugin_dir the plugin directory
-    # @param [Array] libs load libraries (to require)
+    # @param [Hash] opts
     # @return [Boolean]
-    def self.check(config_dev, plugin_dir = nil, libs = nil)
-      Fluent::Format::Check.new(config_dev, plugin_dir, libs).run
+    def self.check(config_dev, opts = {})
+      Fluent::Format::Check.new(config_dev, opts).run
     end
   end
 end

data/lib/fluent/format/check.rb

@@ -6,9 +6,7 @@ module Fluent
       # Initialize
       #
       # @param [IO|String] config_dev
-      # @param [String] plugin_dir the plugin directory
-      # @param [Array] libs load libraries (to require)
-      def initialize(config_dev, plugin_dir = nil, libs = nil)
+      def initialize(config_dev, opts = {})
         @opts = {
           :config_path => config_dev, # Fluent::DEFAULT_CONFIG_PATH,
           :plugin_dirs => [Fluent::DEFAULT_PLUGIN_DIR],
@@ -22,8 +20,11 @@ module Fluent
           :suppress_interval => 0,
           :suppress_repeated_stacktrace => false,
         }
-        @opts[:plugin_dirs] << plugin_dir if plugin_dir
-        @opts[:libs] += libs if libs and !libs.empty?
+        @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?
+        @opts[:inline_config] = opts[:inline_config]
+        @opts[:gemfile] = opts[:gemfile]
+        @opts[:gem_install_path] = opts[:gem_install_path]
       end
 
       # Check config file
@@ -32,12 +33,58 @@ module Fluent
       # @raise Fluent::ConfigError      if plugin raises config error
       # @return true if success
       def run
+        Fluent::Format::BundlerInjection.new(@opts).run
         Fluent::Supervisor.new(@opts).extended_dry_run
       end
     end
   end
 end
 
+module Fluent
+  class Format
+    class BundlerInjection
+      def initialize(opts = {})
+        @opts = {
+          :gemfile => opts[:gemfile],
+          :gem_install_path => opts[:gem_install_path],
+        }
+      end
+
+      def run
+        # copy from lib/fluent/command/fluentd.rb
+        if ENV['FLUENTD_DISABLE_BUNDLER_INJECTION'] != '1' && gemfile = @opts[:gemfile]
+          ENV['BUNDLE_GEMFILE'] = gemfile
+          if path = @opts[:gem_install_path]
+            ENV['BUNDLE_PATH'] = path
+          else
+            ENV['BUNDLE_PATH'] = File.expand_path(File.join(File.dirname(gemfile), 'vendor/bundle'))
+          end
+          ENV['FLUENTD_DISABLE_BUNDLER_INJECTION'] = '1'
+          bundler_injection
+        end
+      end
+
+      def bundler_injection
+        # basically copy from lib/fluent/command/bundler_injection.rb
+        system("bundle install")
+        unless $?.success?
+          exit $?.exitstatus
+        end
+
+        cmdline = [
+          'bundle',
+          'exec',
+          RbConfig.ruby,
+          File.expand_path(File.join(File.dirname(__FILE__), '../../../bin/fluent-format')),
+        ] + ARGV
+
+        exec *cmdline
+        exit! 127
+      end
+    end
+  end
+end
+
 # lib/fluent/supervisor.rb
 # Open the existing class and define new methods
 module Fluent

data/lib/fluent/format/cli.rb

@@ -17,15 +17,14 @@ module Fluent
 
       desc "check", "Check fluent.conf"
       option :config, :aliases => ["-c"], :type => :string, :default => 'fluent.conf', :desc => 'Fluentd configuration file'
-      option :plugin, :aliases => ["-p"], :type => :string, :desc => 'Additional Fluentd plugin directory'
-      option :require, :aliases => ["-r"], :type => :array, :desc => 'Additional Fluentd lib path'
+      option :plugin_dirs, :aliases => ["-p"], :type => :array, :desc => 'add plugin directory'
+      option :libs, :aliases => ["-r"], :type => :array, :desc => 'load library'
+      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)'
       def check
         config = @options[:config]
-        plugin = @options[:plugin]
-        require 'pry'
-        binding.pry
-        libs   = @options[:require]
-        Fluent::Format.check(config, plugin, libs)
+        Fluent::Format.check(config, @options)
       rescue => e
         $stderr.puts "#{e.class} #{e.message} #{e.backtrace.first}"
         exit 1

data/lib/fluent/format/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   class Format
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/spec/fluent/format/check_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe Fluent::Format::Check do
-  let(:plugin_dir) { File.expand_path('../../../example', File.dirname(__FILE__)) }
-  let(:libs) { [File.expand_path('../../../example/out_example', File.dirname(__FILE__))] }
-  let(:subject) { Fluent::Format.check(config, plugin_dir, libs) }
+  let(:opts) {{
+    :plugin_dirs => [File.expand_path('../../../example', File.dirname(__FILE__))],
+    :libs => [File.expand_path('../../../example/out_example', File.dirname(__FILE__))] 
+  }}
+  let(:subject) { Fluent::Format.check(config, opts) }
 
   context "valid" do
     let(:config) { StringIO.new(%[<match>\ntype stdout\n</match>]) }

data/spec/fluent/format/cli_spec.rb

@@ -40,14 +40,15 @@ describe Fluent::Format::CLI do
       it { expect { subject }.not_to raise_error }
     end
 
-    context "plugin option" do
-      let(:opts) { {config: "fluent.conf", plugin: "example"} }
+    context "-p option" do
+      let(:opts) { {config: "fluent.conf", plugin_dirs: ["example"]} }
       it { capture_stderr { subject }.should == "" }
       it { expect { subject }.not_to raise_error }
     end
 
-    context "require option" do
-      let(:opts) { {config: "fluent.conf", require: ["example/out_example"]} }
+    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 { subject }.not_to raise_error }
     end
@@ -65,7 +66,7 @@ describe Fluent::Format::CLI do
     end
 
     context "param error" do
-      let(:opts) { {config: "example/param_error.conf", plugin: "example"} }
+      let(:opts) { {config: "example/param_error.conf", plugin_dirs: ["example"]} }
       it { capture_stderr { subject }.should include("out_example.rb") }
       it { expect { subject }.to raise_error(SystemExit) }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-format
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor