logstash-output-s3 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be2b43f76501d55123677b71390bb07abceba04
-  data.tar.gz: 761bac43dc3b59c4ab7669354082707227e7e0bb
+  metadata.gz: 8b5f165ffc5c6daa7d2f89be49daf78ff5d86172
+  data.tar.gz: 22abfdb19ac948cdc57f6f844e2829db8dcf80be
 SHA512:
-  metadata.gz: 5b7ec1c574e3312f59df5818984a09c772ed4805ca5dad4d96db37907b1cdbf41934f32376f90ff8cab6c071ccba119abe1b38018bcfdace21ab7222c011d41e
-  data.tar.gz: 71229a4d5fcf7fb5ea7599c49ef5740b00676416da4efd6d72c1d8310c1d96cc409a08110a4e5c2df88a0f857144957ed99720bb714804a5b620690bc97f5998
+  metadata.gz: 00219d3daeb9050698e0918f214e3dd6b7dc3f4b821d081b846db6e85e0ee844d2da8731584a8d00db8a9d98f3ca1207be12912e522e7efb9a7412014946357d
+  data.tar.gz: 968129c147b8645b50c56cf42a76a653ffc904b361a97ecb6335fd6da1d459c43669ab79601f4c35bb7ade7c419cba6b887b41d8186e04299b132f45486a2778

data/CHANGELOG.md

@@ -1,6 +1,3 @@
-# 1.0.2
-- Explicitly require `stud/task` to make the test pass on when running them inside logstash 1.5.X fixes #36
-  
 # 1.0.1
 - Fix a synchronization issue when doing file rotation and checking the size of the current file
 - Fix an issue with synchronization when shutting down the plugin and closing the current temp file

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-gem "logstash-core", "1.5.4"

data/lib/logstash/outputs/s3.rb

@@ -12,25 +12,24 @@ require "fileutils"
 
 # INFORMATION:
 #
-# This plugin was created for store the logstash's events into Amazon Simple Storage Service (Amazon S3).
-# For use it you needs authentications and an s3 bucket.
-# Be careful to have the permission to write file on S3's bucket and run logstash with super user for establish connection.
+# This plugin sends logstash events to Amazon Simple Storage Service (Amazon S3).
+# To use it you need to have the proper write premissions and a valid s3 bucket.
+# Make sure you have permissions to write files on S3's bucket.  Also be sure to run logstash as super user to establish a connection.
 #
-# S3 plugin allows you to do something complex, let's explain:)
 #
-# S3 outputs create temporary files into "/opt/logstash/S3_temp/". If you want, you can change the path at the start of register method.
-# This files have a special name, for example:
+# This plugin outputs temporary files to "/opt/logstash/S3_temp/". If you want, you can change the path at the start of register method.
+# These files have a special name, for example:
 #
 # ls.s3.ip-10-228-27-95.2013-04-18T10.00.tag_hello.part0.txt
 #
 # ls.s3 : indicate logstash plugin s3
 #
-# "ip-10-228-27-95" : indicate you ip machine, if you have more logstash and writing on the same bucket for example.
+# "ip-10-228-27-95" : indicates the ip of your machine.
 # "2013-04-18T10.00" : represents the time whenever you specify time_file.
-# "tag_hello" : this indicate the event's tag, you can collect events with the same tag.
+# "tag_hello" : this indicates the event's tag.
 # "part0" : this means if you indicate size_file then it will generate more parts if you file.size > size_file.
-#           When a file is full it will pushed on bucket and will be deleted in temporary directory.
-#           If a file is empty is not pushed, but deleted.
+#           When a file is full it will be pushed to a bucket and will be deleted from the temporary directory.
+#           If a file is empty is not pushed, it is not deleted.
 #
 # This plugin have a system to restore the previous temporary files if something crash.
 #
@@ -305,19 +304,18 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
       end
     rescue Errno::ENOSPC
       @logger.error("S3: No space left in temporary directory", :temporary_directory => @temporary_directory)
-      teardown
+      close
     end
   end
 
   public
-  def teardown
+  def close
     shutdown_upload_workers
     @periodic_rotation_thread.stop! if @periodic_rotation_thread
 
     @file_rotation_lock.synchronize do
       @tempfile.close unless @tempfile.nil? && @tempfile.closed?
     end
-    finished
   end
 
   private

data/logstash-output-s3.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-s3'
-  s.version         = '1.0.2'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This plugin was created for store the logstash's events into Amazon Simple Storage Service (Amazon S3)"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,12 +20,11 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
   s.add_runtime_dependency 'logstash-mixin-aws'
-  s.add_runtime_dependency 'stud', '~> 0.0.18'
+  s.add_runtime_dependency 'stud', '~> 0.0.22'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-input-generator'
-  s.add_development_dependency 'logstash-input-stdin'
   s.add_development_dependency 'logstash-codec-line'
 end
 

data/spec/outputs/s3_spec.rb

@@ -50,7 +50,7 @@ describe LogStash::Outputs::S3 do
       s3.register
 
       expect(Dir.exist?(temporary_directory)).to eq(true)
-      s3.teardown
+      s3.close
       FileUtils.rm_r(temporary_directory)
     end
 
@@ -194,7 +194,7 @@ describe LogStash::Outputs::S3 do
       end
 
       after(:each) do
-        s3.teardown
+        s3.close
         tmp.close 
         tmp.unlink
       end
@@ -328,7 +328,7 @@ describe LogStash::Outputs::S3 do
           s3.receive(event)
           event_count += 1
         end
-        s3.teardown
+        s3.close
 
         generated_files = Dir[File.join(temporary_directory, 'ls.*.txt')]
 

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-s3
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -49,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.22
   name: stud
   prerelease: false
   type: :runtime
@@ -57,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -86,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-input-stdin
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -120,7 +100,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - DEVELOPER.md
@@ -128,7 +107,6 @@ files:
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/outputs/s3.rb
 - logstash-output-s3.gemspec
 - spec/integration/s3_spec.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"