Skip to content

Commit

Permalink
Rename command unpacker -> binlog-reader
Browse files Browse the repository at this point in the history
  • Loading branch information
@ganmacs
ganmacs committed Sep 2, 2016
1 parent 9eda447 commit 36fbfac
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions bin/fluent-unpacker → bin/fluent-binlog-reader
View file
Expand Up @@ -2,6 +2,6 @@
# -*- coding: utf-8 -*-
here = File.dirname(__FILE__)
$LOAD_PATH << File.expand_path(File.join(here, '..', 'lib'))
require 'fluent/command/unpacker'
require 'fluent/command/binlog_reader'

FluentUnpacker.new.call
FluentBinlogReader.new.call
16 changes: 9 additions & 7 deletions lib/fluent/command/unpacker.rb → lib/fluent/command/binlog_reader.rb
View file
Expand Up @@ -22,25 +22,25 @@
require 'fluent/plugin'
require 'fluent/config/element'

class FluentUnpacker
class FluentBinlogReader
SUBCOMMAND = %w(cat head formats)
HELP_TEXT = <<HELP
Usage: fluent-unpacker <command> [<args>]
Usage: fluent-binlog-reader <command> [<args>]
Commands of fluent-unpacker:
Commands of fluent-binlog-reader:
cat : Read files sequentially, writing them to standard output.
head : Display the beginning of a text file.
format : Display plugins that you can use.
See 'fluent-unpacker <command> --help' for more information on a specific command.
See 'fluent-binlog-reader <command> --help' for more information on a specific command.
HELP

def initialize(argv = ARGV)
@argv = argv
end

def call
command_class = UnpackerCommand.const_get(command)
command_class = BinlogReaderCommand.const_get(command)
command_class.new(@argv).call
end

Expand All @@ -62,7 +62,7 @@ def usage(msg = nil)
end
end

module UnpackerCommand
module BinlogReaderCommand
class Base
def initialize(argv = ARGV)
@argv = argv
Expand Down Expand Up @@ -99,6 +99,8 @@ def parse_options!
Fluent::Plugin.add_plugin_dir(d)
end
end
rescue => e
usage e
end
end

Expand All @@ -118,7 +120,7 @@ def initialize(argv = ARGV)
def configure_option_parser
@options.merge!(config_params: {})

@opt_parser.banner = "Usage: fluent-unpacker #{self.class.to_s.split('::').last.downcase} [options] file"
@opt_parser.banner = "Usage: fluent- #{self.class.to_s.split('::').last.downcase} [options] file"

@opt_parser.on('-f TYPE', '--format', 'configure output format') do |v|
@options[:format] = v.to_sym
Expand Down
62 changes: 31 additions & 31 deletions test/command/test_unpacker.rb → test/command/test_binlog_reader.rb
View file
Expand Up @@ -3,11 +3,11 @@
require 'oj'
require 'flexmock/test_unit'

require 'fluent/command/unpacker'
require 'fluent/command/binlog_reader'
require 'fluent/event'

class TestFluentUnpacker < ::Test::Unit::TestCase
module ::UnpackerCommand
class TestFluentBinlogReader < ::Test::Unit::TestCase
module ::BinlogReaderCommand
class Dummy < Base
def call; end
end
Expand All @@ -27,7 +27,7 @@ def suppress_stdout
invalid: %w(invalid packed.log),
)
test 'should fail when invalid command' do |argv|
fu = FluentUnpacker.new(argv)
fu = FluentBinlogReader.new(argv)

assert_raise(SystemExit) do
suppress_stdout { fu.call }
Expand All @@ -40,10 +40,10 @@ def suppress_stdout
formats: %w(formats packed.log)
)
test 'should succeed when valid command' do |argv|
fu = FluentUnpacker.new(argv)
fu = FluentBinlogReader.new(argv)

flexstub(::UnpackerCommand) do |command|
command.should_receive(:const_get).once.and_return(::UnpackerCommand::Dummy)
flexstub(::BinlogReaderCommand) do |command|
command.should_receive(:const_get).once.and_return(::BinlogReaderCommand::Dummy)
assert_nothing_raised do
fu.call
end
Expand All @@ -53,7 +53,7 @@ def suppress_stdout
end

class TestBaseCommand < ::Test::Unit::TestCase
TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/../tmp/command/unpacker#{ENV['TEST_ENV_NUMBER']}")
TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/../tmp/command/binlog_reader#{ENV['TEST_ENV_NUMBER']}")

def create_message_packed_file(path, times = [event_time], records = [{ 'message' => 'dummy' }])
es = Fluent::MultiEventStream.new(times, records)
Expand Down Expand Up @@ -94,7 +94,7 @@ class TestHead < TestBaseCommand
)
test 'should fail if file is invalid' do |argv|
assert_raise(SystemExit) do
capture_stdout { UnpackerCommand::Head.new(argv) }
capture_stdout { BinlogReaderCommand::Head.new(argv) }
end
end

Expand All @@ -104,7 +104,7 @@ class TestHead < TestBaseCommand
create_message_packed_file(file_name)

assert_nothing_raised do
UnpackerCommand::Head.new(argv)
BinlogReaderCommand::Head.new(argv)
end
end

Expand All @@ -114,7 +114,7 @@ class TestHead < TestBaseCommand
create_message_packed_file(file_name)

assert_raise(SystemExit) do
capture_stdout { UnpackerCommand::Head.new(argv) }
capture_stdout { BinlogReaderCommand::Head.new(argv) }
end
end

Expand All @@ -124,7 +124,7 @@ class TestHead < TestBaseCommand
create_message_packed_file(file_name)

assert_nothing_raised do
capture_stdout { UnpackerCommand::Head.new(argv) }
capture_stdout { BinlogReaderCommand::Head.new(argv) }
end
end
end
Expand All @@ -141,7 +141,7 @@ class TestHead < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
head = UnpackerCommand::Head.new(argv)
head = BinlogReaderCommand::Head.new(argv)
out = capture_stdout { head.call }
assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Oj.dump(@record)}\n" * 5, out
end
Expand All @@ -152,7 +152,7 @@ class TestHead < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
head = UnpackerCommand::Head.new(argv)
head = BinlogReaderCommand::Head.new(argv)
out = capture_stdout { head.call }
assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Oj.dump(@record)}\n", out
end
Expand All @@ -163,7 +163,7 @@ class TestHead < TestBaseCommand

create_message_packed_file(@file_name)
assert_raise(SystemExit) do
capture_stdout { UnpackerCommand::Head.new(argv) }
capture_stdout { BinlogReaderCommand::Head.new(argv) }
end
end

Expand All @@ -172,7 +172,7 @@ class TestHead < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
head = UnpackerCommand::Head.new(argv)
head = BinlogReaderCommand::Head.new(argv)
out = capture_stdout { head.call }
assert_equal "#{Oj.dump(@record)}\n", out
end
Expand All @@ -183,7 +183,7 @@ class TestHead < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
head = UnpackerCommand::Head.new(argv)
head = BinlogReaderCommand::Head.new(argv)

assert_raise(SystemExit) do
capture_stdout { head.call }
Expand All @@ -196,7 +196,7 @@ class TestHead < TestBaseCommand
argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'fields=message,fo', '-e', 'delimiter=|']
create_message_packed_file(file_name, [event_time], [{ 'message' => 'dummy', 'fo' => 'dummy2' }])

head = UnpackerCommand::Head.new(argv)
head = BinlogReaderCommand::Head.new(argv)
assert_equal "\"dummy\"|\"dummy2\"\n", capture_stdout { head.call }
end
end
Expand All @@ -210,7 +210,7 @@ class TestCat < TestBaseCommand
)
test 'should fail if a file is invalid' do |argv|
assert_raise(SystemExit) do
capture_stdout { UnpackerCommand::Head.new(argv) }
capture_stdout { BinlogReaderCommand::Head.new(argv) }
end
end

Expand All @@ -220,7 +220,7 @@ class TestCat < TestBaseCommand
create_message_packed_file(file_name)

assert_nothing_raised do
UnpackerCommand::Cat.new(argv)
BinlogReaderCommand::Cat.new(argv)
end
end

Expand All @@ -230,7 +230,7 @@ class TestCat < TestBaseCommand
create_message_packed_file(file_name)

assert_raise(SystemExit) do
capture_stdout { UnpackerCommand::Cat.new(argv) }
capture_stdout { BinlogReaderCommand::Cat.new(argv) }
end
end

Expand All @@ -240,7 +240,7 @@ class TestCat < TestBaseCommand
create_message_packed_file(file_name)

assert_nothing_raised do
capture_stdout { UnpackerCommand::Cat.new(argv) }
capture_stdout { BinlogReaderCommand::Cat.new(argv) }
end
end
end
Expand All @@ -257,7 +257,7 @@ class TestCat < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
head = UnpackerCommand::Cat.new(argv)
head = BinlogReaderCommand::Cat.new(argv)
out = capture_stdout { head.call }
assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Oj.dump(@record)}\n" * 6, out
end
Expand All @@ -268,7 +268,7 @@ class TestCat < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i] * 6, [@record] * 6)
head = UnpackerCommand::Cat.new(argv)
head = BinlogReaderCommand::Cat.new(argv)
out = capture_stdout { head.call }
assert_equal "2011-01-02T13:14:15+00:00\t#{TMP_DIR}/#{@file_name}\t#{Oj.dump(@record)}\n", out
end
Expand All @@ -279,7 +279,7 @@ class TestCat < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
head = UnpackerCommand::Cat.new(argv)
head = BinlogReaderCommand::Cat.new(argv)
out = capture_stdout { head.call }
assert_equal "#{Oj.dump(@record)}\n", out
end
Expand All @@ -290,7 +290,7 @@ class TestCat < TestBaseCommand

timezone do
create_message_packed_file(@file_name, [event_time(@t).to_i], [@record])
head = UnpackerCommand::Cat.new(argv)
head = BinlogReaderCommand::Cat.new(argv)

assert_raise(SystemExit) do
capture_stdout { head.call }
Expand All @@ -303,7 +303,7 @@ class TestCat < TestBaseCommand
argv = ["#{TMP_DIR}/#{file_name}", '--format=csv', '-e', 'fields=message,fo', '-e', 'delimiter=|']
create_message_packed_file(file_name, [event_time], [{ 'message' => 'dummy', 'fo' => 'dummy2' }])

head = UnpackerCommand::Cat.new(argv)
head = BinlogReaderCommand::Cat.new(argv)
assert_equal "\"dummy\"|\"dummy2\"\n", capture_stdout { head.call }
end
end
Expand All @@ -313,14 +313,14 @@ class TestFormats < TestBaseCommand
test 'parse_option!' do
assert_raise(SystemExit) do
capture_stdout do
UnpackerCommand::Formats.new(['--plugin=invalid_dir_path'])
BinlogReaderCommand::Formats.new(['--plugin=invalid_dir_path'])
end
end
end

sub_test_case 'call' do
test 'display available plugins' do
f = UnpackerCommand::Formats.new
f = BinlogReaderCommand::Formats.new
out = capture_stdout { f.call }
assert out.include?('json')
assert out.include?('csv')
Expand All @@ -329,7 +329,7 @@ class TestFormats < TestBaseCommand
test 'add new plugins using --plugin option' do
dir_path = File.expand_path(File.dirname(__FILE__) + '/../scripts/fluent/plugin/formatter1')

f = UnpackerCommand::Formats.new(["--plugin=#{dir_path}"])
f = BinlogReaderCommand::Formats.new(["--plugin=#{dir_path}"])
out = capture_stdout { f.call }
assert out.include?('json')
assert out.include?('csv')
Expand All @@ -340,7 +340,7 @@ class TestFormats < TestBaseCommand
dir_path1 = File.expand_path(File.dirname(__FILE__) + '/../scripts/fluent/plugin/formatter1')
dir_path2 = File.expand_path(File.dirname(__FILE__) + '/../scripts/fluent/plugin/formatter2')

f = UnpackerCommand::Formats.new(["--plugin=#{dir_path1}", '-p', dir_path2])
f = BinlogReaderCommand::Formats.new(["--plugin=#{dir_path1}", '-p', dir_path2])
out = capture_stdout { f.call }
assert out.include?('json')
assert out.include?('csv')
Expand Down

0 comments on commit 36fbfac

Please sign in to comment.