Add --timeout and --connection-timeout options (#128)

* Add --timeout and --connection-timeout options

* Only set max_retries if Ruby version is >= 2.5)

* Fix test (random failure)

Since the Minitest run tests concurrently, sometimes the "DispatchWithOneAuthorizedAccountTest" class runs after the "DispatchWithOneUsernameThatHasAuthorizedMultipleAccountsTest" run. In this case, "Twurl::OAuthClient.rcfile" has multiple profiles data in there and hence it fails with its mock checks.

Author: smaeda-ks

lib/twurl/cli.rb

@@ -89,6 +89,8 @@ def parse_options(args)
             file
             filefield
             base64
+            timeout
+            connection_timeout
           end
         end
 
@@ -326,6 +328,18 @@ def base64
           options.upload['base64'] = base64
         end
       end
+
+      def timeout
+        on('--timeout [sec]', Integer, 'Number of seconds to wait for the request to be read (default: 60)') do |timeout|
+          options.timeout = timeout
+        end
+      end
+
+      def connection_timeout
+        on('--connection-timeout [sec]', Integer, 'Number of seconds to wait for the connection to open (default: 60)') do |connection_timeout|
+          options.connection_timeout = connection_timeout
+        end
+      end
     end
   end
 

lib/twurl/oauth_client.rb

@@ -206,6 +206,10 @@ def to_hash
 
     def configure_http!
       consumer.http.set_debug_output(Twurl.options.debug_output_io) if Twurl.options.trace
+      consumer.http.read_timeout = consumer.http.open_timeout = Twurl.options.timeout || 60
+      consumer.http.open_timeout = Twurl.options.connection_timeout if Twurl.options.connection_timeout
+      # Only override if Net::HTTP support max_retries (since Ruby >= 2.5)
+      consumer.http.max_retries = 0 if consumer.http.respond_to?(:max_retries=)
       if Twurl.options.ssl?
         consumer.http.use_ssl     = true
         consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE

test/account_information_controller_test.rb

@@ -22,6 +22,7 @@ def setup
     @options    = Twurl::Options.test_exemplar
     @client     = Twurl::OAuthClient.load_new_client_from_options(options)
     mock(Twurl::OAuthClient.rcfile).save.times(1)
+    Twurl::OAuthClient.rcfile.profiles.clear
     Twurl::OAuthClient.rcfile << client
     @controller = Twurl::AccountInformationController.new(client, options)
   end
@@ -51,10 +52,14 @@ def setup
     @controller = Twurl::AccountInformationController.new(other_client, other_client_options)
   end
 
+  def teardown
+    Twurl::OAuthClient.rcfile.profiles[default_client.username][other_client.consumer_key].clear
+  end
+
   def test_authorized_account_is_displayed_and_marked_as_the_default
-    mock(Twurl::CLI).puts(default_client.username).times(1)
-    mock(Twurl::CLI).puts("  #{default_client.consumer_key} (default)").times(1)
-    mock(Twurl::CLI).puts("  #{other_client.consumer_key}").times(1)
+    mock(Twurl::CLI).puts(default_client.username).times(1).ordered
+    mock(Twurl::CLI).puts("  #{default_client.consumer_key} (default)").times(1).ordered
+    mock(Twurl::CLI).puts("  #{other_client.consumer_key}").times(1).ordered
 
     controller.dispatch
   end

test/cli_test.rb

@@ -239,4 +239,19 @@ def test_setting_proxy_updates_to_requested_value
     end
   end
   include ProxyOptionTests
+
+  module TimeoutOptionTests
+    def test_not_specifying_timeout_sets_it_to_nil
+      options = Twurl::CLI.parse_options([TEST_PATH])
+      assert_nil options.timeout
+      assert_nil options.connection_timeout
+    end
+
+    def test_setting_timeout_updates_to_requested_value
+      options = Twurl::CLI.parse_options([TEST_PATH, '--timeout', '10', '--connection-timeout', '5'])
+      assert_equal 10, options.timeout
+      assert_equal 5, options.connection_timeout
+    end
+  end
+  include TimeoutOptionTests
 end