lib/xcmonkey.rb in xcmonkey-1.2.0 vs lib/xcmonkey.rb in xcmonkey-1.3.0

@@ -5,38 +5,39 @@
 require_relative 'xcmonkey/version'
 require_relative 'xcmonkey/logger'
 require_relative 'xcmonkey/driver'
 
 class Xcmonkey
-  attr_accessor :driver
+  attr_accessor :params, :driver
 
   def initialize(params)
-    params[:session_path] = Dir.pwd if params[:session_path].nil?
-    params[:duration] = 60 if params[:duration].nil?
-    params[:enable_simulator_keyboard] = true if params[:enable_simulator_keyboard].nil?
-    ensure_required_params(params)
+    params[:event_count] = 60 if params[:event_count].nil?
+    params[:ignore_crashes] = false if params[:ignore_crashes].nil?
+    params[:disable_simulator_keyboard] = false if params[:disable_simulator_keyboard].nil?
+    self.params = params
     self.driver = Driver.new(params)
+    ensure_required_params
   end
 
   def run
     driver.monkey_test(gestures)
   end
 
   def gestures
-    taps = [:precise_tap, :blind_tap] * 10
-    swipes = [:precise_swipe, :blind_swipe] * 5
-    presses = [:precise_press, :blind_press]
+    taps = params[:exclude_taps] ? [] : [:precise_tap, :blind_tap] * 10
+    swipes = params[:exclude_swipes] ? [] : [:precise_swipe, :blind_swipe] * 5
+    presses = params[:exclude_presses] ? [] : [:precise_press, :blind_press]
     taps + swipes + presses
   end
 
-  def ensure_required_params(params)
+  def ensure_required_params
     Logger.error('UDID should be provided') if params[:udid].nil?
 
     Logger.error('Bundle identifier should be provided') if params[:bundle_id].nil?
 
-    Logger.error('Session path should be a directory') if params[:session_path].nil? || !File.directory?(params[:session_path])
+    Logger.error('Session path should be a directory') if params[:session_path] && !File.directory?(params[:session_path])
 
-    if params[:duration].nil? || !params[:duration].kind_of?(Integer) || !params[:duration].positive?
-      Logger.error('Duration must be Integer and not less than 1 second')
+    if params[:event_count].nil? || !params[:event_count].kind_of?(Integer) || !params[:event_count].positive?
+      Logger.error('Event count must be Integer and not less than 1')
     end
   end
 end