tn_s3_file_uploader 0.1.12 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbed96e337f63f8b7f21223de775580420d74880
-  data.tar.gz: 94763af3e28c29ed1532aac1f0e4de7d15406f7b
+  metadata.gz: 2062bc0a4484eda4e75c513648636a5845e94ee8
+  data.tar.gz: 174f02613f6c19f6b066b2023cb6ddad7d307e64
 SHA512:
-  metadata.gz: 68c342d6036ffbd3f34ea6845a6a245114a7168459cb38a44e7d3154394b74988864d967e5b15f85a578ec6491c2f1e7514816336053bf3610fdbfcfe66d15d9
-  data.tar.gz: 3395dee887e1b88297167d40a98fa95027485e5346f28dc9d04415593cdca4fa35e208e1addeec468e62ab1428c0d1b8d3c95514e09788dc226d8982c84abaa8
+  metadata.gz: 2e288891e8d56061f2de39048d9326077b9ddc7c6e185b786b8cddae040ffbf7dae5adbac27da76ed45ad3451f0609a5eb5720048d1233fb225277e97b6d5c88
+  data.tar.gz: 5a172c4b7f2a0da1a08967aa79ad69c120cc6e87163bfe7a5f4d8dbbe38ae432a0db770aa112c7c2e05e70278d0ebd4dce5b31c41f8427d74143daff1f3dd79e

data/lib/tn_s3_file_uploader.rb

@@ -3,6 +3,7 @@ require 'tn_s3_file_uploader/cli_parser'
 require 'tn_s3_file_uploader/file_path_generator'
 require 'tn_s3_file_uploader/log_uploader'
 require 'tn_s3_file_uploader/s3'
+require 'tn_s3_file_uploader/log'
 
 require 'tn_s3_file_uploader/error_reporting/error_report_manager'
 require 'tn_s3_file_uploader/error_reporting/honeybadger_error_reporter'

data/lib/tn_s3_file_uploader/cli_parser.rb

@@ -31,6 +31,12 @@ module TnS3FileUploader
           options[:delete_log_files_flag] = delete_log_files_flag
         end
 
+        options[:fixed_time] = ""
+        opts.on("-t", "--fixed-time [FIXED_TIME]", "The time which will be added to generated log name"\
+            "It is an optional parameter. Use this argument to override time used to specify the resolution for the timestamp, if this option is not provided the time to use will be script run time.") do |fixed_time|
+          options[:fixed_time] = fixed_time
+        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.rb

@@ -0,0 +1,6 @@
+class Log
+  def self.log(str)
+    puts "#{Time.now.strftime("%d/%m/%Y %H:%M:%S")} #{str}"
+  end
+end
+

data/lib/tn_s3_file_uploader/log_uploader.rb

@@ -26,10 +26,14 @@ module TnS3FileUploader
       file_path_generator = FilePathGenerator.new(options)
 
       log_files.each do |log_file|
-        time = last_modified_time(log_file)
+        if options[:fixed_time].nil? || options[:fixed_time].empty?
+          time = last_modified_time(log_file)
+        else
+          time = DateTime.strptime(options[:fixed_time], '%Y-%m-%d_%H:%M:%S').to_time
+        end
         destination_full_path = file_path_generator.dest_full_path_for(time, log_file)
 
-        puts "Found log file #{ log_file }, formatting file name for upload to S3 bucket #{ bucket } into folder #{ destination_full_path }"
+        Log.log "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)
         begin
@@ -86,7 +90,10 @@ module TnS3FileUploader
 
     def delete_file(file)
       file_path = Pathname.new(file)
-      File.delete(file) if file_path.file?
+      if file_path.file?
+        File.delete(file)
+        Log.log "Deleted file #{file}"
+      end
     end
   end
 

data/lib/tn_s3_file_uploader/runner.rb

@@ -14,21 +14,24 @@ module TnS3FileUploader
     def run
       add_log_error_reporter
       add_honeybadger
-      puts "Running TnS3FileUploader..." if @options[:verbose]
+      Log.log "Running TnS3FileUploader..." if @options[:verbose]
 
       upload
+    rescue => e
+      @error_report_manager.report_error(e, { :options => @options } )
     rescue Exception => e
       @error_report_manager.report_error(e, { :options => @options } )
+      raise
     end
 
     private
 
     def upload
       if @options[:verbose]
-        puts "Using:"
-        puts "log file pattern = #{ @options[:input_file_pattern] }"
-        puts "s3 dest folder = #{ @options[:s3_output_pattern] }"
-        puts "file timestamp resolution = #{ @options[:file_timestamp_resolution] }"
+        Log.log "Using:"
+        Log.log "log file pattern = #{ @options[:input_file_pattern] }"
+        Log.log "s3 dest folder = #{ @options[:s3_output_pattern] }"
+        Log.log "file timestamp resolution = #{ @options[:file_timestamp_resolution] }"
       end
 
       s3_client = create_s3_client

data/lib/tn_s3_file_uploader/s3.rb

@@ -37,9 +37,11 @@ module TnS3FileUploader
         s3_bucket = @s3_client.buckets[bucket]
         s3_file_path = s3_bucket.objects[dest_full_path]
 
-        puts "Uploading file #{file} to S3 bucket #{bucket} and path #{dest_full_path}"
+        Log.log "Uploading file #{file} to S3 bucket #{bucket} and path #{dest_full_path}"
 
         s3_file_path.write(File.open(file, 'rb'))
+
+        Log.log "Finished Uploading file #{file} to S3 bucket #{bucket} and path #{dest_full_path}"
       rescue StandardError, Timeout::Error => e
         if retry_count < MAX_RETRIES
           #This fixes a bug where the credentials may have rotated on the EC2 instance but the old values

data/lib/tn_s3_file_uploader/version.rb

@@ -1,3 +1,3 @@
 module TnS3FileUploader
-  VERSION = '0.1.12'
+  VERSION = '0.1.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tn_s3_file_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.15
 platform: ruby
 authors:
 - Thinknear.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: honeybadger
@@ -38,6 +38,90 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.35'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakes3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5.2
 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
@@ -55,6 +139,7 @@ files:
 - lib/tn_s3_file_uploader/error_reporting/honeybadger_error_reporter.rb
 - lib/tn_s3_file_uploader/error_reporting/log_error_reporter.rb
 - lib/tn_s3_file_uploader/file_path_generator.rb
+- lib/tn_s3_file_uploader/log.rb
 - lib/tn_s3_file_uploader/log_uploader.rb
 - lib/tn_s3_file_uploader/runner.rb
 - lib/tn_s3_file_uploader/s3.rb
@@ -79,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Amazon S3 file uploader