stf-client 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4e33126f8648b92df84f8f064226d2cda27f06
-  data.tar.gz: ec864ead54872cd022c637b16e8860298a7438bd
+  metadata.gz: d8f269d60d1314cb4cdff19a25cdb99cd7ea38a7
+  data.tar.gz: 82fc43f8e9a2fb35b11e7db677280b207c077253
 SHA512:
-  metadata.gz: 6fd1cf716d57494d7c3e244b995ee947f11182f9dff13b192927e5db81d2c93f384f375caa91462656d1832069299972b279ce7b67bd34eba4d206e8b7372ca7
-  data.tar.gz: eb8c0476effa4f868403464d7bd7a6d35b56a12cbd00e236504c8526abfb5aeba4b2ebb4a9551f7ce53ed2caca636f4d241e94c8bbd204c041f1eecf543d155c
+  metadata.gz: 0f53f1970b97975a6998e3d5e9b6bf624dbc2b60912a56e3a94460b53f6aa400e30fa9237bf5fac9daf94dcf5a304b603d1216121b76b7d7542dff2f770266f0
+  data.tar.gz: fc027dea907010428aec5d7976f59838ea77b77ce63f6e2a3809ca4e6ffc7b3dfe3289a23e9f8da30d5a4a7b26cd0e59a019f27a41a9d2df2ca631b0a077084b

data/.rspec

@@ -1,2 +1,5 @@
 --color
 --require spec_helper
+--format documentation
+--format RspecJunitFormatter --out spec/reports/rspec.xml
+--format html --out spec/reports/rspec.html

data/.simplecov

@@ -0,0 +1,10 @@
+require 'simplecov-json'
+
+SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::JSONFormatter
+]
+SimpleCov.minimum_coverage 80
+SimpleCov.start do
+  add_filter '/spec/'
+end

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
 gemspec

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://travis-ci.org/Malinskiy/stf-client.svg?branch=master)](https://travis-ci.org/Malinskiy/stf-client)
+[![Gem](https://img.shields.io/gem/v/stf-client.svg)]()
+[![Gem](https://img.shields.io/gem/dt/stf-client.svg)]()
+
 # Stf::Client
 
 Automation client for connecting to [OpenSTF](https://github.com/openstf/stf) devices.
@@ -58,4 +62,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Malins
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/di.rb

@@ -0,0 +1,73 @@
+require 'dry-container'
+require 'dante'
+require 'stf/system/demonizer'
+
+require 'stf/interactor/start_debug_session_interactor'
+require 'stf/interactor/start_one_debug_session_interactor'
+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'
+
+class DI
+  class << self
+    def init (opts = {})
+
+      c = Dry::Container.new
+      @@container = c
+
+      # one time object
+      c.register(:dante_runner,
+                 -> {Dante::Runner.new('stf-client')})
+
+      # one time object because dante is one time
+      c.register(:demonizer,
+                 -> do
+                   Stf::Demonizer.new(c[:dante_runner],
+                                 log_path: opts[:log], pid_path: opts[:pid])
+                 end)
+
+      c.register(:stf,
+                 -> {Stf::Client.new(opts[:url], opts[:token])},
+                 memoize: true)
+
+      c.register(:start_debug_session_interactor,
+                 -> {Stf::StartDebugSessionInteractor.new},
+                 memoize: true)
+
+      c.register(:start_one_debug_session_interactor,
+                 -> {Stf::StartOneDebugSessionInteractor.new},
+                 memoize: true)
+
+      c.register(:get_keys_interactor,
+                 -> {Stf::GetKeysInteractor.new},
+                 memoize: true)
+
+      c.register(:get_values_interactor,
+                 -> {Stf::GetValuesInteractor.new},
+                 memoize: true)
+
+      c.register(:stop_all_debug_sessions_interactor,
+                 -> {Stf::StopAllDebugSessionsInteractor.new},
+                 memoize: true)
+
+      c.register(:stop_debug_session_interactor,
+                 -> {Stf::StopDebugSessionInteractor.new},
+                 memoize: true)
+
+      c.register(:remove_all_user_devices_interactor,
+                 -> {Stf::RemoveAllUserDevicesInteractor.new},
+                 memoize: true)
+
+    end
+
+    def [](what)
+      @@container.resolve(what)
+    end
+
+    def container
+      @@container
+    end
+  end
+end

data/lib/stf/errors.rb

@@ -1,5 +1,7 @@
-class DeviceNotAvailableError < StandardError
-  def message
-    'Device not available'
+module Stf
+  class DeviceNotAvailableError < StandardError
+    def message
+      'Device not available'
+    end
   end
-end
+end

data/lib/stf/interactor/get_keys_interactor.rb

@@ -1,4 +1,5 @@
 require 'ADB'
+require 'di'
 
 require 'stf/client'
 require 'stf/log/log'
@@ -6,28 +7,24 @@ require 'stf/errors'
 require 'stf/model/session'
 require 'stf/model/device'
 
-class GetKeysInteractor
+module Stf
+  class GetKeysInteractor
+    include Log
+    include ADB
 
-  include Log
-  include ADB
+    def execute
+      devices = DI[:stf].get_devices
 
-  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
 
-    if devices.nil? || (devices.is_a?(Array) && devices.empty?)
-      logger.info 'No devices connected to STF'
-      return []
+      devices
+          .map {|d| Device.new(d)}
+          .flat_map {|d| d.getKeys}
+          .uniq
+          .sort
     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

@@ -1,3 +1,4 @@
+require 'di'
 require 'ADB'
 
 require 'stf/client'
@@ -6,27 +7,25 @@ require 'stf/errors'
 require 'stf/model/session'
 require 'stf/model/device'
 
-class GetValuesInteractor
+module Stf
+  class GetValuesInteractor
 
-  include Log
-  include ADB
+    include Log
+    include ADB
 
-  def initialize(stf)
-    @stf = stf
-  end
+    def execute(key)
+      devices = DI[:stf].get_devices
 
-  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
 
-    if devices.nil? || (devices.is_a?(Array) && devices.empty?)
-      logger.info r 'No devices connected to STF'
-      return []
+      devices
+          .map {|d| Device.new(d)}
+          .map {|d| d.getValue(key)}
+          .uniq
     end
 
-    return devices
-             .map {|d| Device.new(d)}
-             .map {|d| d.getValue(key)}
-             .uniq
   end
-
 end

data/lib/stf/interactor/remove_all_user_devices_interactor.rb

@@ -1,11 +1,12 @@
-class RemoveAllUserDevicesInteractor
+require 'di'
 
-  def initialize(stf)
-    @stf = stf
-  end
+module Stf
+  class RemoveAllUserDevicesInteractor
+    def execute(opts = {})
+      DI[:demonizer].kill unless opts[:nokill]
 
-  def execute
-    devices = @stf.get_user_devices
-    devices.each { |d| @stf.remove_device d.serial }
+      devices = DI[:stf].get_user_devices
+      devices.each {|d| DI[:stf].remove_device d.serial}
+    end
   end
-end
+end

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -4,93 +4,132 @@ require 'stf/client'
 require 'stf/log/log'
 require 'stf/errors'
 require 'stf/model/session'
+require 'stf/model/device_list'
 
-class StartDebugSessionInteractor
+module Stf
+  class StartDebugSessionInteractor
 
-  include Log
-  include ADB
+    include Log
+    include ADB
 
-  def initialize(stf)
-    @stf = stf
-  end
+    def execute(opts = {})
+      all_flag = opts[:all]
+      forever_flag = opts[:forever]
+      nodaemon_flag = opts[:nodaemon]
+      filter = opts[:filter]
+      max_n = opts[:n].to_i > 0 ? opts[:n].to_i : 1
+      start_timeout = opts[:starttime].to_i > 0 ? opts[:starttime].to_i : 120
+      session = opts[:worktime].to_i > 0 ? opts[:session].to_i : 10800
+      min_n = opts[:min].to_s.empty? ? (max_n + 1) / 2 : opts[:min].to_i
 
-  def execute(wanted, all_flag, filter)
-    wanted = 1 if wanted.nil?
-    wanted = wanted.to_i
+      DI[:demonizer].kill unless opts[:nokill]
 
-    1..10.times do
-      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
+      if filter
+        DI[:stop_all_debug_sessions_interactor].execute(exceptFilter: filter)
+      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
+      wanted = nodaemon_flag ? max_n : min_n
 
-    usable_devices = devices
-                         .map {|d| Device.new(d)}
-                         .select do |d|
-      d.ready == true && d.present == true && d.using == false
-    end
+      begin
+        connect_loop(all_flag, wanted, filter, false, 5, start_timeout)
 
-    if usable_devices.empty?
-      logger.error 'All devices are being used'
-      return 0
-    end
+      rescue SignalException => e
+        DI[:stop_all_debug_sessions_interactor].execute
+        return false
 
-    unless filter.nil?
-      key, value = filter.split(':', 2)
+      rescue
+      end
 
-      usable_devices = usable_devices.select do |d|
-        d.getValue(key) == value
+      connected_count = count_connected_devices(filter)
+      if all_flag ? connected_count.zero? : connected_count < wanted
+        DI[:stop_all_debug_sessions_interactor].execute
+        return false
       end
-    end
 
-    if usable_devices.empty?
-      logger.error 'There is no device with criteria ' + filter
-      return 0
+      logger.info "Lower quantity achieved, already connected #{connected_count}"
+
+      return true if nodaemon_flag
+
+      # will be daemon here
+      DI[:demonizer].run do
+        connect_loop(all_flag,
+                     max_n,
+                     filter,
+                     true,
+                     30,
+                     session,
+                     forever_flag)
+
+        DI[:stop_all_debug_sessions_interactor].execute(byFilter: filter, nokill: true)
+      end
+
+      return true
     end
 
-    n = 0
-    usable_devices.shuffle.each do |d|
-      n += 1 if connect_device(d)
-      break if !all_flag && n >= wanted
+    def connect_loop(all_flag, wanted, filter, infinite_flag, delay, timeout, forever_flag = false)
+      finish_time = Time.now + timeout
+
+      while forever_flag || Time.now < finish_time do
+        cleanup_disconnected_devices(filter)
+
+        stf_devices = DeviceList.new(DI[:stf].get_devices)
+        stf_devices = stf_devices.byFilter(filter) if filter
+
+        if all_flag
+          batch = stf_devices.filterReadyToConnect.size
+        else
+          connected = devices & stf_devices.asConnectUrlList
+          batch = wanted - connected.size
+        end
+
+        if batch > 0
+          n = connect(filter, all_flag, batch)
+          break if n == batch && !infinite_flag
+        elsif !infinite_flag
+          break
+        end
+
+        sleep delay
+      end
+
     end
 
-    n
-  end
+    def count_connected_devices(filter)
+      stf_devices = DeviceList.new(DI[:stf].get_user_devices)
+      stf_devices = stf_devices.byFilter(filter) if filter
+      connected = devices & stf_devices.asConnectUrlList
+      connected.size
+    end
 
-  def connect_device(device)
-    begin
-      return false if device.nil?
+    def cleanup_disconnected_devices(filter)
+      stf_devices = DeviceList.new(DI[:stf].get_user_devices)
+      stf_devices = stf_devices.byFilter(filter) if filter
+      connected = stf_devices.asConnectUrlList - devices
 
-      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
+      connected.reject {|url| url.to_s.empty?}.each do |url|
+        logger.info 'Cleanup the device ' + url.to_s
+        DI[:stop_debug_session_interactor].execute(url)
       end
+    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
+    def connect(filter, all_flag, wanted)
+      devices = DeviceList.new(DI[:stf].get_devices)
+      devices = devices.filterReadyToConnect
+      devices = devices.byFilter(filter) if filter
+
+      if devices.empty?
+        logger.error 'There is no available devices with criteria ' + filter
+        return 0
       end
 
-      execute_adb_with 30, "connect #{result.remoteConnectUrl}"
-      return true
+      n = 0
+      devices.asArray.shuffle.each do |d|
+        n += 1 if DI[:start_one_debug_session_interactor].execute(d)
+        break if !all_flag && n >= wanted
+      end
 
-    rescue Net::HTTPFatalError
-      logger.error 'Failed to start debug session'
-      return false
+      n
     end
+
   end
-end
+end

data/lib/stf/interactor/start_one_debug_session_interactor.rb

@@ -0,0 +1,55 @@
+require 'di'
+require 'ADB'
+
+require 'stf/client'
+require 'stf/log/log'
+require 'stf/errors'
+require 'stf/model/session'
+
+module Stf
+  class StartOneDebugSessionInteractor
+
+    include Log
+    include ADB
+
+    def execute(device)
+      return false if device.nil?
+      serial = device.serial
+
+      begin
+        success = DI[:stf].add_device serial
+        if success
+          logger.info "Device added #{serial}"
+        else
+          logger.error "Can't add device #{serial}"
+          raise
+        end
+
+        result = DI[:stf].start_debug serial
+        if result.success
+          logger.info "Debug started #{serial}"
+        else
+          logger.error "Can't start debugging session for device #{serial}"
+          raise
+        end
+
+        execute_adb_with 30, "connect #{result.remoteConnectUrl}"
+
+        return true
+
+      rescue SignalException => e
+        raise e
+
+      rescue => e
+        begin
+          # we will try clean anyway
+          DI[:stf].remove_device serial
+        rescue
+        end
+
+        logger.error "Failed to connect to #{serial}"
+        return false
+      end
+    end
+  end
+end

data/lib/stf/interactor/stop_all_debug_sessions_interactor.rb

@@ -1,25 +1,33 @@
+require 'di'
 require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
 require 'stf/errors'
 require 'stf/interactor/stop_debug_session_interactor'
+require 'stf/model/device_list'
 
-class StopAllDebugSessionsInteractor
-  include Log
-  include ADB
+module Stf
+  class StopAllDebugSessionsInteractor
+    include Log
+    include ADB
 
-  def initialize(stf)
-    @stf = stf
-  end
+    # byFilter:
+    # exceptFilter:
+    def execute(options = {})
+      DI[:demonizer].kill unless options[:nokill]
+
+      stf_devices = DeviceList.new(DI[:stf].get_user_devices)
+
+      stf_devices = stf_devices.byFilter options[:byFilter] if options[:byFilter]
+      stf_devices = stf_devices.exceptFilter options[:exceptFilter] if options[:exceptFilter]
+
+      connected_devices = devices()
+      remote_devices = stf_devices.asConnectUrlList
 
-  def execute
-    connected_devices = devices()
-    remote_devices    = @stf.get_user_devices.map { |d| d.remoteConnectUrl }
+      pending_disconnect = connected_devices & remote_devices
 
-    pending_disconnect = connected_devices & remote_devices
-    pending_disconnect.each do |d|
-      StopDebugSessionInteractor.new(@stf).execute d
+      pending_disconnect.each {|d| DI[:stop_debug_session_interactor].execute d}
     end
   end
-end
+end

data/lib/stf/interactor/stop_debug_session_interactor.rb

@@ -1,49 +1,55 @@
+require 'di'
 require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
 require 'stf/errors'
 
-class StopDebugSessionInteractor
+module Stf
+  class StopDebugSessionInteractor
+    include Log
+    include ADB
 
-  include Log
-  include ADB
+    def execute(remote_connect_url)
+      remote_devices = DI[:stf].get_user_devices
+      device = remote_devices.find {|d| d.remoteConnect == true && d.remoteConnectUrl.eql?(remote_connect_url)}
 
-  def initialize(stf)
-    @stf = stf
-  end
+      # try to disconnect anyway
+      execute_adb_with 30, "disconnect #{remote_connect_url}"
 
-  def execute(remoteConnectUrl)
-    remote_devices = @stf.get_user_devices
-    device         = remote_devices.find { |d| d.remoteConnect == true && d.remoteConnectUrl.eql?(remoteConnectUrl) }
+      if device.nil?
+        logger.error "Device #{remote_connect_url} is not available"
+        return false
+      end
 
-    raise DeviceNotAvailableError if device.nil?
+      success = false
 
-    execute_adb_with 30, "disconnect #{device.remoteConnectUrl}"
+      1..10.times do
+        begin
+          success = DI[:stf].stop_debug(device.serial)
+          break if success
+        rescue
+        end
 
-    success = false
+        logger.error 'Can\'t stop debug session. Retrying'
+      end
 
-    1..10.times do
-      success = @stf.stop_debug(device.serial)
-      if success == true
-        break
-      elsif logger.error 'Can\'t stop debug session. Retrying'
+      1..10.times do
+        begin
+          success = DI[:stf].remove_device(device.serial)
+          break if success
+        rescue
+        end
+        logger.error 'Can\'t remove device from user devices. Retrying'
       end
-    end
 
-    1..10.times do
-      success = @stf.remove_device(device.serial)
-      if success == true
-        break
-      elsif logger.error 'Can\'t remove device from user devices. Retrying'
+      if success
+        logger.info "Successfully removed #{remote_connect_url}"
+      else
+        logger.error "Error removing #{remote_connect_url}"
       end
-    end
 
-    if success == true
-      logger.info "Successfully removed #{remoteConnectUrl}"
-    elsif logger.error "Error removing #{remoteConnectUrl}"
+      success
     end
-
-    return success
   end
-end
+end

data/lib/stf/log/log.rb

@@ -1,16 +1,18 @@
 require 'logger'
 
-module Log
+module Stf
+  module Log
 
-  @@logger       = Logger.new(STDOUT)
-  @@logger.level = Logger::INFO
+    @@logger = Logger.new(STDOUT)
+    @@logger.level = Logger::INFO
 
-  def logger
-    @@logger
-  end
+    def logger
+      @@logger
+    end
 
-  def self.verbose(enable)
-    @@logger.level = enable ? Logger::DEBUG : Logger::INFO
-  end
+    def self.verbose(enable)
+      @@logger.level = enable ? Logger::DEBUG : Logger::INFO
+    end
 
+  end
 end

data/lib/stf/model/device.rb

@@ -1,38 +1,46 @@
-class Device < OpenStruct
-  def getValue(key)
-    getValueFromObject(self, key)
-  end
+module Stf
+  class Device < OpenStruct
+    def getValue(key)
+      getValueFromObject(self, key)
+    end
 
-  def getKeys
-    getKeysNextLevel('', self)
-  end
+    def getKeys
+      getKeysNextLevel('', self)
+    end
 
-  def getKeysNextLevel(prefix, o)
-    return [] if o.nil?
+    def checkFilter(filter)
+      return true if filter.nil?
+      key, value = filter.split(':', 2)
+      getValue(key) == value
+    end
 
-    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)]
+    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
-  end
 
-  def concat(prefix, key)
-    prefix.to_s.empty? ? key : prefix + '.' + key
-  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])
+    def getValueFromObject(obj, key)
+      keys = key.split('.', 2)
+      if keys[1].nil?
+        obj[key]
+      else
+        getValueFromObject(obj[keys[0]], keys[1])
+      end
     end
-  end
 
-  private :getValueFromObject,:concat, :getKeysNextLevel
+    private :getValueFromObject, :concat, :getKeysNextLevel
 
-end
+  end
+end

data/lib/stf/model/device_list.rb

@@ -0,0 +1,51 @@
+require 'stf/model/device'
+
+module Stf
+# can not inherite from Array because http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
+  class DeviceList
+    def initialize(devices)
+      if devices.nil?
+        @devices = Array.new
+      else
+        @devices = devices.map {|d| (d.kind_of? Device) ? d : Device.new(d)}
+      end
+    end
+
+    def byFilter(filter)
+      filter ? select {|d| d.checkFilter(filter)} : Array.new
+    end
+
+    def exceptFilter(filter)
+      filter ? reject {|d| d.checkFilter(filter)} : this
+    end
+
+    def filterReadyToConnect
+      select {|d| d.ready == true && d.present == true && d.using == false}
+    end
+
+    def asConnectUrlList
+      @devices.map {|d| d.remoteConnectUrl}
+    end
+
+    def select
+      DeviceList.new(@devices.select {|d| yield(d)})
+    end
+
+    def reject
+      # DeviceList.new(@devices.reject {|d| yield(d)})
+      DeviceList.new(@devices.select {|d| !yield(d)})
+    end
+
+    def empty?
+      @devices.empty?
+    end
+
+    def size
+      @devices.size
+    end
+
+    def asArray
+      @devices
+    end
+  end
+end

data/lib/stf/model/session.rb

@@ -1,10 +1,12 @@
-class Session
+module Stf
+  class Session
 
-  attr_accessor :serial, :url
+    attr_accessor :serial, :url
 
-  def initialize(serial, url)
-    @serial = serial
-    @url    = url
-  end
+    def initialize(serial, url)
+      @serial = serial
+      @url = url
+    end
 
-end
+  end
+end

data/lib/stf/system/demonizer.rb

@@ -0,0 +1,20 @@
+module Stf
+  class Demonizer
+    def initialize(dante, opts = {})
+      @dante = dante
+
+      @pid_path = opts[:pid_path].to_s.empty? ? '/tmp/stf-client.pid' : opts[:pid_path]
+      @log_path = opts[:log_path].to_s.empty? ? '/tmp/stf-client.log' : opts[:log_path]
+    end
+
+    def run
+      @dante.execute(daemonize: true,
+                     pid_path: @pid_path,
+                     log_path: @log_path) {yield}
+    end
+
+    def kill
+      @dante.execute(kill: true, pid_path: @pid_path)
+    end
+  end
+end

data/lib/stf/version.rb

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

data/lib/stf/view/cli.rb

@@ -1,16 +1,10 @@
 module Stf
   module CLI
+    require 'di'
     require 'gli'
-    require 'stf/client'
-
-    require 'stf/interactor/start_debug_session_interactor'
-    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
 
     program_desc 'Smartphone Test Lab client'
@@ -18,6 +12,12 @@ module Stf
     desc 'Be verbose'
     switch [:v, :verbose]
 
+    desc 'PID file'
+    flag [:pid]
+
+    desc 'Log file'
+    flag [:log]
+
     desc 'Authorization token, can also be set by environment variable STF_TOKEN'
     flag [:t, :token]
 
@@ -34,61 +34,67 @@ module Stf
 
       Log::verbose(global_options[:verbose])
 
-      $stf = Stf::Client.new(global_options[:url], global_options[:token])
+      DI.init(global_options)
     end
 
     desc 'Search for a device available in STF and attach it to local adb server'
     command :connect do |c|
+      c.desc 'Connect to all available devices'
       c.switch [:all]
-      c.flag [:n, :number]
+      c.desc 'Required quantity of devices'
+      c.flag [:n]
+      c.desc 'Minimal quantity of devices, n/2 by default'
+      c.flag [:min]
+      c.desc 'Filter key:value for devices'
       c.flag [:f, :filter]
-
-      c.action do |global_options, options, args|
-        StartDebugSessionInteractor.new($stf).execute(options[:number], options[:all], options[:filter])
+      c.desc 'Maximum session duration in seconds, 10800 (3h) by default'
+      c.flag [:session]
+      c.desc 'Maximum time to connect minimal quantity of devices in seconds, 120 (2m) by default'
+      c.flag [:starttime]
+      c.desc 'Maintain connactions before explicitly kill'
+      c.switch [:forever]
+      c.desc 'Do not start daemon'
+      c.switch [:nodaemon]
+
+      c.action do |_, options, _|
+        unless DI[:start_debug_session_interactor].execute(options)
+          raise GLI::CustomExit.new('Connect failed', 1)
+        end
       end
     end
 
     desc 'Show avaliable keys for filtering'
     command :keys do |c|
-      c.action do |global_options, options, args|
-        puts GetKeysInteractor.new($stf).execute
-      end
+      c.action {puts DI[:get_keys_interactor].execute}
     end
 
     desc 'Show known values for the filtering key'
     command :values do |c|
-      c.flag [:k, :key]
+      c.action do |_, _, args|
+        exit_now!('Please specify one key') if args.empty?
 
-      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
+        puts DI[:get_values_interactor].execute(args.first)
       end
     end
 
     desc 'Disconnect device(s) from local adb server and remove device(s) from user devices in STF'
     command :disconnect do |c|
       c.desc '(optional) ADB connection url of the device'
-      c.flag [:d, :device]
       c.switch [:all]
 
-      c.action do |global_options, options, args|
-        if options[:device].nil? && options[:all] == true
-          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)')
+      c.action do |_, options, args|
+        if args.empty? && options[:all] == true
+          DI[:stop_all_debug_sessions_interactor].execute
+        elsif !args.empty? && options[:all] == false
+          DI[:stop_debug_session_interactor].execute(args.first)
+        elsif exit_now!('Please specify one device or mode --all')
         end
       end
     end
 
     desc 'Frees all devices that are assigned to current user in STF. Doesn\'t modify local adb'
     command :clean do |c|
-      c.action do |global_options, options, args|
-        RemoveAllUserDevicesInteractor.new($stf).execute
-      end
+      c.action {DI[:remove_all_user_devices_interactor].execute}
     end
 
     exit run(ARGV)

data/stf-client.gemspec

@@ -15,12 +15,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.executables   = ['stf-client']
 
-  spec.add_runtime_dependency 'gli'
-  spec.add_runtime_dependency 'ADB'
+  spec.add_runtime_dependency 'gli', '~> 2.17'
+  spec.add_runtime_dependency 'ADB', '~> 0.5'
+  spec.add_runtime_dependency 'dante', '~> 0.2.0'
+  spec.add_runtime_dependency 'dry-container', '~> 0.6.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  # spec.add_runtime_dependency 'pry', '~> 0.10.4'
+
+  spec.add_development_dependency 'bundler', '~> 1.16.a'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.2'
   spec.add_development_dependency 'webmock', '~> 2.1'
   spec.add_development_dependency 'sinatra', '~> 1.4'
+  spec.add_development_dependency 'simplecov', '~> 0.14'
+  spec.add_development_dependency 'simplecov-json', '~> 0.2'
 end

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: stf-client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Anton Malinskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: ADB
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: dante
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.16.a
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.16.a
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: simplecov-json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email:
 - anton@malinskiy.com
@@ -118,6 +188,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -125,6 +196,7 @@ files:
 - Rakefile
 - bin/setup
 - bin/stf-client
+- lib/di.rb
 - lib/stf.rb
 - lib/stf/client.rb
 - lib/stf/errors.rb
@@ -132,11 +204,14 @@ files:
 - 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/start_one_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/device_list.rb
 - lib/stf/model/session.rb
+- lib/stf/system/demonizer.rb
 - lib/stf/version.rb
 - lib/stf/view/cli.rb
 - stf-client.gemspec