sluice 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,21 @@
+Version 0.1.3 (2013-10-02)
+--------------------------
+Added Ruby thread timeout monitoring (#4)
+
+Version 0.1.2 (2013-09-10)
+--------------------------
+Fixed bug in manifest copy code
+
+Version 0.1.1 (2013-09-10)
+--------------------------
+Fixed warning from Fog::Storage::AWS::File alias
+
+Version 0.1.0 (2013-09-09)
+--------------------------
+Added ability to copy using a manifest
+Added thread index to file operation puts
+Added Contracts for some initial contract assertions
+
 Version 0.0.9 (2013-08-14)
 --------------------------
 Added ability to move and copy files between two different AWS accounts

data/lib/sluice/storage/s3.rb

@@ -17,6 +17,7 @@ require 'set'
 require 'tmpdir'
 require 'fog'
 require 'thread'
+require 'timeout'
 
 require 'contracts'
 include Contracts
@@ -32,6 +33,7 @@ module Sluice
       CONCURRENCY = 10 # Threads
       RETRIES = 3      # Attempts
       RETRY_WAIT = 10  # Seconds
+      TIMEOUT_WAIT = 100 # Waiting longer reduces the chance that whatever caused the timeout recurs
 
       # Aliases for Contracts
       FogStorage = Fog::Storage::AWS::Real
@@ -737,20 +739,22 @@ module Sluice
       end
       module_function :glob_files
 
-
       # A helper function to attempt to run a
       # function retries times
       #
       # Parameters:
-      # +function+:: Function to run
+      # +object+:: Object to send our function to
+      # +send_args+:: Function plus arguments
       # +retries+:: Number of retries to attempt
       # +attempt_msg+:: Message to puts on each attempt
       # +failure_msg+:: Message to puts on each failure
       def retry_x(object, send_args, retries, attempt_msg, failure_msg)
         i = 0
         begin
-          object.send(*send_args)
-          puts attempt_msg
+          Timeout::timeout(TIMEOUT_WAIT) do # In case our operation times out
+            object.send(*send_args)
+            puts attempt_msg
+          end
         rescue
           raise unless i < retries
           puts failure_msg
@@ -774,7 +778,7 @@ module Sluice
       # +add_path+:: If this is set, add this to the front of the path
       # +flatten+:: strips off any sub-folders below the from_location
       #
-      # TODO: this really needs unit tests
+      # TODO: this badly needs unit tests
       def name_file(filepath, new_filename, remove_path=nil, add_path=nil, flatten=false)
 
         # First, replace the filename in filepath with new one

data/lib/sluice.rb

@@ -19,5 +19,5 @@ require 'sluice/storage/s3'
 
 module Sluice
   NAME    = "sluice"
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sluice
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog