stf-client-neofreko 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d1547cb516379f9794670327da1e61a4c38dda
-  data.tar.gz: c877f7b529fb3fe6dbafb672bc1c09f0448fdc34
+  metadata.gz: 6cb65462de9b4a70126a7c2e1f7c15122449c092
+  data.tar.gz: 112abeeae010a47f14fb9cd229dc773c62ae0d87
 SHA512:
-  metadata.gz: e94a19593b4a94be969b7dc8ab8f4ad67b5c542989c9413cb921aef9451de5d13b9faf8e42577dc2b1d393cee3ee3d0c46f24d45e8ea496d5bf9d2042123ba7c
-  data.tar.gz: 235d8b26d77f34f1c686fc8595fd81c284a5c987617f8838424a8d93fdf14f7b8fbdab7c474c5ddf7f37112ddbbb85472cac281107b99198810b2d766db1454f
+  metadata.gz: 01a417c8d0a1339b37f0cb9b07a8359bcad49431b2f4dfcb169bc25188712a6e9eeae8d82c1a94667f0a9f57708334b6711c8c1d40bd2a6b2223d27159384dbd
+  data.tar.gz: 5372d573833112a8d8679849606778679495bcf709cabeb6e11b74b8ab3082f2af9041e348355d59969f93e8eb6e095587e588dea13ee0a63e3d42b8ff1959ac

data/README.md

@@ -50,6 +50,11 @@ COMMANDS
 ENVIRONMENT VARIABLES
     STF_TOKEN - Authorization token 
     STF_URL   - URL to STF 
+
+COMMAND OPTIONS
+    connect
+        -f          - Filter devices in the form of "key:value". Use stf-client keys to list keys and stf-client values -k <key from prev command> to get list of applicable values
+        -d, --adb   - Automatically execute adb connect command once device acquired. Default true
 ```
 
 ## Contributing

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -13,19 +13,19 @@ class StartDebugSessionInteractor
     @stf = stf
   end
 
-  def execute(wanted, all_flag, filter)
+  def execute(wanted, all_flag, filter, auto_adb_connect)
     wanted = 1 if wanted.nil?
     wanted = wanted.to_i
 
     1..10.times do
-      wanted -= connect(wanted, all_flag, filter)
+      wanted -= connect(wanted, all_flag, filter, auto_adb_connect)
       return if all_flag || wanted <= 0
       logger.info 'We are still waiting for ' + wanted.to_s + ' device(s). Retrying'
       sleep 5
     end
   end
 
-  def connect(wanted, all_flag, filter)
+  def connect(wanted, all_flag, filter, auto_adb_connect)
     devices = @stf.get_devices
     if devices.nil? || (devices.is_a?(Array) && devices.empty?)
       logger.info 'No devices connected to STF'
@@ -58,14 +58,14 @@ class StartDebugSessionInteractor
 
     n = 0
     usable_devices.shuffle.each do |d|
-      n += 1 if connect_device(d)
+      n += 1 if connect_device(d, auto_adb_connect)
       break if !all_flag && n >= wanted
     end
 
     n
   end
 
-  def connect_device(device)
+  def connect_device(device, auto_adb_connect)
     return false if device.nil?
 
     serial = device.serial
@@ -83,11 +83,26 @@ class StartDebugSessionInteractor
       return false
     end
 
-    execute_adb_with 30, "connect #{result.remoteConnectUrl}"
-    return true
+    logger.info "remoteConnectUrl: #{result.remoteConnectUrl}"
+
+    if auto_adb_connect
+      _execute_adb_with 30, "connect #{result.remoteConnectUrl}"
+    end
+
+    result = @stf.start_debug serial
+    unless result.success
+      logger.error "Can't start debugging session for device #{serial}"
+      @stf.remove_device serial
+    end
+
+    return result.success
 
   rescue Net::HTTPFatalError
     logger.error 'Failed to start debug session'
     return false
   end
+
+  def _execute_adb_with(timeout, cmd)
+    execute_adb_with timeout, cmd
+  end
 end

data/lib/stf/version.rb

@@ -1,3 +1,3 @@
 module Stf
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/stf/view/cli.rb

@@ -42,13 +42,14 @@ module Stf
       c.switch [:all]
       c.flag [:n, :number]
       c.flag [:f, :filter]
+      c.switch :adb, default_value: true, desc: 'automatically execute adb connect'
 
       c.action do |_global_options, options, _args|
-        StartDebugSessionInteractor.new($stf).execute(options[:number], options[:all], options[:filter])
+        StartDebugSessionInteractor.new($stf).execute(options[:number], options[:all], options[:filter], options[:adb])
       end
     end
 
-    desc 'Show avaliable keys for filtering'
+    desc 'Show available keys for filtering'
     command :keys do |c|
       c.action do |_global_options, _options, _args|
         puts GetKeysInteractor.new($stf).execute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stf-client-neofreko
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Akhmad Fathonih