Commits

Brett Giles committed 3d25dfe

Add some comments and add one further try for starting processes

Needed extra level of .. since project restructure.
Makes it work properly for rspec and cucumber tests -either direct or via rake

Comments (0)

Files changed (1)

GUI/src/communications/connection.rb

     else
       jar_path = File.expand_path(File.dirname(__FILE__))+"/../../"
     end
-    #puts " will try from #{jar_path}"
+    # puts " will try from #{jar_path}"
     if !res
       begin
+        # try executing from PATH first - probably not right for testing.... 
+        #TODO - add flag to pick order of these.
         @process=ProcessBuilder.new(@connect_to, "").start
         sleep 0.25
         res2 = _make_connection
         raise ServerProcessNotFound if !res2
       rescue => e
         begin
+          # Assume executables just below jar path 
+          # Works for bundled executables.
           @process=ProcessBuilder.new("#{jar_path}bin/#{@connect_to}", "").start
           sleep 0.25
           res2 = _make_connection
           raise ServerProcessNotFound if !res2
         rescue => e1
-          raise ServerProcessNotFound, "There was no process found on port #{@port}. Please start '#{@connect_to}'."
+          begin
+            # assume one further .. and then over to out/bin 
+            # works for rspec and cucumber 
+            @process=ProcessBuilder.new("#{jar_path}../out/bin/#{@connect_to}", "").start
+            sleep 0.25
+            res2 = _make_connection
+            raise ServerProcessNotFound if !res2
+          rescue => e2
+            raise ServerProcessNotFound, "There was no process found on port #{@port}. Please start '#{@connect_to}'."
+          end
         end
       end
     end
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.