specify multiple apks connected

Author: ravelinx22

bin/kraken-mobile

@@ -38,7 +38,10 @@ end
 def user_entered_apk_path
   return nil if ARGV.first.nil?
 
-  File.expand_path(ARGV.first)
+  first_argument = ARGV.first
+  return nil if first_argument.start_with?('--') # Is argument parameter not apk
+
+  File.expand_path(first_argument)
 end
 
 #-------------------------------

bin/kraken_mobile_calabash_android.rb

@@ -6,20 +6,14 @@
   'calabash-android-features-skeleton'
 )
 
-def handle_calabash_android(configuration, properties_path)
+def handle_calabash_android(config_path, properties_path)
   require 'kraken-mobile/constants'
   require 'calabash-android/helpers'
-  #options = {}
-  #if configuration
-  #  ensure_configuration_is_valid File.expand_path(configuration)
-  #  options[:config_path] = File.expand_path(configuration)
-  #else
-  #  ensure_apk_is_specified
-  #  options[:apk_path] = ARGV.first
-  #end
+
   kraken = KrakenApp.new(
     apk_path: user_entered_apk_path,
-    properties_path: format_properties(properties_path)
+    properties_path: format_properties(properties_path),
+    config_path: format_config(config_path)
   )
   kraken.start
 end
@@ -34,3 +28,12 @@ def format_properties(properties_path)
 
   properties_absolute_path
 end
+
+def format_config(config_path)
+  return if config_path.nil?
+
+  config_absolute_path = File.expand_path(config_path)
+  ensure_configuration_is_valid(config_absolute_path)
+
+  config_absolute_path
+end

lib/kraken-mobile/mobile/mobile_process.rb

@@ -38,7 +38,39 @@ def execution_command
     #{feature_path} --tags @user#{id}"
   end
 
+  #-------------------------------
+  # Helpers
+  #-------------------------------
+
   def apk_path
-    @test_scenario&.kraken_app&.apk_path_for_process_id(@id)
+    return config_apk_path if @test_scenario.requires_predefined_devices?
+
+    path = @test_scenario&.kraken_app&.apk_path
+    raise 'ERROR: Invalid APK file path' if path.nil?
+
+    path
+  end
+
+  def config_json
+    config_absolute_path = File.expand_path(ENV[K::CONFIG_PATH])
+    file = open(config_absolute_path)
+    content = file.read
+    JSON.parse(content)[@id.to_s] || {}
+  end
+
+  def config_apk_path
+    device_config_json = config_json
+    return if device_config_json['config'].nil?
+    return if device_config_json['config']['apk_path'].nil?
+
+    absolute_config_apk_path = File.expand_path(
+      device_config_json['config']['apk_path']
+    )
+
+    raise 'ERROR: Invalid config apk path' unless File.file?(
+      absolute_config_apk_path
+    )
+
+    absolute_config_apk_path
   end
 end

lib/kraken-mobile/steps/mobile/kraken_steps.rb

@@ -119,14 +119,14 @@ def handle_property(property)
 end
 
 def all_user_properties_as_json
-  raise 'ERROR: No properties file found' if ENV['PROPERTIES_PATH'].nil?
+  raise 'ERROR: No properties file found' if ENV[K::PROPERTIES_PATH].nil?
 
-  properties_aboslute_path = File.expand_path(ENV['PROPERTIES_PATH'])
+  properties_absolute_path = File.expand_path(ENV[K::PROPERTIES_PATH])
   raise 'ERROR: Properties file not found' unless File.file?(
-    properties_aboslute_path
+    properties_absolute_path
   )
 
-  file = open(properties_aboslute_path)
+  file = open(properties_absolute_path)
   content = file.read
   JSON.parse(content)
 end

lib/kraken-mobile/test_scenario.rb

@@ -91,6 +91,10 @@ def self.ready_to_finish?
     end
   end
 
+  def requires_predefined_devices?
+    !ENV[K::CONFIG_PATH].nil?
+  end
+
   private
 
   def start_process_for_user_id_in_device(user_id, device)
@@ -120,6 +124,8 @@ def start_web_process_for_user_id_in_device(user_id, device)
   end
 
   def sample_devices
+    return predefined_devices if requires_predefined_devices?
+
     (sample_mobile_devices + sample_web_devices).flatten
   end
 
@@ -161,4 +167,18 @@ def delete_all_web_inboxes
       File.delete(file)
     end
   end
+
+  def predefined_devices
+    config_absolute_path = File.expand_path(ENV[K::CONFIG_PATH])
+    file = open(config_absolute_path)
+    content = file.read
+    devices_json = JSON.parse(content).values
+
+    devices_json.map do |device_json|
+      AndroidDevice.new(
+        id: device_json['id'],
+        model: device_json['model']
+      )
+    end
+  end
 end

lib/kraken-mobile/utils/k.rb

@@ -12,6 +12,8 @@ module K
   MONKEY_DEFAULT_TIMEOUT = 5 unless defined? MONKEY_DEFAULT_TIMEOUT
   WEB_DEVICE = 'WEB_DEVICE' unless defined? WEB_DEVICE
   ANDROID_DEVICE = 'ANDROID_DEVICE' unless defined? ANDROID_DEVICE
+  PROPERTIES_PATH = 'PROPERTIES_PATH' unless defined? PROPERTIES_PATH
+  CONFIG_PATH = 'CONFIG_PATH' unless defined? CONFIG_PATH
 
   unless defined? DEFAULT_START_TIMEOUT_SECONDS
     DEFAULT_START_TIMEOUT_SECONDS = 600 # 10.minutes

lib/kraken_mobile.rb

@@ -15,30 +15,23 @@ class KrakenApp
   #-------------------------------
   # Constructors
   #-------------------------------
-  def initialize(apk_path:, properties_path: nil)
+  def initialize(apk_path:, properties_path: nil, config_path: nil)
     @apk_path = apk_path
     @scenarios_queue = []
-    build_scenarios_queue
-
     save_path_in_environment_variable_with_name(
-      name: 'PROPERTIES_PATH',
-      path: properties_path
+      name: K::PROPERTIES_PATH, path: properties_path
+    )
+    save_path_in_environment_variable_with_name(
+      name: K::CONFIG_PATH, path: config_path
     )
+
+    build_scenarios_queue
   end
 
   def start
     execute_next_scenario
   end
 
-  #-------------------------------
-  # Helpers
-  #-------------------------------
-  def apk_path_for_process_id(_process_id)
-    raise 'ERROR: Invalid APK file path' if @apk_path.nil?
-
-    @apk_path
-  end
-
   #-------------------------------
   # Observers
   #-------------------------------