From 6f719b89451e9050f36e19934a03aa1e07dafd19 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Sat, 25 Apr 2020 13:21:09 -0500 Subject: [PATCH 1/5] Adding port setter to action interface of socket_server --- fastlane/lib/fastlane/commands_generator.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fastlane/lib/fastlane/commands_generator.rb b/fastlane/lib/fastlane/commands_generator.rb index b93c2068ba1..2cedc1b83d2 100644 --- a/fastlane/lib/fastlane/commands_generator.rb +++ b/fastlane/lib/fastlane/commands_generator.rb @@ -141,10 +141,12 @@ def run c.description = 'Starts local socket server and enables only a single local connection' c.option('-s', '--stay_alive', 'Keeps socket server up even after error or disconnects, requires CTRL-C to kill.') c.option('-c seconds', '--connection_timeout', 'Sets connection established timeout') + c.option('-p port', '--port', "Sets the port on localhost for the socket connection") c.action do |args, options| default_connection_timeout = 5 stay_alive = options.stay_alive || false connection_timeout = options.connection_timeout || default_connection_timeout + port = options.port || 2000 if stay_alive && options.connection_timeout.nil? UI.important("stay_alive is set, but the connection timeout is not, this will give you #{default_connection_timeout} seconds to (re)connect") @@ -157,7 +159,8 @@ def run server = Fastlane::SocketServer.new( command_executor: command_executor, connection_timeout: connection_timeout, - stay_alive: stay_alive + stay_alive: stay_alive, + port: port ) result = server.start UI.success("Result: #{result}") if result From e0b904e7eb3337cc3790adfe5058b9349844f975 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Sat, 25 Apr 2020 15:56:23 -0500 Subject: [PATCH 2/5] Trailing whitespace caused lint failure --- fastlane/lib/fastlane/commands_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/lib/fastlane/commands_generator.rb b/fastlane/lib/fastlane/commands_generator.rb index 2cedc1b83d2..b8836e1483d 100644 --- a/fastlane/lib/fastlane/commands_generator.rb +++ b/fastlane/lib/fastlane/commands_generator.rb @@ -159,7 +159,7 @@ def run server = Fastlane::SocketServer.new( command_executor: command_executor, connection_timeout: connection_timeout, - stay_alive: stay_alive, + stay_alive: stay_alive, port: port ) result = server.start From fdf53bbdb6325514dcca367b24bf3390851637b5 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Fri, 19 Jun 2020 07:40:54 -0500 Subject: [PATCH 3/5] Adding error detail for socket server --- fastlane/lib/fastlane/server/socket_server.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fastlane/lib/fastlane/server/socket_server.rb b/fastlane/lib/fastlane/server/socket_server.rb index ff6155ab068..8274714315e 100644 --- a/fastlane/lib/fastlane/server/socket_server.rb +++ b/fastlane/lib/fastlane/server/socket_server.rb @@ -215,6 +215,9 @@ def execute_action_command(command: nil) exception_array << "#{e.class}:" exception_array << e.backtrace + ec = e.class + em = e.message + while e.respond_to?("cause") && (e = e.cause) exception_array << "cause: #{e.class}" exception_array << e.backtrace @@ -223,7 +226,9 @@ def execute_action_command(command: nil) payload = { payload: { status: "failure", - failure_information: exception_array.flatten + failure_information: exception_array.flatten, + failure_class: ec, + failure_message: em } } return JSON.generate(payload) From 94ca21127f888ab2d3e82e3fe45c2081b5441f5e Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Fri, 19 Jun 2020 08:17:24 -0500 Subject: [PATCH 4/5] Fixing trailing whitespace --- fastlane/lib/fastlane/server/socket_server.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fastlane/lib/fastlane/server/socket_server.rb b/fastlane/lib/fastlane/server/socket_server.rb index 8274714315e..cd5078be6d1 100644 --- a/fastlane/lib/fastlane/server/socket_server.rb +++ b/fastlane/lib/fastlane/server/socket_server.rb @@ -216,6 +216,7 @@ def execute_action_command(command: nil) exception_array << e.backtrace ec = e.class + em = e.message while e.respond_to?("cause") && (e = e.cause) @@ -227,7 +228,7 @@ def execute_action_command(command: nil) payload: { status: "failure", failure_information: exception_array.flatten, - failure_class: ec, + failure_class: ec, failure_message: em } } From bc373e76a7eece70953cf657356f7d444f3bf005 Mon Sep 17 00:00:00 2001 From: Ray Deck Date: Fri, 19 Jun 2020 08:25:51 -0500 Subject: [PATCH 5/5] Clearing blank spaces from blank line (thank you rubocop) --- fastlane/lib/fastlane/server/socket_server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/lib/fastlane/server/socket_server.rb b/fastlane/lib/fastlane/server/socket_server.rb index cd5078be6d1..fac270f7372 100644 --- a/fastlane/lib/fastlane/server/socket_server.rb +++ b/fastlane/lib/fastlane/server/socket_server.rb @@ -216,7 +216,7 @@ def execute_action_command(command: nil) exception_array << e.backtrace ec = e.class - + em = e.message while e.respond_to?("cause") && (e = e.cause)