logstash-output-qingstor 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7564fd0b6a8c4a7241dc27cb5f1328557394033e0cf17a6e6f76d3f0934d4b9a
-  data.tar.gz: 8445db4f27ec881bb9e54a0b3266f1bc77e0ec909c2a795ec2f284b295495f2f
+  metadata.gz: 6fe51f69908599f882c6ac6b6a9afc08e0770b8bffda5679ab83ac5e5acf94dc
+  data.tar.gz: 0d499a3d20bf83f0a39d22663077cf13a92d0bfb8281d8aca848914665c07a21
 SHA512:
-  metadata.gz: 14a409865bb71577410a82832696d3f56efb251a4c96d8d30ec265597728d97ea9be736f04d49107415c9e4a3a1f18359a7db14873ab26f3346aabfe7c605def
-  data.tar.gz: daca98515e8dee4c70d6cd61c8a589a2f39d748ef75b08d52675a38784229f872e589fa89b1c5b788f1ffa005aa2de073515c35e00fd8aef24cb26243f62827f
+  metadata.gz: 9c1959265a7e30b3777e09135c69013f1e70332e8772893d1d142f7fc7f0a4fb03a1f5f6409b0585766129c39617bb544f79997869dea7f9a77ec83c3e082f4d
+  data.tar.gz: '058d9cb15d999c055fe5cb8b1333dc59064861923b4f15a865fc43ceaf7f4fb6f798ceb8f3956fb6f07e46801da8eade2b2fd1c67688d7ca0ab4156af33244fb'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.6
+  - Fix: swap uuid and date of the file name for sorting
+  
 ## 0.2.5
   - Fix: remove uuid directories which cannotbe removed properly
   

data/lib/logstash/outputs/qingstor/temporary_file_factory.rb

@@ -57,7 +57,7 @@ module LogStash
         end
 
         def generate_name
-          filename = "ls.qingstor.#{SecureRandom.uuid}.#{current_time}"
+          filename = "ls.qingstor.#{current_time}.#{SecureRandom.uuid}"
 
           if !tags.empty?
             "#{filename}.tag_#{tags.join('.')}.part#{counter}.#{extension}"

data/logstash-output-qingstor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-qingstor'
-  s.version       = '0.2.5'
+  s.version       = '0.2.6'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'logstash output plugin for qingstor'
   s.description   = 'Collect the outputs of logstash and store into QingStor'

data/spec/outputs/qingstor/temporary_file_factory_spec.rb

@@ -47,12 +47,6 @@ describe LogStash::Outputs::Qingstor::TemporaryFileFactory do
       expect(file.path).to match(/#{file.key}/)
     end
 
-    it 'create a unique directory in the temporary directory for each file' do
-      uuid = 'hola'
-      expect(SecureRandom).to receive(:uuid).and_return(uuid).twice
-      expect(subject.current.path).to include(uuid)
-    end
-
     context 'with tags supplied' do
       let(:tags) { %w[secret service] }
 

data/spec/outputs/qingstor/temporary_file_spec.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'tmpdir'
 
 describe LogStash::Outputs::Qingstor::TemporaryFile do
-  subject { described_class.new(key, io, tmp_path) }
+  subject { described_class.new(key, io, Dir.tmpdir) }
 
   let(:key) { 'foo.log' }
   let(:content) { 'May the code be with you!' }
@@ -15,7 +15,7 @@ describe LogStash::Outputs::Qingstor::TemporaryFile do
   let(:io) { ::File.open(tmp_path, file_mode) }
 
   after(:all) do
-    FileUtils.rm_r('/tmp/foo.log') if File.exist?('/tmp/foo.log')
+    FileUtils.rm('/tmp/foo.log') if File.exist?('/tmp/foo.log')
   end
 
   it 'return the key of the file' do
@@ -35,7 +35,7 @@ describe LogStash::Outputs::Qingstor::TemporaryFile do
   end
 
   it 'return the tmp_path of the file' do
-    expect(subject.tmp_path).to eq(tmp_path)
+    expect(File.join(subject.tmp_path, subject.key)).to eq(tmp_path)
   end
 
   it 'return the creation time' do
@@ -43,9 +43,9 @@ describe LogStash::Outputs::Qingstor::TemporaryFile do
   end
 
   it 'can delete file correctly' do
-    expect(File.exist?(subject.tmp_path)).to be_truthy
+    expect(File.exist?(tmp_path)).to be_truthy
     subject.delete!
-    expect(File.exist?(subject.tmp_path)).to be_falsey
+    expect(File.exist?(tmp_path)).to be_falsey
   end
 
   it 'return if the file is empty' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-qingstor
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Evan Zhao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement