fastlane/lib/fastlane/server/socket_server.rb in fastlane-2.86.0.beta.20180316050051 vs fastlane/lib/fastlane/server/socket_server.rb in fastlane-2.86.0.beta.20180317050040

@@ -192,15 +192,22 @@
       else
         closure_arg = return_value_processor.prepare_object(
           return_value: closure_arg,
           return_value_type: :string # always assume string for closure error_callback
         )
-        closure_arg = ', "closure_argument_value": ' + closure_arg
       end
 
       Thread.current[:exception] = nil
-      return '{"payload":{"status":"ready_for_next", "return_object":' + return_object + closure_arg + '}}'
+
+      payload = {
+        payload: {
+          status: "ready_for_next",
+          return_object: return_object,
+          closure_argument_value: closure_arg
+        }
+      }
+      return JSON.generate(payload)
     rescue StandardError => e
       Thread.current[:exception] = e
 
       exception_array = []
       exception_array << "#{e.class}:"
@@ -208,9 +215,16 @@
 
       while e.respond_to?("cause") && (e = e.cause)
         exception_array << "cause: #{e.class}"
         exception_array << e.backtrace
       end
-      return "{\"payload\":{\"status\":\"failure\",\"failure_information\":#{exception_array.flatten}}}"
+
+      payload = {
+        payload: {
+          status: "failure",
+          failure_information: exception_array.flatten
+        }
+      }
+      return JSON.generate(payload)
     end
   end
 end