logstash-output-s3 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2d6b2f0155c24e0a931c664af916bab86392df
-  data.tar.gz: f15f04f0a498fd65201f8a7274a162785a9c85eb
+  metadata.gz: ad7d91e4c1538aef3094e6c0b79aab310ee393f2
+  data.tar.gz: f92c9391aa44f59c8dc20139a5feacbe623e7214
 SHA512:
-  metadata.gz: 036858633199c8843733eb963db4f218b2978d6ee433424f7479ca1203efb06cf3b7b14e78827c65ff1c86e80f9ca18cc476a7cdab25eb6d0f79ce503e26c6b3
-  data.tar.gz: 6082485f20a205d2acc18ca2bc8c90e4bf48766870735413e3a9568b1b5aecd245eeb00eb1e8698ec57e112113b452132a8ffb4823bef8605a5ffbb111fb3658
+  metadata.gz: f48579783ac1da7c0ef4967e57b201cf70f8d1b8cec6611f8f7eb907c0a1111f5c43a11599c79d1a99bd55450659d1055b9ccd33e998cc5279998459f2c6b708
+  data.tar.gz: d061c669463ac5eb7b090ae5f9b49e3e585fbd5ef09c45919883c49376115d3445c1f652b8c2a894862298d7ed76e2412df63630aaaeaa31d5b9c20783b44ffa

data/lib/logstash/outputs/s3.rb

@@ -144,13 +144,15 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
 
     @logger.debug("S3: ready to write file in bucket", :remote_filename => remote_filename, :bucket => @bucket)
 
-    begin
-      # prepare for write the file
-      object = bucket.objects[remote_filename]
-      object.write(:file => file, :acl => @canned_acl)
-    rescue AWS::Errors::Base => error
-      @logger.error("S3: AWS error", :error => error)
-      raise LogStash::Error, "AWS Configuration Error, #{error}"
+    File.open(file, 'r') do |fileIO|
+      begin
+        # prepare for write the file
+        object = bucket.objects[remote_filename]
+        object.write(fileIO, :acl => @canned_acl)
+      rescue AWS::Errors::Base => error
+        @logger.error("S3: AWS error", :error => error)
+        raise LogStash::Error, "AWS Configuration Error, #{error}"
+      end
     end
 
     @logger.debug("S3: has written remote file in bucket with canned ACL", :remote_filename => remote_filename, :bucket  => @bucket, :canned_acl => @canned_acl)
@@ -253,7 +255,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
       # Something else deleted the file, logging but not raising the issue
       @logger.warn("S3: Cannot delete the temporary file since it doesn't exist on disk", :filename => File.basename(file))
     rescue Errno::EACCES
-      @logger.error("S3: Logstash doesnt have the permission to delete the file in the temporary directory.", :filename => File.basename, :temporary_directory => @temporary_directory)
+      @logger.error("S3: Logstash doesnt have the permission to delete the file in the temporary directory.", :filename => File.basename(file), :temporary_directory => @temporary_directory)
     end
   end
 

data/logstash-output-s3.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-s3'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   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"
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
   s.add_runtime_dependency 'logstash-mixin-aws'
-  s.add_runtime_dependency 'aws-sdk'
   s.add_runtime_dependency 'stud', '~> 0.0.18'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-input-generator'

data/spec/outputs/s3_spec.rb

@@ -51,6 +51,7 @@ describe LogStash::Outputs::S3 do
       s3.register
 
       expect(Dir.exist?(temporary_directory)).to eq(true)
+      s3.teardown
       FileUtils.rm_r(temporary_directory)
     end
 
@@ -92,10 +93,6 @@ describe LogStash::Outputs::S3 do
   end
 
   describe "#write_on_bucket" do
-    after(:all) do
-      File.unlink(fake_data.path)
-    end
-
     let!(:fake_data) { Stud::Temporary.file }
 
     let(:fake_bucket) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash
@@ -44,20 +44,6 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: stud
   version_requirements: !ruby/object:Gem::Requirement