lib/cucumber/cli/drb_client.rb in aslakhellesoy-cucumber-0.3.95 vs lib/cucumber/cli/drb_client.rb in aslakhellesoy-cucumber-0.3.96

@@ -5,17 +5,21 @@
   module Cli
     class DRbClientError < StandardError
     end
     # Runs features on a DRB server, originally created with Spork compatibility in mind.
     class DRbClient
-      def self.run(args, error_stream, out_stream)
+      DEFAULT_PORT = 8990
+
+      def self.run(args, error_stream, out_stream, port = nil)
+        port ||= ENV["CUCUMBER_DRB"] || DEFAULT_PORT
+
         # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
         DRb.start_service("druby://localhost:0")
-        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
+        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port}")
         cloned_args = [] # I have no idea why this is needed, but if the regular args are sent then DRb magically transforms it into a DRb object - not an array
         args.each { |arg| cloned_args << arg }
         feature_server.run(cloned_args, error_stream, out_stream)
-      rescue DRb::DRbConnError
+      rescue DRb::DRbConnError => e
         raise DRbClientError, "No DRb server is running."
       end
     end
   end
 end