stf-client 0.3.0.rc8 → 0.3.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6473be189621a2aeaf56910c4f52983870376f
-  data.tar.gz: e0c52156044073f2de9fc9ab1684f5ad61896346
+  metadata.gz: 8f3cd4d6b212dc0c25d4e73cf47b856df1ebef24
+  data.tar.gz: 689022a5a8023bccaaa6c1ec0b2c1b61f46a5bf8
 SHA512:
-  metadata.gz: 702e983ad45b61315bc1e562e0c5b5e0efa608c567fbe8ca1778d8f05229bd27e197e72ba74d3a253fefeded4edbf464c4a093eaea8b87971b457b5c5f1db646
-  data.tar.gz: 5868b248aa1508b2e06d08f4c9663c0cd66a341584b6b58dad7a96978fa2827175fb5d4443eef3fb234b2ef7cc9dd2dcdcff1d246df2369c4636470f14fb842a
+  metadata.gz: 22f0b4d6c29be20d704f17ec2fe3714ad322af0ecd0f996ced4fc04c8c22689176ce90a002249906b61cc628094e02410fba4d26f069005db8462435ac7fe38d
+  data.tar.gz: ed26145ed4eb3675405313ba312462ca9172dc793b8146f0cb7dba0ec3191a34f7a11dc47b1f5be66b4377e8d3b6b77960d195608f3c584b5dff5f960f166a7e

data/README.md

@@ -48,7 +48,7 @@ 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
+    keys       - Show available keys for filtering
     values     - Show known values for the filtering key
     
 ENVIRONMENT VARIABLES

data/lib/di.rb

@@ -9,6 +9,7 @@ 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'
+require 'stf/validate/uri_validator'
 
 class DI
   class << self
@@ -60,6 +61,9 @@ class DI
                  -> {Stf::RemoveAllUserDevicesInteractor.new},
                  memoize: true)
 
+      c.register(:uri_validator,
+                 -> {Stf::URIValidator.new},
+                 memoize: true)
     end
 
     def [](what)

data/lib/stf/client.rb

@@ -4,7 +4,6 @@ require 'ostruct'
 
 require 'stf/version'
 require 'stf/log/log'
-require 'stf/errors'
 
 module Stf
   class Client

data/lib/stf/interactor/get_keys_interactor.rb

@@ -3,8 +3,6 @@ require 'di'
 
 require 'stf/client'
 require 'stf/log/log'
-require 'stf/errors'
-require 'stf/model/session'
 require 'stf/model/device'
 
 module Stf

data/lib/stf/interactor/get_values_interactor.rb

@@ -3,8 +3,6 @@ require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
-require 'stf/errors'
-require 'stf/model/session'
 require 'stf/model/device'
 
 module Stf

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -2,8 +2,6 @@ require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
-require 'stf/errors'
-require 'stf/model/session'
 require 'stf/model/device_list'
 
 module Stf
@@ -32,11 +30,11 @@ module Stf
       begin
         connect_loop(all_flag, wanted, filter, false, 5, start_timeout)
       rescue SignalException => e
-        logger.info "Caught signal #{e.message}"
+        logger.info "Caught signal \"#{e.message}\""
         DI[:stop_all_debug_sessions_interactor].execute
         return false
-      rescue
-        logger.info "Exception #{e.message} during initial connect loop"
+      rescue Exception => e
+        logger.info "Exception \"#{e.message}\" during initial connect loop"
         DI[:stop_all_debug_sessions_interactor].execute
         return false
       end
@@ -116,25 +114,5 @@ module Stf
         DI[:stop_debug_session_interactor].execute(url)
       end
     end
-
-    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
-
-      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
-
-      n
-    end
-
   end
 end

data/lib/stf/interactor/start_one_debug_session_interactor.rb

@@ -3,8 +3,6 @@ require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
-require 'stf/errors'
-require 'stf/model/session'
 
 module Stf
   class StartOneDebugSessionInteractor

data/lib/stf/interactor/stop_all_debug_sessions_interactor.rb

@@ -3,7 +3,6 @@ require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
-require 'stf/errors'
 require 'stf/interactor/stop_debug_session_interactor'
 require 'stf/model/device_list'
 

data/lib/stf/interactor/stop_debug_session_interactor.rb

@@ -3,7 +3,6 @@ require 'ADB'
 
 require 'stf/client'
 require 'stf/log/log'
-require 'stf/errors'
 
 module Stf
   class StopDebugSessionInteractor

data/lib/stf/model/device_list.rb

@@ -32,7 +32,6 @@ module Stf
     end
 
     def reject
-      # DeviceList.new(@devices.reject {|d| yield(d)})
       DeviceList.new(@devices.select {|d| !yield(d)})
     end
 

data/lib/stf/validate/uri_validator.rb

@@ -0,0 +1,7 @@
+module Stf
+  class URIValidator
+    def validate(uri)
+      return (uri =~ /\A#{URI::regexp(%w(http https))}\z/) != nil
+    end
+  end
+end

data/lib/stf/version.rb

@@ -1,3 +1,3 @@
 module Stf
-  VERSION = '0.3.0.rc8'
+  VERSION = '0.3.0.rc9'
 end

data/lib/stf/view/cli.rb

@@ -35,6 +35,9 @@ module Stf
       Log::verbose(global_options[:verbose])
 
       DI.init(global_options)
+
+      help_now!('Valid STF url is required, e.g. http(s)://openstf.local') if !DI[:uri_validator].validate(global_options[:url])
+      true
     end
 
     desc 'Search for a device available in STF and attach it to local adb server'
@@ -61,7 +64,7 @@ module Stf
       end
     end
 
-    desc 'Show avaliable keys for filtering'
+    desc 'Show available keys for filtering'
     command :keys do |c|
       c.action {puts DI[:get_keys_interactor].execute}
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stf-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc8
+  version: 0.3.0.rc9
 platform: ruby
 authors:
 - Anton Malinskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -199,7 +199,6 @@ files:
 - lib/di.rb
 - 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
@@ -210,8 +209,8 @@ files:
 - 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/validate/uri_validator.rb
 - lib/stf/version.rb
 - lib/stf/view/cli.rb
 - stf-client.gemspec

data/lib/stf/errors.rb

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

data/lib/stf/model/session.rb

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