stf-client-neofreko 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb281d8ac65af753870dc7cea6bd86be8a3ce3c
-  data.tar.gz: b4b9783173755f0e0862656badd9126da0718043
+  metadata.gz: f2d1547cb516379f9794670327da1e61a4c38dda
+  data.tar.gz: c877f7b529fb3fe6dbafb672bc1c09f0448fdc34
 SHA512:
-  metadata.gz: c45ed8a17bdaf36d3edb58aa3454f60328fa32ce96396dafff8e8eab6e1a8fb9ded0bb6ac832582f67fc72d8d1c87ec758648bec162cf833f127673a5462a8d3
-  data.tar.gz: 8c95da0681fde2a4168b8ba1eda52a95a8494c4554cc89f846a4e665957acd9d4236b90feb0eeff7f9be12f2d77be3ea99a1ff57d659818cbd1970d371ecc0d6
+  metadata.gz: e94a19593b4a94be969b7dc8ab8f4ad67b5c542989c9413cb921aef9451de5d13b9faf8e42577dc2b1d393cee3ee3d0c46f24d45e8ea496d5bf9d2042123ba7c
+  data.tar.gz: 235d8b26d77f34f1c686fc8595fd81c284a5c987617f8838424a8d93fdf14f7b8fbdab7c474c5ddf7f37112ddbbb85472cac281107b99198810b2d766db1454f

data/README.md

@@ -50,11 +50,6 @@ 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/client.rb

@@ -17,52 +17,57 @@ module Stf
 
     def get_devices
       response = execute '/api/v1/devices', Net::HTTP::Get
-      return response.devices
+      response.devices
     end
 
     def get_device(serial)
       response = execute "/api/v1/devices/#{serial}", Net::HTTP::Get
-      return response.device
+      response.device
     end
 
     def get_user
       response = execute '/api/v1/user', Net::HTTP::Get
-      return response.user
+      response.user
     end
 
     def get_user_devices
       response = execute '/api/v1/user/devices', Net::HTTP::Get
-      return response.devices
+      response.devices
     end
 
     def add_device(serial)
-      response = execute '/api/v1/user/devices', Net::HTTP::Post, {serial: serial}.to_json
-      return response.success
+      response = execute '/api/v1/user/devices', Net::HTTP::Post, { serial: serial }.to_json
+      response.success
+    end
+
+    def add_adb_public_key(adbkeypub)
+      response = execute '/api/v1/user/adbPublicKeys', Net::HTTP::Post, { publickey: adbkeypub }.to_json
+      response.success
     end
 
     def remove_device(serial)
       response = execute "/api/v1/user/devices/#{serial}", Net::HTTP::Delete
-      return response.success
+      response.success
     end
 
     def start_debug(serial)
       response = execute "/api/v1/user/devices/#{serial}/remoteConnect", Net::HTTP::Post
-      return response
+      response
     end
 
     def stop_debug(serial)
       response = execute "/api/v1/user/devices/#{serial}/remoteConnect", Net::HTTP::Delete
-      return response.success
+      response.success
     end
 
     private
 
-    def execute(relative_url, type, body='')
-      return execute_absolute @base_url + relative_url, type, body
+    def execute(relative_url, type, body = '')
+      execute_absolute @base_url + relative_url, type, body
     end
 
-    def execute_absolute(url, type, body='', limit = 10)
-      raise ArgumentError, 'too many HTTP redirects' if limit == 0
+    def execute_absolute(url, type, body = '', limit = 10)
+      raise ArgumentError, 'too many HTTP redirects' if limit.zero?
 
       uri          = URI.parse(url)
       http         = Net::HTTP.new(uri.host, uri.port)
@@ -72,19 +77,19 @@ module Stf
       response     = http.request(request)
 
       case response
-        when Net::HTTPSuccess then
-          json = JSON.parse(response.body, object_class: OpenStruct)
-
-          logger.debug "API returned #{json}"
-        when Net::HTTPRedirection then
-          location = response['location']
-          logger.debug "redirected to #{location}"
-          return execute_absolute(location, type, body, limit - 1)
-        else
-          logger.error "API returned #{response.value}"
+      when Net::HTTPSuccess then
+        json = JSON.parse(response.body, object_class: OpenStruct)
+
+        logger.debug "API returned #{json}"
+      when Net::HTTPRedirection then
+        location = response['location']
+        logger.debug "redirected to #{location}"
+        return execute_absolute(location, type, body, limit - 1)
+      else
+        logger.error "API returned #{response.value}"
       end
 
-      return json
+      json
     end
   end
-end
+end

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -6,7 +6,6 @@ require 'stf/errors'
 require 'stf/model/session'
 
 class StartDebugSessionInteractor
-
   include Log
   include ADB
 
@@ -14,19 +13,19 @@ class StartDebugSessionInteractor
     @stf = stf
   end
 
-  def execute(wanted, all_flag, filter, auto_adb_connect)
+  def execute(wanted, all_flag, filter)
     wanted = 1 if wanted.nil?
     wanted = wanted.to_i
 
     1..10.times do
-      wanted -= connect(wanted, all_flag, filter, auto_adb_connect)
+      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, auto_adb_connect)
+  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'
@@ -34,8 +33,8 @@ class StartDebugSessionInteractor
     end
 
     usable_devices = devices
-                         .map {|d| Device.new(d)}
-                         .select do |d|
+                     .map { |d| Device.new(d) }
+                     .select do |d|
       d.ready == true && d.present == true && d.using == false
     end
 
@@ -59,47 +58,36 @@ class StartDebugSessionInteractor
 
     n = 0
     usable_devices.shuffle.each do |d|
-      n += 1 if connect_device(d, auto_adb_connect)
+      n += 1 if connect_device(d)
       break if !all_flag && n >= wanted
     end
 
     n
   end
 
-  def connect_device(device, auto_adb_connect)
-    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
-
-      logger.info "remoteConnectUrl: #{result.remoteConnectUrl}" 
+  def connect_device(device)
+    return false if device.nil?
 
-      if auto_adb_connect
-        _execute_adb_with 30, "connect #{result.remoteConnectUrl}"
-      end
-      return true
+    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
 
-    rescue Net::HTTPFatalError
-      logger.error 'Failed to start debug session'
+    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
-  end
 
-  def _execute_adb_with(timeout, cmd)
-    execute_adb_with timeout, cmd
-  end
+    execute_adb_with 30, "connect #{result.remoteConnectUrl}"
+    return true
 
-end
+  rescue Net::HTTPFatalError
+    logger.error 'Failed to start debug session'
+    return false
+  end
+end

data/lib/stf/interactor/user_interactor.rb

@@ -0,0 +1,23 @@
+require 'ADB'
+
+require 'stf/client'
+require 'stf/log/log'
+require 'stf/errors'
+require 'stf/model/session'
+
+class UserInteractor
+  include Log
+  def initialize(stf)
+    @stf = stf
+  end
+
+  def execute(adb_public_key_location)
+    public_key = File.open(adb_public_key_location, 'rb', &:read)
+    success = @stf.add_adb_public_key public_key
+    if success
+      logger.info "adb public key from '#{adb_public_key_location}' has been added"
+    elsif logger.error "Can't add public key from '#{adb_public_key_location}'"
+      return false
+    end
+  end
+end

data/lib/stf/version.rb

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

data/lib/stf/view/cli.rb

@@ -9,6 +9,7 @@ module Stf
     require 'stf/interactor/remove_all_user_devices_interactor'
     require 'stf/interactor/get_keys_interactor'
     require 'stf/interactor/get_values_interactor'
+    require 'stf/interactor/user_interactor'
 
     include GLI::App
     extend self
@@ -24,15 +25,14 @@ module Stf
     desc 'URL to STF, can also be set by environment variable STF_URL'
     flag [:u, :url]
 
-    pre do |global_options, command, options, args|
-
+    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?
 
-      Log::verbose(global_options[:verbose])
+      Log.verbose(global_options[:verbose])
 
       $stf = Stf::Client.new(global_options[:url], global_options[:token])
     end
@@ -42,16 +42,15 @@ 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], options[:adb])
+      c.action do |_global_options, options, _args|
+        StartDebugSessionInteractor.new($stf).execute(options[:number], options[:all], options[:filter])
       end
     end
 
-    desc 'Show available keys for filtering'
+    desc 'Show avaliable keys for filtering'
     command :keys do |c|
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, _args|
         puts GetKeysInteractor.new($stf).execute
       end
     end
@@ -60,7 +59,7 @@ module Stf
     command :values do |c|
       c.flag [:k, :key]
 
-      c.action do |global_options, options, args|
+      c.action do |_global_options, options, _args|
         if options[:key].nil?
           help_now!('Please specify the key (--key)')
         else
@@ -75,7 +74,7 @@ module Stf
       c.flag [:d, :device]
       c.switch [:all]
 
-      c.action do |global_options, options, args|
+      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
@@ -87,12 +86,24 @@ module Stf
 
     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|
+      c.action do |_global_options, _options, _args|
         RemoveAllUserDevicesInteractor.new($stf).execute
       end
     end
 
+    desc 'Add current adb public key into STF (depends on https://github.com/openstf/stf/pull/770)'
+    command :trustme do |c|
+      c.flag [:k, :adb_public_key_location], desc: 'Location of adb public key', default_value: '~/.android/adbkey.pub'
+      c.action do |_global_options, options, _args|
+        options[:adb_public_key_location] = '~/.android/adbkey.pub' if options[:adb_public_key_location].nil?
+        filename = File.expand_path(options[:adb_public_key_location])
+        unless File.exist? filename
+          help_now!("File does not exist: '#{options[:adb_public_key_location]}'")
+        end
+        UserInteractor.new($stf).execute(options[:adb_public_key_location])
+      end
+    end
+
     exit run(ARGV)
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stf-client-neofreko
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Akhmad Fathonih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -134,6 +134,7 @@ files:
 - 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/interactor/user_interactor.rb
 - lib/stf/log/log.rb
 - lib/stf/model/device.rb
 - lib/stf/model/session.rb