apophis 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c083648aea56d926aba4f20f65b54fa63852853
-  data.tar.gz: 68ff4acc72d7de6b3fe84baa0f4f668eb79479f9
+  metadata.gz: 5328908f29d5a0aee3ae2c839f319d8b624c31d4
+  data.tar.gz: 02b4adda6130ae5e245851b94d4857094f32ff00
 SHA512:
-  metadata.gz: 6f1930ff4b7a77b4c555a54e91329ff53cf7006a2c2fedcbed60c7ab6ba51caf4ddc4abb0013247a68596898ea7515227ed88259caa06e3c7a0ac074c556247f
-  data.tar.gz: eded73ec96c9a0524dd15f6dc97f190cb8a22630328596df73a42124613a11a8b5b223e749a7a6d6a0b56b99d743275b829b5d9d8f5907040d0be371651de327
+  metadata.gz: be62a539b8bf2d0ce6f9022ba51324c0d5ca8e2dad47877172a0709e31774c9eb39735e84a14e7ed700df06c8a333fe1f00a8aec9da004761760b9fde85b4e0e
+  data.tar.gz: 180616985cebf8e883cbace2b936ea8848efb0b8f1e5930bbea7d3ff6aa3f36805b76b623d3e542a9b6e387cca51aabc3423ea959f66e74947ec35a2eba9e0e5

data/lib/apophis/appium_runner.rb

@@ -15,6 +15,7 @@ class AppiumRunner
   end
 
   def available?(port)
+    return false unless port
     !!find(port)
   end
 
@@ -35,9 +36,11 @@ class AppiumRunner
     appiums.find{|app| app[:url] =~ /:#{port}/}
   end
 
-  def launch_and_wait(port=4500, timeout=20)
-    port = find_available_port(port)
-    Process.spawn("appium -p #{port} -bp #{port+1} > /dev/null 2>&1")
+  def launch_and_wait(port=nil, timeout=20)
+    port = port || find_available_port(4500)
+
+    #we'll use the env variable later to locate this process (`ps -p <PID> -wwwE`)
+    Process.spawn("APOPHIS_TAG=#{port} appium -p #{port} -bp #{port+1} > /dev/null 2>&1")
     DottyTimeout.timeout(timeout){ available?(port) }
 
     { port: port }
@@ -49,7 +52,7 @@ class AppiumRunner
         res = JSON.parse(open("#{ candidate }/status").read)
         !!res["value"]
       end
-    rescue
+    rescue Exception => _
       false
     end
   end

data/lib/apophis/runner.rb

@@ -16,33 +16,33 @@ module Apophis
       gm = GenymotionRunner.new
       gm.doctor!
 
-      if caps[:runner] && caps[:runner][:genymotion] && gm.devices.empty?
+      caps[:runner] ||= {}
+      runner = caps[:runner]
+
+      if runner && runner[:genymotion] && gm.devices.empty?
         @log.info '---> no android device found, launching genymotion...'
-        gm.launch(caps[:runner][:genymotion])
+        gm.launch(runner[:genymotion])
         @log.info '---> devices available:'
         @log.info gm.devices.join("\n")
       end
 
+      port = runner ? runner[:port] : nil
       ar = AppiumRunner.new
       ar.doctor!
 
-      appiums = ar.appiums
-      @log.info "appiums: #{appiums}"
-      if appiums.size > 0
-        @log.info '---> being a douch and killing all running appiums.'
-        @log.info '---> improve me later to map caps->device->device uuid->appium->appium session.'
-        appiums.each do |app|
-          @log.info "---> killing appium #{ app }"
-          ar.kill_and_wait(app[:port])
-        end
+      if ar.available?(port)
+        @log.info "--> killing appium on port #{port}"
+        ar.kill_and_wait(port)
       end
 
-      unless ar.any?
-        @log.info '---> no appium found. launching...'
-        launchinfo = ar.launch_and_wait
-        caps[:appium_lib][:port] = launchinfo[:port]
-        @log.info "---> done. wiring caps to appium #{launchinfo}"
-      end
+      @log.info '---> launching a new appium...'
+      launchinfo = ar.launch_and_wait
+      # this is the magic: map the fresh appium port to this current test
+      caps[:appium_lib][:port] = launchinfo[:port]
+      caps[:runner][:port] = launchinfo[:port]
+
+      @log.info "---> done. wiring caps to appium #{launchinfo}"
+      @log.info caps
 
 
       @log.info "---> starting driver..."
@@ -57,8 +57,18 @@ module Apophis
     # #promote_appium_methods rely on. We'll have no
     # choice but chip-in on this nonsense when we
     # want to do cleanups etc.
-    def cleanup
+    def cleanup(caps=nil)
       @log.info '---> cleaning up...'
+      if caps
+        port = caps[:runner][:port]
+        ar = AppiumRunner.new
+
+        if ar.available?(port)
+          @log.info "--> killing appium on port #{port}"
+          ar.kill_and_wait(port)
+        end
+      end
+
       $driver.driver_quit if $driver
       @log.info '---> done.'
     end

data/lib/apophis/version.rb

@@ -1,3 +1,3 @@
 module Apophis
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apophis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dotan Nahum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib