tn_s3_file_uploader 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjFiMTNlOTlmYjQzODc3M2FjMjE1ZGYzMjM3MDM3ZmM0NmFmM2VjYg==
-  data.tar.gz: !binary |-
-    MjQ2YzdkMGMwMWI1YjA4MGRlNDI2YmVjYzFlMzE3N2IyYzJiZDQ5Zg==
+SHA1:
+  metadata.gz: 57b2e3f098206b3194879ade9ab5cc75c6bd4ec9
+  data.tar.gz: 2f93dd63c4030a697f1c349f6865410809365b87
 SHA512:
-  metadata.gz: !binary |-
-    NGE0OTExNjIwNmIwOWEyNzI2OWM5NmU2MGUzMTUxNzZkZDY1MjlhZjM3ZGEz
-    ZjQ1ZWJlMGE0MGMxOGRlZTA1OTMyMWNhMjViNTAwMWFhOGM5NmU4MDI1YTUy
-    NzJiZTlmN2EyYzRiNGJiZmRjZTU4Yzg3NzI2MDA5YjJlMGZjYzg=
-  data.tar.gz: !binary |-
-    YzFiMGQ1Mjc3NWQ2MjUyMGZmYjg0MDIxOGFiNjc4N2E1MjY1OTdmN2YwYzll
-    NDEyMWExM2ZlZjdkNTdmOWQ0MjNjZjNmNmExNjA2N2VhMmU1MzBkZTUzMWVl
-    OTlhYTIzNmQ2MGM1ZmU5ZjNmYjYzMDQ2MTJiMDI5MjUyY2IwMWE=
+  metadata.gz: e71475027f97915edf5def8c2c88b4adcd6c10d0fd6c23bfe99a15d75c6bbf8facf1b80a8e4779ebb2d710cbba0fb4f0f91e461ba28a2cad27824a3b6e5af6c6
+  data.tar.gz: e0f808c0cc1423a0fe71cf79b657c7023bc2d456641c219966187ba2c4d07d141b8e3fa07deb217564804ac7b82ec6ea563ec96a3ce885d030beaa6df8c00496

data/lib/tn_s3_file_uploader/cli_parser.rb

@@ -24,6 +24,12 @@ module TnS3FileUploader
           options[:s3_output_pattern] = s3_output_pattern
         end
 
+        options[:delete_log_files_flag] = false
+        opts.on("-d", "--delete-log-files [DELETE_LOG_FILES]", "The flag for deleting log files"\
+            "It is an optional parameter, default is false, decides if log files are deleted after successful upload") do |delete_log_files_flag|
+          options[:delete_log_files_flag] = delete_log_files_flag
+        end
+
         options[:file_timestamp_resolution] = 300
         opts.on("--file-timestamp-resolution RES", Integer, "The resolution of the destination filename in seconds (positive non-zero integer)") do |file_timestamp_resolution|
           if valid_seconds?(file_timestamp_resolution)

data/lib/tn_s3_file_uploader/log_uploader.rb

@@ -32,7 +32,14 @@ module TnS3FileUploader
         puts "Found log file #{ log_file }, formatting file name for upload to S3 bucket #{ bucket } into folder #{ destination_full_path }"
 
         # Note no leading or trailing slashes - this will break the upload to S3 (see our s3.rb)
-        @s3.upload_file(log_file, bucket, destination_full_path)
+        begin
+          @s3.upload_file(log_file, bucket, destination_full_path)
+          if options[:delete_log_files_flag]
+            delete_file(log_file)
+          end
+        rescue StandardError, Timeout::Error => e
+          raise e
+        end
       end
 
     end
@@ -59,6 +66,11 @@ module TnS3FileUploader
     def blank?(str)
       str.nil? || str == ""
     end
+
+    def delete_file(file)
+      file_path = Pathname.new(file)
+      File.delete(file) if file_path.file?
+    end
   end
 
 end

data/lib/tn_s3_file_uploader/s3.rb

@@ -24,8 +24,11 @@ module TnS3FileUploader
 
       file_path = Pathname.new(file)
       raise ArgumentError, "#{file} is not a valid file" unless file_path.exist? && file_path.file?
-
+      begin
       upload(bucket, dest_path, file)
+      rescue StandardError, Timeout::Error => e
+        raise e
+      end
     end
 
     private
@@ -49,7 +52,6 @@ module TnS3FileUploader
         end
       end
     end
-
   end
 
 end

data/lib/tn_s3_file_uploader/version.rb

@@ -1,3 +1,3 @@
 module TnS3FileUploader
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tn_s3_file_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Thinknear.com
@@ -14,34 +14,30 @@ dependencies:
   name: honeybadger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4xNQ==
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4xNQ==
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4zNQ==
+        version: '1.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4zNQ==
+        version: '1.35'
 description: Amazon S3 file uploader that can build folder structures based on timestamp.
   Typically used in conjunction with Unix's logrotate.
 email: opensource@thinknear.com
@@ -73,17 +69,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Amazon S3 file uploader