flydata 0.3.24 → 0.4.0

data/spec/flydata/output/forwarder_spec.rb

@@ -55,8 +55,11 @@ module Flydata
 
       describe '#emit' do
         let(:record) { {table_name: 'test_table_name', log: '{"key":"value"}'} }
+        let(:record_byte_size) { [Time.now.to_i,record].to_msgpack.bytesize }
+        let(:sent_stats) { { byte_size: (record_byte_size * 3), record_count: 3} }
+
         before :each do
-          forwarder.set_options({buffer_size_limit: ([Time.now.to_i,record].to_msgpack.bytesize * 2.5)})
+          forwarder.set_options({buffer_size_limit: (record_byte_size * 2.5)})
         end
         context 'when the buffer size is less than threthold' do
           it do
@@ -69,7 +72,7 @@ module Flydata
             expect(forwarder.emit(record)).to be(false)
             expect(forwarder.emit(record)).to be(false)
             expect(forwarder.buffer_record_count).to be(2)
-            expect(forwarder.emit(record)).to be(true)
+            expect(forwarder.emit(record)).to eq(sent_stats)
             expect(forwarder.buffer_record_count).to be(0)
           end
         end
@@ -88,7 +91,7 @@ module Flydata
           it 'retry and succeed sending data' do
             forwarder.emit(record)
             forwarder.emit(record)
-            expect(forwarder.emit(record)).to be(true)
+            expect(forwarder.emit(record)).to eq(sent_stats)
           end
         end
       end

data/spec/flydata/parser/mysql/dump_parser_spec.rb

@@ -17,7 +17,7 @@ module Flydata
         let(:stdout) do
           s = double(:stdout)
           allow(s).to receive(:set_encoding)
-          allow(s).to receive(:gets).and_return("first line")
+          allow(s).to receive(:wait_readable)
           allow(s).to receive(:each_line).and_yield("another line")
           s
         end
@@ -50,6 +50,7 @@ module Flydata
             before do
               expect(Mysql2::Client).to receive(:new).and_return(mysql_client)
               expect(Open3).to receive(:popen3).and_yield(stdin, stdout, stderr, wait_thr)
+              allow(File).to receive(:size?).and_return true
             end
             context "when mysqldump exits with status 0" do
               it do

data/spec/flydata/util/file_util_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+module Flydata
+  module Util
+    describe FileUtil do
+      subject { Class.new { include FileUtil }.new }
+
+      let(:file_path) { Tempfile.new('helper_rspec_one_line_file').path }
+      let(:dummy_content) { 'dummy_content' }
+
+      before do
+        FileUtils.rm(file_path) if File.exists?(file_path)
+      end
+
+      describe "#tail" do
+        shared_examples 'tail and retrieves correct number of lines' do
+          before do
+            File.open(file_path,'w') do |io|
+              1.upto(total_line_count) do |i|
+                io.write("line#{i}\n")
+              end
+            end
+          end
+          it "returns expected lines" do
+            tailed_lines = subject.tail(file_path, tailed_line_count)
+            expect(tailed_lines.count("\n")).to eq(expected_line_range.size)
+            expected_line_range.each do |i|
+              expect(tailed_lines).to include("line#{i}\n")
+            end
+          end
+        end
+
+        context "when the tailed file has less lines than the passed parameter" do
+          let(:total_line_count) { 10 }
+          let(:tailed_line_count) { 100 }
+          let(:expected_line_range) { 1..10 }
+          include_examples 'tail and retrieves correct number of lines'
+        end
+
+        context "when the tailed file has equal number of lines as the passed parameter" do
+          let(:total_line_count) { 10 }
+          let(:tailed_line_count) { 10 }
+          let(:expected_line_range) { 1..10 }
+          include_examples 'tail and retrieves correct number of lines'
+        end
+
+        context "when the tailed file has greater number of lines than the passed parameter" do
+          let(:total_line_count) { 100 }
+          let(:tailed_line_count) { 10 }
+          let(:expected_line_range) { 91..100 }
+          include_examples 'tail and retrieves correct number of lines'
+        end
+
+        context "when the tailed file is empty" do
+          before do
+            File.open(file_path,'w').write("")
+          end
+          it "returns an empty string" do
+            expect(subject.tail(file_path, 10)).to eq("")
+          end
+        end
+      end
+
+      describe "#write_line" do
+        context 'when file does not exist' do
+          it 'creates the file' do
+            subject.write_line(file_path, dummy_content)
+            expect(IO.read(file_path)).to eq(dummy_content)
+          end
+        end
+
+        context 'when the file exists' do
+          it 'overwrites file' do
+            IO.write(file_path, "aaaa\nbbbb\nccc\n")
+            subject.write_line(file_path, dummy_content)
+            expect(IO.read(file_path)).to eq(dummy_content)
+          end
+        end
+      end
+
+      describe "#read_line" do
+        let(:default_value) { nil }
+
+        context 'when file does not exist' do
+          it 'return nil' do
+            expect(subject.read_line(file_path, nil)).to be_nil
+          end
+        end
+
+        context 'when file exists' do
+          before do
+            subject.write_line(file_path, dummy_content)
+          end
+          it 'return first line of content' do
+            expect(subject.read_line(file_path, nil)).to eq(dummy_content)
+          end
+        end
+
+        context 'when file is empty' do
+          before do
+            subject.write_line(file_path, '')
+          end
+          it 'return empty string' do
+            expect(subject.read_line(file_path, nil)).to eq('')
+          end
+        end
+      end
+    end
+  end
+end  

data/spec/flydata/util/shell_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Flydata
+  module Util
+    describe Shell do
+      describe '.run_cmd' do
+        context 'when command returns 0' do
+          it 'return status 0' do
+            o, e, s = described_class.run_cmd('pwd')
+            expect(s.to_i).to eq(0)
+            expect(o).to match(/flydata/)
+            expect(e).to be_empty
+          end
+        end
+
+        context 'when command is invalid' do
+          it 'return status 0' do
+            expect {
+              described_class.run_cmd('pwdssssss')
+            }.to raise_error(Errno::ENOENT)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -78,3 +78,34 @@ RSpec::Matchers.define :terminate do |code|
     @status_code ||= 0
   end
 end
+
+module STDCapture
+  def self.included(target)
+    target.before do
+      $stdin  = @in  = StringIO.new
+      $stdout = @out = StringIO.new
+      $stderr = @err = StringIO.new
+      @terminal = $terminal
+      $terminal = HighLine.new($stdin, $stdout)
+    end
+    target.after do
+      $stdin  = STDIN
+      $stdout = STDOUT
+      $stderr = STDERR
+      $terminal = @terminal
+    end
+  end
+
+  def set_stdin_string(string)
+    @in << string
+    @in.rewind
+  end
+
+  def stdout
+    @out.string
+  end
+
+  def stderr
+    @err.string
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.4.0
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -262,6 +262,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: serverengine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -504,6 +518,7 @@ files:
 - flydata.gemspec
 - lib/fly_data_model.rb
 - lib/flydata.rb
+- lib/flydata/api/agent.rb
 - lib/flydata/api/base.rb
 - lib/flydata/api/data_entry.rb
 - lib/flydata/api/data_port.rb
@@ -514,8 +529,10 @@ files:
 - lib/flydata/command/conf.rb
 - lib/flydata/command/crontab.rb
 - lib/flydata/command/encrypt.rb
+- lib/flydata/command/helper.rb
 - lib/flydata/command/kill_all.rb
 - lib/flydata/command/login.rb
+- lib/flydata/command/mysql.rb
 - lib/flydata/command/restart.rb
 - lib/flydata/command/routine.rb
 - lib/flydata/command/sender.rb
@@ -547,6 +564,18 @@ files:
 - lib/flydata/fluent-plugins/out_forward_ssl.rb
 - lib/flydata/fluent-plugins/preference.rb
 - lib/flydata/flydata_crontab.sh
+- lib/flydata/helper/action/agent_action.rb
+- lib/flydata/helper/action/check_remote_actions.rb
+- lib/flydata/helper/action/restart_agent.rb
+- lib/flydata/helper/action/send_logs.rb
+- lib/flydata/helper/action/stop_agent.rb
+- lib/flydata/helper/action_ownership.rb
+- lib/flydata/helper/action_ownership_channel.rb
+- lib/flydata/helper/base_action.rb
+- lib/flydata/helper/config_parser.rb
+- lib/flydata/helper/scheduler.rb
+- lib/flydata/helper/server.rb
+- lib/flydata/helper/worker.rb
 - lib/flydata/helpers.rb
 - lib/flydata/heroku.rb
 - lib/flydata/heroku/configuration_methods.rb
@@ -563,6 +592,8 @@ files:
 - lib/flydata/proxy.rb
 - lib/flydata/sync_file_manager.rb
 - lib/flydata/util/encryptor.rb
+- lib/flydata/util/file_util.rb
+- lib/flydata/util/shell.rb
 - spec/fluent_plugins_spec_helper.rb
 - spec/fly_data_model_spec.rb
 - spec/flydata/api/data_entry_spec.rb
@@ -572,6 +603,7 @@ files:
 - spec/flydata/command/conf_spec.rb
 - spec/flydata/command/crontab_spec.rb
 - spec/flydata/command/encrypt_spec.rb
+- spec/flydata/command/helper_spec.rb
 - spec/flydata/command/kill_all_spec.rb
 - spec/flydata/command/login_spec.rb
 - spec/flydata/command/restart_spec.rb
@@ -594,6 +626,16 @@ files:
 - spec/flydata/fluent-plugins/mysql/shared_query_handler_context.rb
 - spec/flydata/fluent-plugins/mysql/table_meta_spec.rb
 - spec/flydata/fluent-plugins/mysql/truncate_query_handler_spec.rb
+- spec/flydata/helper/action/check_remote_actions_spec.rb
+- spec/flydata/helper/action/restart_agent_spec.rb
+- spec/flydata/helper/action/send_logs_spec.rb
+- spec/flydata/helper/action/stop_agent_spec.rb
+- spec/flydata/helper/action_ownership_channel_spec.rb
+- spec/flydata/helper/action_ownership_spec.rb
+- spec/flydata/helper/config_parser_spec.rb
+- spec/flydata/helper/helper_shared_context.rb
+- spec/flydata/helper/scheduler_spec.rb
+- spec/flydata/helper/worker_spec.rb
 - spec/flydata/heroku_spec.rb
 - spec/flydata/mysql/binlog_position_spec.rb
 - spec/flydata/mysql/mysql_util_spec.rb
@@ -603,6 +645,8 @@ files:
 - spec/flydata/parser/mysql/dump_parser_spec.rb
 - spec/flydata/sync_file_manager_spec.rb
 - spec/flydata/util/encryptor_spec.rb
+- spec/flydata/util/file_util_spec.rb
+- spec/flydata/util/shell_spec.rb
 - spec/flydata_spec.rb
 - spec/spec_helper.rb
 - tmpl/redshift_mysql_data_entry.conf.tmpl