autobuild 1.7.12.rc2 → 1.7.12.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8234de2ac14d70f6a0ba20323e943201239e53f6
-  data.tar.gz: a88615940aa5ef63a19453dae31428cafecc1094
+  metadata.gz: a04618bec2f92c5374c80a7166bdb174144169de
+  data.tar.gz: 5c17a0d85b9f02af76105a7c143588d8a9e9da97
 SHA512:
-  metadata.gz: 421bb6eb83d12e2b506e1e32418cf86e54c182b2f34eaf3a4be170d1dad7500853766d1b3cdb43ccc0273aa60986b9b48b6b73b0df661f32eb13efe3ce490d25
-  data.tar.gz: 96d4d1d69a2c084d6fb056508c9d099a4a8e56f55ab39e52aff63314aca44925a6b740e96166e8e9b22d54d7624e609e54414862292eefb6505c07e01c7dacf0
+  metadata.gz: 4f6feaf5fcbfc5fcb55c4bbe64e424cbfeec1e54a597d0fc21dae920799e0a4cf47e98707f6b70457d97fa7c47ec4e07165f6cdc3b36b42a369e7f32d8a1c79b
+  data.tar.gz: 4e11f1f217942cd23a0651ffd01fedba0a25852e994724b9b11180a81c976cd8f6ca01adce161399ae954588a458fdc0df3bd72f617dd0966ecdb4ec356858dd

data/lib/autobuild/import/archive.rb

@@ -52,8 +52,23 @@ module Autobuild
 
             # Sets the directory in which files get cached
             attr_writer :cachedir
-        end
 
+            # The timeout (in seconds) used during downloading.
+            #
+            # With wget, it is the timeout used for DNS resolution, connection and
+            # idle time (time without receiving data)
+            #
+            # It defaults to 5s
+            attr_accessor :timeout
+
+            # The number of time we should retry downloading if the underlying tool
+            # supports it (wget does).
+            #
+            # It defaults to 1 as autobuild has its own retry mechanism
+            attr_accessor :retries
+        end
+        @retries = 1
+        @timeout = 10
         @cachedir = nil
 
 	# Returns the unpack mode from the file name
@@ -161,7 +176,14 @@ module Autobuild
                     if(WINDOWS)
                         get_url_on_windows(@url, "#{cachefile}.partial")
                     else
-                        Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, @url, '-O', "#{cachefile}.partial")
+                        additional_options = []
+                        if timeout = self.timeout
+                            additional_options << "--timeout" << timeout
+                        end
+                        if retries = self.retries
+                            additional_options << "--tries" << retries
+                        end
+                        Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, *additional_options, @url, '-O', "#{cachefile}.partial")
                     end
                 rescue Exception
                     FileUtils.rm_f "#{cachefile}.partial"
@@ -205,6 +227,20 @@ module Autobuild
         # is the same than the source dir
         def archive_dir; @options[:archive_dir] || tardir end
 
+        # The number of time we should retry downloading if the underlying tool
+        # supports it (wget does).
+        #
+        # It defaults to the global ArchiveImporter.retries
+        attr_accessor :retries
+
+        # The timeout (in seconds) used during downloading.
+        #
+        # With wget, it is the timeout used for DNS resolution, connection and
+        # idle time (time without receiving data)
+        #
+        # It defaults to the global ArchiveImporter.timeout
+        attr_accessor :timeout
+
 	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
 	# are allowed:
 	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
@@ -220,6 +256,8 @@ module Autobuild
                 @options[:update_cached_file] = false
             end
             @cachedir = @options[:cachedir] || ArchiveImporter.cachedir
+            @retries = @options[:retries] || ArchiveImporter.retries
+            @timeout = @options[:timeout] || ArchiveImporter.timeout
 
             relocate(url)
         end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.12.rc2" unless defined? Autobuild::VERSION
+    VERSION = "1.7.12.rc3" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.12.rc2
+  version: 1.7.12.rc3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake