uses new binary with logfile

Author: tr4n2uil

lib/browserstack/local.rb

@@ -13,6 +13,7 @@ def initialize(key = nil, binary_path = nil)
       else
         binary_path
       end
+    @logfile = File.join(Dir.pwd, "local.log")
   end
 
   def add_args(key, value=nil)
@@ -43,6 +44,8 @@ def add_args(key, value=nil)
       @proxy_pass = "-proxyPass '#{value}'"
     elsif key == "hosts"
       @hosts = value
+    elsif key == "logfile"
+      @logfile = value
     end
   end
 
@@ -51,8 +54,9 @@ def start(options = {})
       self.add_args(key, value)
     end
 
+    system("echo '' > '#{@logfile}'")
     @process = IO.popen(command, "w+")
-    @stdout = @process # File.open("local.log", "r")
+    @stdout = File.open(@logfile, "r")
 
     while true
       begin
@@ -63,14 +67,14 @@ def start(options = {})
       end
       break if line.nil?
       if line.match(/\*\*\* Error\:/)
-        #@stdout.close
+        @stdout.close
         raise BrowserStack::LocalException.new(line)
         return
       end
       if line.strip == "Press Ctrl-C to exit"
         @pid = @process.pid
-        #@stdout.close
-        return
+        @stdout.close
+        break
       end
     end
 
@@ -81,7 +85,7 @@ def start(options = {})
   end
 
   def isRunning
-    resp = Net::HTTP.get(URI.parse("http://bs-local.com:45690/check")) rescue nil
+    resp = Net::HTTP.get(URI.parse("http://bs-local.com:45691/check")) rescue nil
     resp && !resp.match(/running/i).nil?
   end
 
@@ -96,7 +100,7 @@ def stop
   end
 
   def command
-    "#{@binary_path} #{@folder_flag} #{@key} #{@folder_path} #{@force_local_flag} #{@local_identifier_flag} #{@only_flag} #{@only_automate_flag} #{@proxy_host} #{@proxy_port} #{@proxy_user} #{@proxy_pass} #{@force_flag} #{@verbose_flag} #{@hosts}".strip
+    "#{@binary_path} -logFile '#{@logfile}' #{@folder_flag} #{@key} #{@folder_path} #{@force_local_flag} #{@local_identifier_flag} #{@only_flag} #{@only_automate_flag} #{@proxy_host} #{@proxy_port} #{@proxy_user} #{@proxy_pass} #{@force_flag} #{@verbose_flag} #{@hosts}".strip
   end
 end
 

lib/browserstack/localbinary.rb

@@ -24,7 +24,7 @@ def initialize
     end
 
     @ordered_paths = [
-      File.expand_path('~'), '.browserstack',
+      File.join(File.expand_path('~'), '.browserstack'),
       Dir.pwd,
       Dir.tmpdir
     ]