stf-client 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b6357ade2135b93ec5ee58f22c0036931abca91
-  data.tar.gz: 16efc1453a6c53162183ee47f9fbb931cc5ab632
+  metadata.gz: 3f4e33126f8648b92df84f8f064226d2cda27f06
+  data.tar.gz: ec864ead54872cd022c637b16e8860298a7438bd
 SHA512:
-  metadata.gz: 6f4c092325848af5a33890fcef68323b875eabf41be9cde7f939e3f0fd85c1910a1ea69533ea4cf2360bc075d03d724611f8586ae4927961afa1788efdcf2db8
-  data.tar.gz: 57f3073eaab9ab2a3b23980b912f42208041913b7e69c50bb70cc85ed4568818cb849f4cf239811661a138c2444ae7a1df6838d2f13d672bf84fff9ea3d7b6ea
+  metadata.gz: 6fd1cf716d57494d7c3e244b995ee947f11182f9dff13b192927e5db81d2c93f384f375caa91462656d1832069299972b279ce7b67bd34eba4d206e8b7372ca7
+  data.tar.gz: eb8c0476effa4f868403464d7bd7a6d35b56a12cbd00e236504c8526abfb5aeba4b2ebb4a9551f7ce53ed2caca636f4d241e94c8bbd204c041f1eecf543d155c

data/.gitignore

@@ -33,6 +33,12 @@
 # Mongo Explorer plugin:
 .idea/mongoSettings.xml
 
+# RubyMine
+.idea/.rakeTasks
+.idea/misc.xml
+.idea/modules.xml
+.idea/stf-client.iml
+
 ## File-based project format:
 *.iws
 

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.3.3

data/README.md

@@ -35,8 +35,8 @@ SYNOPSIS
 
 GLOBAL OPTIONS
     --help             - Show this message
-    -t, --token=arg    - Authorization token (default: none)
-    -u, --url=arg      - URL to STF (default: none)
+    -t, --token=arg    - Authorization token, can also be set by environment variable STF_TOKEN (default: none)
+    -u, --url=arg      - URL to STF, can also be set by environment variable STF_URL (default: none)
     -v, --[no-]verbose - Be verbose
 
 COMMANDS
@@ -44,6 +44,12 @@ COMMANDS
     connect    - Search for a device available in STF and attach it to local adb server
     disconnect - Disconnect device(s) from local adb server and remove device(s) from user devices in STF
     help       - Shows a list of commands or help for one command
+    keys       - Show avaliable keys for filtering
+    values     - Show known values for the filtering key
+    
+ENVIRONMENT VARIABLES
+    STF_TOKEN - Authorization token 
+    STF_URL   - URL to STF 
 ```
 
 ## Contributing

data/lib/stf/interactor/get_keys_interactor.rb

@@ -0,0 +1,33 @@
+require 'ADB'
+
+require 'stf/client'
+require 'stf/log/log'
+require 'stf/errors'
+require 'stf/model/session'
+require 'stf/model/device'
+
+class GetKeysInteractor
+
+  include Log
+  include ADB
+
+  def initialize(stf)
+    @stf = stf
+  end
+
+  def execute
+    devices = @stf.get_devices
+
+    if devices.nil? || (devices.is_a?(Array) && devices.empty?)
+      logger.info 'No devices connected to STF'
+      return []
+    end
+
+    return devices
+             .map {|d| Device.new(d)}
+             .flat_map {|d| d.getKeys }
+             .uniq
+             .sort
+  end
+
+end

data/lib/stf/interactor/get_values_interactor.rb

@@ -0,0 +1,32 @@
+require 'ADB'
+
+require 'stf/client'
+require 'stf/log/log'
+require 'stf/errors'
+require 'stf/model/session'
+require 'stf/model/device'
+
+class GetValuesInteractor
+
+  include Log
+  include ADB
+
+  def initialize(stf)
+    @stf = stf
+  end
+
+  def execute(key)
+    devices = @stf.get_devices
+
+    if devices.nil? || (devices.is_a?(Array) && devices.empty?)
+      logger.info r 'No devices connected to STF'
+      return []
+    end
+
+    return devices
+             .map {|d| Device.new(d)}
+             .map {|d| d.getValue(key)}
+             .uniq
+  end
+
+end

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -14,52 +14,83 @@ class StartDebugSessionInteractor
     @stf = stf
   end
 
-  def execute
-    randomized_device = nil
+  def execute(wanted, all_flag, filter)
+    wanted = 1 if wanted.nil?
+    wanted = wanted.to_i
 
     1..10.times do
-      begin
-        devices = @stf.get_devices
-        if devices.nil? || (devices.is_a?(Array) && devices.empty?)
-          logger.info 'No devices connected to STF. Retrying'
-          sleep 5
-          next
-        end
-        usable_devices = devices.select{ |d| d.ready == true && d.present == true && d.using == false }
-        if usable_devices.empty?
-          logger.error 'All devices are being used. Retrying'
-          sleep 5
-          next
-        end
-
-        randomized_device = usable_devices.sample
-        raise new DeviceNotAvailableError if randomized_device.nil?
-
-        serial  = randomized_device.serial
-        success = @stf.add_device serial
-        if success
-          logger.info "Device #{serial} added"
-        elsif logger.error "Can't add device #{serial}. Retrying"
-          next
-        end
-
-        result = @stf.start_debug serial
-        if !result.success
-          logger.error "Can't start debugging session for device #{serial}. Retrying"
-          @stf.remove_device serial
-          next
-        end
-
-        execute_adb_with 30, "connect #{result.remoteConnectUrl}"
-
-        return Session.new(serial, result.remoteConnectUrl)
-        break
-
-        raise new DeviceNotAvailableError
-      rescue DeviceNotAvailableError, Net::HTTPFatalError
-        logger.error 'Failed to start debug session. Retrying...'
-        next
+      wanted -= connect(wanted, all_flag, filter)
+      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)
+    devices = @stf.get_devices
+    if devices.nil? || (devices.is_a?(Array) && devices.empty?)
+      logger.info 'No devices connected to STF'
+      return 0
+    end
+
+    usable_devices = devices
+                         .map {|d| Device.new(d)}
+                         .select do |d|
+      d.ready == true && d.present == true && d.using == false
+    end
+
+    if usable_devices.empty?
+      logger.error 'All devices are being used'
+      return 0
+    end
+
+    unless filter.nil?
+      key, value = filter.split(':', 2)
+
+      usable_devices = usable_devices.select do |d|
+        d.getValue(key) == value
+      end
+    end
+
+    if usable_devices.empty?
+      logger.error 'There is no device with criteria ' + filter
+      return 0
+    end
+
+    n = 0
+    usable_devices.shuffle.each do |d|
+      n += 1 if connect_device(d)
+      break if !all_flag && n >= wanted
+    end
+
+    n
+  end
+
+  def connect_device(device)
+    begin
+      return false if device.nil?
+
+      serial = device.serial
+      success = @stf.add_device serial
+      if success
+        logger.info "Device #{serial} added"
+      elsif logger.error "Can't add device #{serial}"
+        return false
+      end
+
+      result = @stf.start_debug serial
+      unless result.success
+        logger.error "Can't start debugging session for device #{serial}"
+        @stf.remove_device serial
+        return false
       end
+
+      execute_adb_with 30, "connect #{result.remoteConnectUrl}"
+      return true
+
+    rescue Net::HTTPFatalError
+      logger.error 'Failed to start debug session'
+      return false
     end
   end
 end

data/lib/stf/model/device.rb

@@ -0,0 +1,38 @@
+class Device < OpenStruct
+  def getValue(key)
+    getValueFromObject(self, key)
+  end
+
+  def getKeys
+    getKeysNextLevel('', self)
+  end
+
+  def getKeysNextLevel(prefix, o)
+    return [] if o.nil?
+
+    o.each_pair.flat_map do |k, v|
+      if v.is_a? OpenStruct
+        getKeysNextLevel(concat(prefix, k.to_s), v)
+      else
+        [concat(prefix, k.to_s)]
+      end
+    end
+  end
+
+  def concat(prefix, key)
+    prefix.to_s.empty? ? key : prefix + '.' + key
+  end
+
+
+  def getValueFromObject(obj, key)
+    keys = key.split('.', 2)
+    if keys[1].nil?
+      obj[key]
+    else
+      getValueFromObject(obj[keys[0]], keys[1])
+    end
+  end
+
+  private :getValueFromObject,:concat, :getKeysNextLevel
+
+end

data/lib/stf/version.rb

@@ -1,3 +1,3 @@
 module Stf
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

data/lib/stf/view/cli.rb

@@ -7,6 +7,8 @@ module Stf
     require 'stf/interactor/stop_debug_session_interactor'
     require 'stf/interactor/stop_all_debug_sessions_interactor'
     require 'stf/interactor/remove_all_user_devices_interactor'
+    require 'stf/interactor/get_keys_interactor'
+    require 'stf/interactor/get_values_interactor'
 
     include GLI::App
     extend self
@@ -16,13 +18,17 @@ module Stf
     desc 'Be verbose'
     switch [:v, :verbose]
 
-    desc 'Authorization token'
+    desc 'Authorization token, can also be set by environment variable STF_TOKEN'
     flag [:t, :token]
 
-    desc 'URL to STF'
+    desc 'URL to STF, can also be set by environment variable STF_URL'
     flag [:u, :url]
 
     pre do |global_options, command, options, args|
+
+      global_options[:url] = ENV['STF_URL'] if global_options[:url].nil?
+      global_options[:token] = ENV['STF_TOKEN'] if global_options[:token].nil?
+
       help_now!('STF url is required') if global_options[:url].nil?
       help_now!('Authorization token is required') if global_options[:token].nil?
 
@@ -33,8 +39,32 @@ module Stf
 
     desc 'Search for a device available in STF and attach it to local adb server'
     command :connect do |c|
+      c.switch [:all]
+      c.flag [:n, :number]
+      c.flag [:f, :filter]
+
+      c.action do |global_options, options, args|
+        StartDebugSessionInteractor.new($stf).execute(options[:number], options[:all], options[:filter])
+      end
+    end
+
+    desc 'Show avaliable keys for filtering'
+    command :keys do |c|
       c.action do |global_options, options, args|
-        StartDebugSessionInteractor.new($stf).execute
+        puts GetKeysInteractor.new($stf).execute
+      end
+    end
+
+    desc 'Show known values for the filtering key'
+    command :values do |c|
+      c.flag [:k, :key]
+
+      c.action do |global_options, options, args|
+        if options[:key].nil?
+          help_now!('Please specify the key (--key)')
+        else
+          puts GetValuesInteractor.new($stf).execute(options[:key])
+        end
       end
     end
 
@@ -49,7 +79,7 @@ module Stf
           StopAllDebugSessionsInteractor.new($stf).execute
         elsif !options[:device].nil? && options[:all] == false
           StopDebugSessionInteractor.new($stf).execute(options[:device])
-        elsif help_now!('Please specify disconnect mode (-all or -device)')
+        elsif help_now!('Please specify disconnect mode (--all or --device)')
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stf-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Anton Malinskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,11 +128,14 @@ files:
 - lib/stf.rb
 - lib/stf/client.rb
 - lib/stf/errors.rb
+- lib/stf/interactor/get_keys_interactor.rb
+- lib/stf/interactor/get_values_interactor.rb
 - lib/stf/interactor/remove_all_user_devices_interactor.rb
 - lib/stf/interactor/start_debug_session_interactor.rb
 - lib/stf/interactor/stop_all_debug_sessions_interactor.rb
 - lib/stf/interactor/stop_debug_session_interactor.rb
 - lib/stf/log/log.rb
+- lib/stf/model/device.rb
 - lib/stf/model/session.rb
 - lib/stf/version.rb
 - lib/stf/view/cli.rb
@@ -156,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Request devices from Smartphone Test Farm for adb connection