u3d 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bfe15495d57985fcde5de0b62fd24f2e93030a7
-  data.tar.gz: c8dad256767bc49fcad1cac195063619dc386b05
+  metadata.gz: b9238d65caf5c8cd801183c0026863160a1a1441
+  data.tar.gz: fafc5dfb82ddc9ffea6f2a41d062514dd625b861
 SHA512:
-  metadata.gz: 76c8cb827b417c70a1a10a906a00edfbfb799c084939313d5ae01628990e39358483b7803f1bfcafc75fd82c75d9cddea87fa9e0128a23f55a90777079046f94
-  data.tar.gz: 588a9e685a918947aa9e3735eff675427f4ba164445eecde49159cdd0c5de822214b1035fe155660808676d143abebc2bc27b25421376439553058c5f8f4ea2b
+  metadata.gz: 0420a044e314bb6aeaeed0dd58cef0549d6b51f87daa65849315d5d12a6dda96bff473cb1c3db6a93af813925de69d91a17b14fece0130131fa06c5cf86730a9
+  data.tar.gz: 773144d01f6966c29a9b42342b3106c36e3c8c3d858aabce7fe503ecbad2ef195bcb6c5711962d02f4990541678dfadead0025e2d385956fabb54a35cc4cd39a

data/.github_changelog_generator

@@ -1,4 +1,4 @@
-future-release=v1.0.17
+future-release=v1.0.18
 since-tag=v0.9
 exclude_tags_regex=v0\.[0-8]\..*
 exclude-labels=nochangelog,question

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [v1.0.18](https://github.com/DragonBox/u3d/tree/v1.0.18) (2018-03-08)
+[Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.17...v1.0.18)
+
+**Closed issues:**
+
+- error: Net::ReadTimeout [\#258](https://github.com/DragonBox/u3d/issues/258)
+
+**Merged pull requests:**
+
+- u3d/\* allow to modify Net::HTTP read timeout \(all rubies\) and max retries \(ruby 2.5+\) default values. Change read time out to 300 sec \(fixes \#258\) [\#260](https://github.com/DragonBox/u3d/pull/260) ([lacostej](https://github.com/lacostej))
+
 ## [v1.0.17](https://github.com/DragonBox/u3d/tree/v1.0.17) (2018-03-05)
 [Full Changelog](https://github.com/DragonBox/u3d/compare/v1.0.16...v1.0.17)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    u3d (1.0.17)
+    u3d (1.0.18)
       colored (>= 1.2, < 2.0.0)
       commander (>= 4.4.0, < 5.0.0)
       file-tail (>= 1.2.0)

data/README.md

@@ -191,3 +191,11 @@ Your version of OpenSSL may be be outdated, make sure you are using the last one
  * __On Windows:__
 
 A fix to the issue stated above has been found on [StackOverflow](http://stackoverflow.com/questions/5720484/how-to-solve-certificate-verify-failed-on-windows). If you follow the steps described in this topic, you will most likely get rid of this issue.
+
+### Solve Connection failures
+
+If your network is flaky you might try to change the way u3d uses ruby's Net::HTTP trsnsport mechanism
+
+* set U3D_HTTP_READ_TIMEOUT (defaults 300 seconds) to change the http read timeout
+
+* U3D_HTTP_MAX_RETRIES (ruby 2.5 only, defaults 1). Ruby automatically retries once upon failures on idempotents methods. From ruby 2.5. you can change the number of time ruby might retry.

data/lib/u3d/utils.rb

@@ -58,7 +58,7 @@ module U3d
         uri = URI(url)
         begin
           use_ssl = /^https/.match(url)
-          Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
+          Net::HTTP.start(uri.host, uri.port, http_opts(use_ssl: use_ssl)) do |http|
             request = http_request_class http_method, uri
             request_headers.each do |k, v|
               request[k] = v
@@ -93,7 +93,7 @@ module U3d
           current = 0
           last_print_update = 0
           print_progress = UI.interactive? || U3dCore::Globals.verbose?
-          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+          Net::HTTP.start(uri.host, uri.port, http_opts(use_ssl: uri.scheme == 'https')) do |http|
             request = Net::HTTP::Get.new uri
             http.request request do |response|
               begin
@@ -129,7 +129,7 @@ module U3d
         UI.verbose "get_url_content_length #{url}"
         uri = URI(url)
         size = nil
-        Net::HTTP.start(uri.host, uri.port) do |http|
+        Net::HTTP.start(uri.host, uri.port, http_opts) do |http|
           response = http.request_head url
           size = Integer(response['Content-Length'])
         end
@@ -204,6 +204,26 @@ module U3d
       def windows_path(path)
         path.gsub(%r{\/(\d)}, '/\\\\\1').tr('/', '\\')
       end
+
+      private
+
+      def http_max_retries
+        ENV['U3D_HTTP_MAX_RETRIES'].to_i if ENV['U3D_HTTP_MAX_RETRIES']
+      end
+
+      def http_read_timeout
+        return ENV['U3D_HTTP_READ_TIMEOUT'].to_i if ENV['U3D_HTTP_READ_TIMEOUT']
+        300
+      end
+
+      def http_opts(opt = {})
+        # the keys are #ca_file, #ca_path, cert, #cert_store, ciphers, #close_on_empty_response, key, #open_timeout,
+        # #read_timeout, #ssl_timeout, #ssl_version, use_ssl, #verify_callback, #verify_depth and verify_mode
+        opt[:max_retries] = http_max_retries if http_max_retries
+        opt[:read_timeout] = http_read_timeout if http_read_timeout
+        UI.verbose "Using http opts: #{opt}"
+        opt
+      end
     end
   end
   # rubocop:enable ModuleLength

data/lib/u3d/version.rb

@@ -21,7 +21,7 @@
 ## --- END LICENSE BLOCK ---
 
 module U3d
-  VERSION = '1.0.17'.freeze
+  VERSION = '1.0.18'.freeze
   DESCRIPTION = 'Provides numerous tools for installing, managing and running the Unity3D game engine from command line.'.freeze
   UNITY_VERSIONS_NOTE = "Unity3d uses the following version formatting: 0.0.0x0. The \'x\' can takes different values:\n"\
   "\t. 'f' are the main release candidates for Unity3d\n"\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u3d
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Jerome Lacoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored