optimus-runner 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ec6e38fa09d3d5c364f7ab473b1572b9075c25f69445e02a3a4265a50ed038
-  data.tar.gz: 9a1a2cbc2065d4d1a8c91f43a0f2df0c933721e259e2a947b5f011d16bca53ec
+  metadata.gz: 13e5dec7f952733d14d108f33347b3e16605b34978bad30bbe7b838068f4a4e9
+  data.tar.gz: 3acc90f802671fb7ae07c11f32a07414ef7a4fa7d1d1062d054fde92c7f2fcd2
 SHA512:
-  metadata.gz: ad8cf9a494337da54ac408fb8239185876ac12a4b9084ee5507bb75948502b3b0cd862025534afdc6e32d4fd746f2fe9354504f29d7215b6347a927789d5dd94
-  data.tar.gz: 4ac5cda006e849ee1d23defd7efc622d9a2757f0a033a3b05dd07d8787244e26353817bc3e771fb2de911d34fbb558006e970704784f6fb923a4e181e580c161
+  metadata.gz: 2ad4243220a96544d38d89971de59810dd65b1e36f117d6dc61acca2af20ef48adebf6a85ddb04c23da96caeea762206b092cf300659c5eb57bd589557ee8921
+  data.tar.gz: e675ea483105f3e0c45523fc539bd04665d176c723c5ea13858ff5a9904876f63417945a204d6116dc44ccfb6c4d1e5e7c1366342fb756e75c46c1ea7881244e

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    optimus-runner (1.0.2)
+    optimus-runner (1.1.4)
       aasm (~> 5.0)
       daemons (~> 1.3)
       dotenv (~> 2.1, >= 2.1.1)
+      exponential-backoff (~> 0.0.4)
       httparty (~> 0.16.3)
+      nenv (~> 0.3.0)
       open4 (~> 1.3)
       os (~> 1.0, >= 1.0.1)
       random-port (~> 0.3.1)
@@ -14,14 +16,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (5.0.6)
+    aasm (5.0.8)
       concurrent-ruby (~> 1.0)
     concurrent-ruby (1.1.6)
     daemons (1.3.1)
     diff-lcs (1.3)
     dotenv (2.7.5)
-    et-orbi (1.2.2)
+    et-orbi (1.2.4)
       tzinfo
+    exponential-backoff (0.0.4)
     fugit (1.3.3)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
@@ -32,6 +35,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     multi_xml (0.6.0)
+    nenv (0.3.0)
     open4 (1.3.4)
     os (1.0.1)
     raabro (1.1.6)

data/exe/optimus-runner

@@ -18,10 +18,21 @@ options = {
     :log_dir            => "#{File.expand_path('~')}/optimus_runner/logs",
     :logfilename        => 'optimus-runner.log'
 }
+
+ENV["ANDROID"]="true"
+ENV["IOS"]="true"
 optparser = OptionParser.new do |parser|
       parser.on('-e=FILE','--env=FILE', "Optimus Cloud Environment file") do |file|
         Dotenv.load(file)
       end
+      parser.on('-a','--android-only',"Create sessions for android") do 
+        ENV["IOS"]="false"
+        p "running android"
+      end
+      parser.on('-i','--ios-only',"Create sessions for iOS") do 
+        ENV["ANDROID"]="false"
+        p "running ios"
+      end
     end
 optparser.parse!(ARGV)
 Daemons.run(File.join(File.dirname(__FILE__),'optimus_runner_manager'), options)

data/exe/optimus_runner_manager

@@ -18,5 +18,10 @@ scheduler.interval '5s', :first_in => 0.1 do
     optimus_runner_sm.add if optimus_runner_sm.new_device_added?
     optimus_runner_sm.remove if optimus_runner_sm.device_removed?
     optimus_runner_sm.restart if optimus_runner_sm.session_terminated?
+    optimus_runner_sm.empty if optimus_runner_sm.cloud_session_empty? # You have done FLUSHALL in akira
+end
+
+scheduler.every '1m', :first_in => 60 do
+    optimus_runner_sm.session_state 
 end
 scheduler.join

data/lib/optimus-runner/AppiumLocalService.rb

@@ -53,9 +53,9 @@ class AppiumLocalService
   def get_cmd(device_detail)
     case device_detail["platform"]
     when "ANDROID"
-      return "appium -p #{@port} --bootstrap-port #{get_random_port}"
+      return "appium -p #{@port} --bootstrap-port #{get_random_port} --relaxed-security --default-capabilities '{\"systemPort\":#{get_random_port}}'"
     when "IOS"
-      return "appium -p #{@port} --webdriveragent-port #{get_random_port}"
+      return "appium -p #{@port} --webdriveragent-port #{get_random_port} --relaxed-security"
     end
   end
 

data/lib/optimus-runner/DeviceDetails.rb

@@ -1,6 +1,7 @@
 require 'HTTParty'
 require 'optimus-runner/clients/mdb_client'
 require 'os'
+require 'nenv'
 
 class DeviceDetails
 
@@ -17,12 +18,16 @@ class DeviceDetails
   end
 
   def process_android_devices
-    devices = `adb devices`
+    if(Nenv.android?) 
+      devices = `adb devices`
+    else 
+      devices = []
+    end
     return MDBClient.new.format_android_devices devices
   end
 
   def process_ios_devices
-    if(OS.mac?) 
+    if(OS.mac? && Nenv.ios?) 
      devices = `instruments -s devices | grep 'iPhone'`
      return [] if devices.length == 0
       return MDBClient.new.format_ios_devices devices
@@ -32,14 +37,16 @@ class DeviceDetails
 
   def find_android_devices(device_names)
     device_details = []
-    device_names.each do |a|
-      puts "adb -s #{a['udid']} shell getprop ro.product.model"
-      device_model =  `adb -s #{a['udid']} shell getprop ro.product.model`
-      device_os_version =  `adb -s #{a['udid']} shell getprop ro.build.version.release`
-      a['deviceName'] = device_model.to_s.rstrip
-      a['platformVersion'] = device_os_version.to_s.rstrip
-      a["platform"] = "ANDROID"
-      device_details.push(a)
+    if(Nenv.android?)
+      device_names.each do |a|
+        puts "adb -s #{a['udid']} shell getprop ro.product.model"
+        device_model =  `adb -s #{a['udid']} shell getprop ro.product.model`
+        device_os_version =  `adb -s #{a['udid']} shell getprop ro.build.version.release`
+        a['deviceName'] = device_model.to_s.rstrip
+        a['platformVersion'] = device_os_version.to_s.rstrip
+        a["platform"] = "ANDROID"
+        device_details.push(a)
+      end
     end
     device_details
   end

data/lib/optimus-runner/clients/AkiraClient.rb

@@ -28,6 +28,14 @@ class AkriaClient
     HTTParty.put(uri, query: query_params, headers: get_default_headers)
   end
 
+  def release_session(session_url)
+    uri = "#{@base_uri}/sessionState/release"
+    query_params = {
+        'sessionUrl':session_url
+    }
+    HTTParty.put(uri, query: query_params, headers: get_default_headers)
+  end
+
   def get_session_info(session_url)
     uri = "#{@base_uri}/sessionInfo"
     puts uri
@@ -39,6 +47,25 @@ class AkriaClient
     return session_info
   end
 
+  def get_session_state(session_url)
+    uri = "#{@base_uri}/sessionState"
+    query_params = {
+        'sessionUrl':session_url
+    }
+    response = HTTParty.get(uri, query: query_params, headers: get_default_headers)
+    p response
+    session_state  = response
+    return session_state
+  end
+
+  def get_all_sessions
+    uri = "#{@base_uri}/sessionsList"
+    puts uri
+    response = HTTParty.get(uri, headers: get_default_headers)
+    sessions  = JSON.parse(response.to_s)
+    return sessions
+  end
+
 
   def get_default_headers
     headers = {
@@ -48,4 +75,7 @@ class AkriaClient
   end
 
 
+  
+
+
 end

data/lib/optimus-runner/clients/AppiumServerClient.rb

@@ -0,0 +1,18 @@
+require 'HTTParty'
+
+class AppiumServerClient
+    def isSessionAlive?(session_url)
+        uri = "#{session_url}/sessions"
+        response = HTTParty.get(uri, headers: get_default_headers)
+        sessions  = JSON.parse(response.to_s)
+        session_state =  sessions["value"].empty?
+        return !session_state
+    end
+
+    def get_default_headers
+        headers = {
+            'Content-Type': "Application/json"
+        }
+        return  headers
+      end
+end

data/lib/optimus-runner/server/optimus_runner_sm.rb

@@ -7,9 +7,10 @@ require 'json'
 require 'optimus-runner/AppiumLocalService'
 require 'optimus-runner/SessionInfoBuilder'
 require 'optimus-runner/clients/AkiraClient'
-require 'optimus-runner/clients/AkiraClient'
+require 'optimus-runner/clients/AppiumServerClient'
 require 'logger'
 require 'optimus-runner/commands/ShellCommands'
+require 'exponential_backoff'
 
 class OptimusRunnerSM
   include AASM
@@ -51,6 +52,16 @@ class OptimusRunnerSM
       transitions :from => [:created, :added, :removed, :restarted], :to => :created, :guard => :devices_available?
       transitions :from => [:created, :added, :removed, :restarted], :to => :idle
     end
+
+    event :empty, :before => :empty_sessions do
+      transitions :from => [:created, :added, :removed, :restarted], :to => :added, :guard => :cloud_session_empty?
+      transitions :from => [:created, :added, :removed, :restarted], :to => :created, :guard => :devices_available?
+      transitions :from => [:created, :added, :removed, :restarted], :to => :idle
+    end
+
+    event :session_state, :before => :is_session_alive? do
+      transitions :from => [:created, :added, :removed, :restarted], :to => :created, :guard => :devices_available?
+    end
   end
 
   def devices_available?
@@ -76,6 +87,10 @@ class OptimusRunnerSM
     @session_restarted
   end
 
+  def session_empty?
+    @sessions_empty
+  end
+
   def gather_devices
     details = DeviceDetails.new
     @device_details = details.get_device_details
@@ -86,7 +101,6 @@ class OptimusRunnerSM
     return unless devices_available?
     @logger.info "Device details found are #{@device_details}"
     sessions = AppiumLocalService.new.launch_appium_sessions(@device_details)
-    puts sessions
     @session_info = sessions
     AkriaClient.new.save_sessions(@session_info)
   end
@@ -98,7 +112,6 @@ class OptimusRunnerSM
     # session_info = SessionInfo.new(session,device_details).create_session_info
     AkriaClient.new.save_sessions(session_info)
     @session_info.push session_info[0]
-    p @session_info
   end
 
   def add_sessions
@@ -127,8 +140,6 @@ class OptimusRunnerSM
         @initial_device_set = @device_details
       end
     end
-
-
   end
 
   def session_terminated?
@@ -162,6 +173,35 @@ class OptimusRunnerSM
     @session_restarted = true
   end
 
+  def empty_sessions
+    return unless devices_available?
+    if cloud_session_empty?
+      p "Session Info #{@session_info}"
+      AkriaClient.new.save_sessions(@session_info)
+    end
+  end
+
+  def cloud_session_empty?
+    sessions = AkriaClient.new.get_all_sessions
+    return false if sessions.instance_of? Array
+    return true if sessions.key?("errorCode")
+  end
+
+  def session_state
+    return unless devices_available?
+      @session_info.each do |session|
+        if(is_session_engaged?(session["sessionUrl"]))
+          AkriaClient.new.release_session session["sessionUrl"] unless AppiumServerClient.new.isSessionAlive? session["sessionUrl"]
+        end
+      end
+  end
+
+  def is_session_engaged?(session_url) 
+    session_state = AkriaClient.new.get_session_state session_url
+    p "Session state is #{session_state}"
+    return session_state.casecmp?("ENGAGED")
+  end
+
   def new_device_added?
     added_device = get_added_devices
     p "Is new devices added #{added_device.length>0}"
@@ -203,5 +243,4 @@ class OptimusRunnerSM
     removed_device = @initial_device_set - @device_details
     return removed_device
   end
-end
-
+end

data/lib/optimus-runner/version.rb

@@ -1,3 +1,3 @@
 module Gandalf
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/optimus-runner.gemspec

@@ -31,4 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aasm', '~> 5.0'
   spec.add_dependency 'rufus-scheduler', '~> 3.2'
   spec.add_dependency 'os', '~> 1.0', '>= 1.0.1'
+  spec.add_dependency 'nenv', '~> 0.3.0'
+  spec.add_dependency 'exponential-backoff', '~> 0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimus-runner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - KrishnanandB
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,6 +182,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: nenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: exponential-backoff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: ''
 email:
 - krisnanandb@gmail.com
@@ -215,6 +243,7 @@ files:
 - lib/optimus-runner/DeviceDetails.rb
 - lib/optimus-runner/SessionInfoBuilder.rb
 - lib/optimus-runner/clients/AkiraClient.rb
+- lib/optimus-runner/clients/AppiumServerClient.rb
 - lib/optimus-runner/clients/mdb_client.rb
 - lib/optimus-runner/commands/ShellCommands.rb
 - lib/optimus-runner/server/appium_server_manager.rb
@@ -224,16 +253,13 @@ files:
 - lib/optimus-runner/utils/optimuscloudenv.rb
 - lib/optimus-runner/version.rb
 - lib/optimus_runner_control.rb
-- optimus-runner-0.12.0.gem
-- optimus-runner-0.13.0.gem
-- optimus-runner-0.14.0.gem
 - optimus-runner.gemspec
 - pids/optimus-runner.log
 - pids/optimus_runner_outputfile.txt
 homepage: https://gitlab.com/testvagrant/optimus-pleiades/optimus-cloud/optimus-runner
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -249,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A worker service project
 test_files: []