tn_s3_file_uploader 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b2e3f098206b3194879ade9ab5cc75c6bd4ec9
-  data.tar.gz: 2f93dd63c4030a697f1c349f6865410809365b87
+  metadata.gz: 7eaa24797da8fe43d9f3c72169f9d41686eaec5e
+  data.tar.gz: 855f649660e7ddd96c0d2e26663b92cfc546e92d
 SHA512:
-  metadata.gz: e71475027f97915edf5def8c2c88b4adcd6c10d0fd6c23bfe99a15d75c6bbf8facf1b80a8e4779ebb2d710cbba0fb4f0f91e461ba28a2cad27824a3b6e5af6c6
-  data.tar.gz: e0f808c0cc1423a0fe71cf79b657c7023bc2d456641c219966187ba2c4d07d141b8e3fa07deb217564804ac7b82ec6ea563ec96a3ce885d030beaa6df8c00496
+  metadata.gz: 40d472d1a25293fa8f057fa06b8d8b9b9339ec279f1cb8c8202dd16885be22b8c11ff6477416be77ddeddd4ba5601c44a71c5242543d9a292b23e10758a92931
+  data.tar.gz: 96335682165b4ecd26d0f7a9bc3ab33017c5134b6a6301e101d0cced5d7489d678a459f2849495ed39570689f22f4ed97bc87795111cccba4724ae034d380f82

data/lib/tn_s3_file_uploader/error_reporting/honeybadger_error_reporter.rb

@@ -1,4 +1,5 @@
 require 'honeybadger'
+require 'net/http'
 
 module TnS3FileUploader
 
@@ -7,8 +8,11 @@ module TnS3FileUploader
 
     # Configure honeybadger with provided api-key. Assumes api-key is not null
     def initialize(api_key)
+      # configure the hostname on EC2 instances
+      hostname = Net::HTTP.get('169.254.169.254', '/latest/meta-data/hostname') rescue nil
       Honeybadger.configure do |config|
         config.api_key = api_key
+        config.hostname = hostname if hostname # don't set
       end
     end
 
@@ -17,4 +21,4 @@ module TnS3FileUploader
     end
   end
 
-end
+end

data/lib/tn_s3_file_uploader/file_path_generator.rb

@@ -15,10 +15,9 @@ module TnS3FileUploader
   # date = Wed Jun 18 19:03:40 UTC 2014
   class FilePathGenerator
 
-    def initialize(time, options)
+    def initialize(options)
       #Find the last rotation window
       @options = options
-      @time = previous_rotation_window(time)
     end
 
 
@@ -26,15 +25,15 @@ module TnS3FileUploader
     # Assumes input file 'file' and s3_output_pattern option are both valid.
     # This method removes the bucket (everything until the first '/', including the '/') from the s3_output_pattern
     # while applying the datetime/macro/substitutions
-    def dest_full_path_for(file)
-
+    def dest_full_path_for(time, file)
+      time = previous_rotation_window(time)
       output_file_pattern = remove_bucket(@options[:s3_output_pattern])
 
       # Time#strftime is removing '%' characters on our macros. Our macro substitution must run first
-      subs = build_substitutions(file)
+      subs = build_substitutions(file, time)
       replace_macros!(output_file_pattern, subs)
 
-      substitute_datetime_macros(output_file_pattern)
+      substitute_datetime_macros(time, output_file_pattern)
     end
 
     private
@@ -48,13 +47,13 @@ module TnS3FileUploader
     #  Given s3_output_pattern y=%Y/m=%m/d=%d/h=%H
     #  and time: Thu Jun 12 23:57:49 UTC 2014
     #  it will produce the following folder structure: y=2014/m=06/d=12/h=23
-    def substitute_datetime_macros(output_pattern)
-      @time.strftime(output_pattern)
+    def substitute_datetime_macros(time, output_pattern)
+      time.strftime(output_pattern)
     end
 
     # Generates rounded off timestamp based on rotation_seconds
-    def generate_file_timestamp
-      @time.strftime('%Y%m%d%H%M%S')
+    def generate_file_timestamp(time)
+      time.strftime('%Y%m%d%H%M%S')
     end
 
     def replace_macros!(output_file_pattern, subs)
@@ -111,7 +110,7 @@ module TnS3FileUploader
       resolve_ip =~ /\d+\.\d+\.\d+\.\d+/
     end
 
-    def build_substitutions(file)
+    def build_substitutions(file, time)
       file_components = file.split('/').last.split('.')
 
       if file_components.size == 1
@@ -124,7 +123,7 @@ module TnS3FileUploader
       
       ip_address = local_ip.gsub('.', '-')
       
-      file_timestamp = generate_file_timestamp
+      file_timestamp = generate_file_timestamp(time)
 
       {
           '%{file-name}' => file_name,

data/lib/tn_s3_file_uploader/log_uploader.rb

@@ -21,13 +21,13 @@ module TnS3FileUploader
     def upload_log_files(options)
       raise ArgumentError, 's3_output_pattern cannot be empty' if blank?(options[:s3_output_pattern])
       bucket = check_bucket_dest_path(options[:s3_output_pattern])
-      log_files = check_log_file(options[:input_file_pattern])
+      log_files = check_log_files(options[:input_file_pattern])
 
-      now = Time.now.utc
-      file_path_generator = FilePathGenerator.new(now, options)
+      file_path_generator = FilePathGenerator.new(options)
 
       log_files.each do |log_file|
-        destination_full_path = file_path_generator.dest_full_path_for(log_file)
+        time = last_modified_time(log_file)
+        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 }"
 
@@ -45,7 +45,7 @@ module TnS3FileUploader
     end
 
     private
-    def check_log_file(log_file_pattern)
+    def check_log_files(log_file_pattern)
       raise ArgumentError, 'log file pattern cannot be nil' if log_file_pattern == nil
 
       last_folder_separator = log_file_pattern.rindex('.')
@@ -63,6 +63,10 @@ module TnS3FileUploader
       path_components.first
     end
 
+    def last_modified_time(file)
+      File.mtime(file)
+    end
+
     def blank?(str)
       str.nil? || str == ""
     end

data/lib/tn_s3_file_uploader/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tn_s3_file_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Thinknear.com
@@ -14,28 +14,28 @@ dependencies:
   name: honeybadger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.35'
 description: Amazon S3 file uploader that can build folder structures based on timestamp.
@@ -69,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.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Amazon S3 file uploader