browserstack-local 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 5d165e23a715b330fcf2c3dbe33860e2e2f5a0c8
-  metadata.gz: 8be0a0a95c792545d44b01d8b43556122f415c4d
-SHA512: 
-  data.tar.gz: 0b76a4768326160eda7215882342bb014171c208e515b7557ec9fdab85c258b0589bb88eef0dc4671f942009334b358e667913bb9b81beff227dda22e02f93dc
-  metadata.gz: e244686c43bbfaf5c5b38f41ad23f9e328696a2b9b37e7b19d5f4eccfe3605658dd4283c03bead096cdfa2895fe7eef326d96c179cbb0b9fd2ed8a84324ffc0c
+---
+SHA1:
+  metadata.gz: d541957388e64cbdad7bc093668847a766e7f9c5
+  data.tar.gz: f2bcb422bfc207099bd1c0b6850df622604c273c
+SHA512:
+  metadata.gz: 95efa89f9cfd3caae8aa800138560b5a77ba079d7d37664b92105dd1d6bb4097f620d4c0741ea13d4394a92be655f114b04276934a8fb7a7f5b93b5ecea81953
+  data.tar.gz: 437c1c49a5c1fbb67d80e326a7128a19c21cea2a30cbe72577987066d7b5a94cded3508ffa9bfe1dedb2a889364a0874a94c6b178b88dd5c25a6167408487ef9

data/lib/browserstack/local.rb

@@ -1,5 +1,6 @@
 require 'browserstack/localbinary'
 require 'browserstack/localexception'
+require 'json'
 
 module BrowserStack
 
@@ -75,36 +76,29 @@ class Local
     end
 
     if defined? spawn
-      @process = IO.popen(command_args)
+      @process = IO.popen(start_command_args)
     else
-      @process = IO.popen(command)
+      @process = IO.popen(start_command)
     end
-    @stdout = File.open(@logfile, "r")
 
     while true
       begin
-        line = @stdout.readline
+        line = @process.readline
       rescue EOFError => e
         sleep 1
         next
       end
-      break if line.nil?
-      if line.match(/\*\*\* Error\:/)
-        @stdout.close
-        raise BrowserStack::LocalException.new(line)
+
+      data = JSON.parse(line) rescue {"message" => "Unable to parse daemon mode JSON output"}
+      if data['state'].to_s != "connected"
+        @process.close
+        raise BrowserStack::LocalException.new(data["message"])
         return
-      end
-      if line.strip == "Press Ctrl-C to exit"
-        @pid = @process.pid
-        @stdout.close
+      else
+        @pid = data["pid"]
         break
       end
     end
-
-    while true
-      break if self.isRunning
-      sleep 1
-    end
   end
 
   def isRunning
@@ -113,20 +107,37 @@ class Local
 
   def stop
     return if @pid.nil?
-    Process.kill("TERM", @pid) rescue Process.kill(9, @pid)
     @process.close
-    @pid = nil if @is_windows
-    while self.isRunning
-      sleep 1
+    if defined? spawn
+      @process = IO.popen(stop_command_args)
+    else
+      @process = IO.popen(stop_command)
     end
+    @process.close
+    @pid = nil
   end
 
   def command
-    "#{@exec} #{@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_proxy_flag} #{@force_flag} #{@verbose_flag} #{@hosts} #{@user_arguments.join(" ")}".strip
+    start_command
+  end
+
+  def start_command
+    "#{@binary_path} -d start -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_proxy_flag} #{@force_flag} #{@verbose_flag} #{@hosts} #{@user_arguments.join(" ")} 2>&1".strip
+  end
+
+  def start_command_args
+    args = ["#{@binary_path}", "-d", "start", "-logFile", "#{@logfile}", "#{@key}", "#{@folder_flag}", "#{@folder_path}", "#{@force_local_flag}", "#{@local_identifier_flag}", "#{@only_flag}", "#{@only_automate_flag}", "#{@proxy_host}", "#{@proxy_port}", "#{@proxy_user}", "#{@proxy_pass}", "#{@force_proxy_flag}","#{@force_flag}", "#{@verbose_flag}", "#{@hosts}", "#{@user_arguments.join(" ")}"]
+    args = args.select {|a| a.to_s != "" }
+    args.push(:err => [:child, :out])
+    args
+  end
+
+  def stop_command
+    "#{@binary_path} -d stop #{@local_identifier_flag}".strip
   end
 
-  def command_args
-    args = ["#{@binary_path}", "-logFile", "#{@logfile}", "#{@key}", "#{@folder_flag}", "#{@folder_path}", "#{@force_local_flag}", "#{@local_identifier_flag}", "#{@only_flag}", "#{@only_automate_flag}", "#{@proxy_host}", "#{@proxy_port}", "#{@proxy_user}", "#{@proxy_pass}", "#{@force_proxy_flag}","#{@force_flag}", "#{@verbose_flag}", "#{@hosts}", "#{@user_arguments.join(" ")}"]
+  def stop_command_args
+    args = ["#{@binary_path}", "-d", "stop", "#{@local_identifier_flag}"]
     args = args.select {|a| a.to_s != "" }
     args.push(:err => [:child, :out])
     args

metadata

@@ -1,54 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: browserstack-local
-version: !ruby/object:Gem::Version 
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
-- ""
+authors:
+- BrowserStack
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-05-04 00:00:00 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies: []
-
 description: Ruby bindings for BrowserStack Local
 email: support@browserstack.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/browserstack/local.rb
 - lib/browserstack/localbinary.rb
 - lib/browserstack/localexception.rb
 homepage: http://rubygems.org/gems/browserstack-local
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id001 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id001
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: BrowserStack Local
 test_files: []
-
+has_rdoc: