tn_s3_file_uploader 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjFiMTNlOTlmYjQzODc3M2FjMjE1ZGYzMjM3MDM3ZmM0NmFmM2VjYg==
+  data.tar.gz: !binary |-
+    MjQ2YzdkMGMwMWI1YjA4MGRlNDI2YmVjYzFlMzE3N2IyYzJiZDQ5Zg==
+SHA512:
+  metadata.gz: !binary |-
+    NGE0OTExNjIwNmIwOWEyNzI2OWM5NmU2MGUzMTUxNzZkZDY1MjlhZjM3ZGEz
+    ZjQ1ZWJlMGE0MGMxOGRlZTA1OTMyMWNhMjViNTAwMWFhOGM5NmU4MDI1YTUy
+    NzJiZTlmN2EyYzRiNGJiZmRjZTU4Yzg3NzI2MDA5YjJlMGZjYzg=
+  data.tar.gz: !binary |-
+    YzFiMGQ1Mjc3NWQ2MjUyMGZmYjg0MDIxOGFiNjc4N2E1MjY1OTdmN2YwYzll
+    NDEyMWExM2ZlZjdkNTdmOWQ0MjNjZjNmNmExNjA2N2VhMmU1MzBkZTUzMWVl
+    OTlhYTIzNmQ2MGM1ZmU5ZjNmYjYzMDQ2MTJiMDI5MjUyY2IwMWE=

data/lib/tn_s3_file_uploader/cli_parser.rb

@@ -44,6 +44,14 @@ module TnS3FileUploader
         opts.on("--aws-secret-access-key AWS-SECRET-ACCESS-KEY", "Provide the AWS secret access key") do |aws_secret_access_key|
           options[:aws_secret_access_key] = aws_secret_access_key
         end
+        
+        # Default: Google's static IP
+        options[:udp_resolve_ip] = '64.233.187.99'
+        opts.on("--udp_resolve_ip RESOLVE-IP", "Lookup IP to determine active network interface local IP.") do |resolve_ip|
+          if resolve_ip =~ /\d+\.\d+\.\d+\.\d+/
+            options[:udp_resolve_ip] = resolve_ip
+          end
+        end
 
         opts.on("-v", "--verbose", "Display verbose output") do |v|
           options[:verbose] = !v.nil?

data/lib/tn_s3_file_uploader/file_path_generator.rb

@@ -63,6 +63,54 @@ module TnS3FileUploader
       end
     end
 
+    # First tries to find local IP using UDPSocket technique.
+    # In the event of a failure, we will revert to using the old
+    # method of local ip retrieval.  In the event that both techniques
+    # fail, we return a default value
+    def local_ip
+      resolve_ip = @options[:udp_resolve_ip]
+      ip_address = nil
+      
+      unless resolve_ip.nil?
+        ip_address = udp_resolve_ip(resolve_ip)
+      end
+
+      unless ip_address.nil? or valid_ip?(ip_address)
+        ip_address = hostname_resolve_ip
+      end
+
+      unless valid_ip?(ip_address)
+        ip_address = '0.0.0.0'
+      end
+      
+      ip_address
+    end
+
+    # Finds public local IP by tracing a UDP route.
+    # Note: This code does NOT make a connection or send any packets to the listed resolve_ip
+    # UDP is a stateless protocol, the connect method makes
+    # a system call to determine packet routing based on address and what interface it
+    # should bind to. addr returns an array containing the family, local port and local address
+    # The local address is the last element in the addr array.
+    def udp_resolve_ip(resolve_ip)
+      orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
+
+      UDPSocket.open do |s|
+        s.connect resolve_ip, 1
+        s.addr.last
+      end
+    ensure
+      Socket.do_not_reverse_lookup = orig
+    end
+    
+    def hostname_resolve_ip
+      IPSocket.getaddress(Socket.gethostname)
+    end
+
+    def valid_ip?(resolve_ip)
+      resolve_ip =~ /\d+\.\d+\.\d+\.\d+/
+    end
+
     def build_substitutions(file)
       file_components = file.split('/').last.split('.')
 
@@ -73,8 +121,9 @@ module TnS3FileUploader
         file_name = file_components[0..-2].join('.')
         file_extension = file_components.last
       end
-
-      ip_address = IPSocket.getaddress(Socket.gethostname).gsub('.', '-')
+      
+      ip_address = local_ip.gsub('.', '-')
+      
       file_timestamp = generate_file_timestamp
 
       {

data/lib/tn_s3_file_uploader/version.rb

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

metadata

@@ -1,48 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: tn_s3_file_uploader
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Thinknear.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: honeybadger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: !binary |-
+          MS4xNQ==
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: !binary |-
+          MS4xNQ==
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.35'
+        version: !binary |-
+          MS4zNQ==
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.35'
+        version: !binary |-
+          MS4zNQ==
 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
@@ -51,7 +50,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
 - bin/tn_s3_file_uploader
+- lib/tn_s3_file_uploader.rb
 - lib/tn_s3_file_uploader/cli_parser.rb
 - lib/tn_s3_file_uploader/error_reporting/error_report_manager.rb
 - lib/tn_s3_file_uploader/error_reporting/honeybadger_error_reporter.rb
@@ -61,32 +63,28 @@ files:
 - lib/tn_s3_file_uploader/runner.rb
 - lib/tn_s3_file_uploader/s3.rb
 - lib/tn_s3_file_uploader/version.rb
-- lib/tn_s3_file_uploader.rb
-- README.md
-- LICENSE.txt
 homepage: http://www.thinknear.com
 licenses:
 - Copyright (c) ThinkNear 2014, Licensed under APLv2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Amazon S3 file uploader
 test_files: []