zooniverse_data 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04d2fd630674b787a643f6ef1143ae3636c3432
-  data.tar.gz: f0329fe298057f1a9eb412b0014b072c91d35573
+  metadata.gz: c177a4164665bc2d3b784b192f4cc2101139a83d
+  data.tar.gz: b7de110057268047631c9dcaeb9e3f355a3d63b0
 SHA512:
-  metadata.gz: 6ade5bc4f3958859d0b9e709df9449edc1cebbbb7b781685c8affe00de0499dbc06ae260395b96d95d9fb2fe9861738d0cbbaf734e5be1b6d8a8b83113ed7c54
-  data.tar.gz: 95bdc0b39012ab5b7926d2a536c959324ec08b813e4a41c4c4b0d2753b72afaa14c25bbe9cb1a05e2df54eb017defb2785e8728e2aa3684b7dd648efb33119fc
+  metadata.gz: 23680cf0621e8335a9ae7bf39fb66ee360024e27fb713520b2188f81ae4d76cea441a1dcf714cb678dd03387bb57ab5ff46eb8c8db39bb0ac6a0f7ce7c1011a0
+  data.tar.gz: 4427696fd4eccccedbd78403a4d9cb442d2ce676b546f4652b567c1cea62d15cca0df05d3a16328e26a309c772f98cff34ddae2e31da3b31ffb7cfca6695fa8f

data/lib/zooniverse_data/helpers/transport.rb

@@ -15,9 +15,7 @@ module ZooniverseData
       def download(from: nil, to: nil, timeout: 60)
         _with_retries(20) do
           `rm -f '#{ to }'`
-          Timeout::timeout(timeout) do
-            `wget '#{ from }' -t 50 -c -q -O '#{ to }'`
-          end
+          spawn_with_timeout command: "wget '#{ from }' -t 50 -c -q -O '#{ to }'", timeout: timeout
           
           raise 'File not downloaded' unless File.exists?(to)
           raise 'File is empty' unless File.new(to).size > 0
@@ -49,6 +47,20 @@ module ZooniverseData
         @bucket_path ||= manifest.project.bucket_path
       end
       
+      def spawn_with_timeout(command: command, timeout: timeout)
+        pid = Process.spawn command, close_others: true
+        
+        begin
+          Timeout::timeout(timeout) do
+            Process.wait pid
+          end
+        rescue => e
+          Process.kill 'TERM', pid
+          Process.detach pid
+          raise e
+        end
+      end
+      
       def _with_retries(retries)
         tries = 0
         begin

data/lib/zooniverse_data/version.rb

@@ -1,3 +1,3 @@
 module ZooniverseData
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zooniverse_data
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler