added path ordering

Author: tr4n2uil

.gitignore

@@ -1 +1,2 @@
 dist/*
+*.log

lib/browserstack/local.rb

@@ -1,4 +1,5 @@
 require 'browserstack/localbinary'
+require 'browserstack/localexception'
 
 module BrowserStack
 
@@ -51,17 +52,24 @@ def start(options = {})
     end
 
     @process = IO.popen(command, "w+")
+    @stdout = @process # File.open("local.log", "r")
 
     while true
-      line = @process.readline
+      begin
+        line = @stdout.readline
+      rescue EOFError => e
+        sleep 1
+        next
+      end
       break if line.nil?
       if line.match(/\*\*\* Error\:/)
-        @process.close
+        #@stdout.close
         raise BrowserStack::LocalException.new(line)
         return
       end
       if line.strip == "Press Ctrl-C to exit"
         @pid = @process.pid
+        #@stdout.close
         return
       end
     end
@@ -79,16 +87,17 @@ def isRunning
 
   def stop
     return if @pid.nil?
-    Process.kill("INT", @pid)
+    Process.kill("TERM", @pid)
     @process.close
+    while true
+      break if !self.isRunning
+      sleep 1
+    end
   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
   end
 end
 
-class LocalException < Exception
-end
-
 end

lib/browserstack/localbinary.rb

@@ -1,6 +1,8 @@
 require 'net/http'
 require 'rbconfig'
 require 'openssl'
+require 'tmpdir'
+require 'browserstack/localexception'
 
 module BrowserStack
 
@@ -20,10 +22,15 @@ def initialize
         "https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-linux-ia32"
       end
     end
+
+    @ordered_paths = [
+      File.expand_path('~'), '.browserstack',
+      Dir.pwd,
+      Dir.tmpdir
+    ]
   end
 
-  def download
-    dest_parent_dir = File.join(File.expand_path('~'), '.browserstack')
+  def download(dest_parent_dir)
     unless File.exists? dest_parent_dir
       Dir.mkdir dest_parent_dir
     end
@@ -44,12 +51,37 @@ def download
   end
 
   def binary_path
-    dest_parent_dir = File.join(File.expand_path('~'), '.browserstack')
+    dest_parent_dir = get_available_dirs
     binary_path = File.join(dest_parent_dir, "BrowserStackLocal#{".exe" if @windows}")
     if File.exists? binary_path
       binary_path
     else
-      download
+      download(dest_parent_dir)
+    end
+  end
+
+  private
+
+  def get_available_dirs
+    i = 0
+    while i < @ordered_paths.size
+      path = @ordered_paths[i]
+      if make_path(path)
+        return path
+      else
+        i += 1
+      end
+    end
+    raise BrowserStack::LocalException.new('Error trying to download BrowserStack Local binary')
+  end
+
+  def make_path(path)
+    begin
+      FileUtils.mkdir_p path if !Dir.exists?(path)
+      return true
+    rescue Exception => e
+      puts "Exception #{e.message} #{e.backtrace}"
+      return false
     end
   end
 end

lib/browserstack/localexception.rb

@@ -0,0 +1,6 @@
+module BrowserStack
+
+class LocalException < Exception
+end
+
+end