run_loop 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 817a12d7f14f96e66f30aa4546bda3ea259bfb48e657a56050fa48e1d17c46ad
-  data.tar.gz: 70a9d1bb177ef17ffa1b9af759ed3a6615d5aaa33d9e8206ef3b4b8bfa3cf131
+  metadata.gz: 773e38132d69d69b39507b5df09c9474e4f6ede3d1dc8be2fcb4059a4daf4756
+  data.tar.gz: abd675b715e3984defb47b0797853643b1db82a4b7055a3ac8910ed1efdc518e
 SHA512:
-  metadata.gz: e5effff4b758df308400477dfeb8c2d9b21e11bb64fb4f4b9221c7571e81bc4fde57ce2ceff0542ebd9fe01ebc303ed6beffa77d83f04a40a41af6db9280d43e
-  data.tar.gz: 55ca8aeaa8b7951e816d824b720b7d46d983680140a9a7d055d2995ac0d30398df72475c2b5f9a579ce9fff6ae9836494b1139abde0271ba23017503a188ab4b
+  metadata.gz: f40b4a0e2fc0efd7293086396f70cb23a4a97f135b248cf35863d0bcaf5563dbee7927cfc2cd35c0eb88da5c6e0fe5db6762f8806b743a142f0fc4bb62431f5a
+  data.tar.gz: 7dbbf670bcad98456db942bc6ef8a0ae1bc0c05144112f7cbc2b8a5b1562e4a42ade9bbb4d1e621d3aaf2934dcb5ff07403001a5031c6e82e6c72509f7a7c9ef

data/lib/run_loop.rb

@@ -40,6 +40,7 @@ require 'run_loop/lipo'
 require "run_loop/otool"
 require "run_loop/strings"
 require 'run_loop/cache'
+require "run_loop/sim_keyboard_settings"
 require 'run_loop/patches/awesome_print'
 require 'run_loop/core_simulator'
 require "run_loop/simctl"

data/lib/run_loop/core_simulator.rb

@@ -45,6 +45,9 @@ class RunLoop::CoreSimulator
   # @!visibility private
   attr_reader :xcrun
 
+  # @!visibility private
+  attr_reader :sim_keyboard
+
   # @!visibility private
   METADATA_PLIST = '.com.apple.mobile_container_manager.metadata.plist'
 
@@ -400,6 +403,11 @@ class RunLoop::CoreSimulator
     @xcrun ||= RunLoop::Xcrun.new
   end
 
+  # @!visibility private
+  def sim_keyboard
+    @sim_keyboard ||= RunLoop::SimKeyboardSettings.new(device)
+  end
+
   # @!visibility private
   def simctl
     @simctl ||= RunLoop::Simctl.new
@@ -424,7 +432,7 @@ class RunLoop::CoreSimulator
 
     RunLoop::CoreSimulator.quit_simulator
     RunLoop::CoreSimulator.ensure_hardware_keyboard_connected(pbuddy)
-    device.simulator_ensure_software_keyboard_will_show
+    sim_keyboard.ensure_soft_keyboard_will_show
 
     args = ['open', '-g', '-a', sim_app_path, '--args',
             '-CurrentDeviceUDID', device.udid,
@@ -446,11 +454,6 @@ class RunLoop::CoreSimulator
     options = { :timeout => 5, :raise_on_timeout => true }
     RunLoop::ProcessWaiter.new(sim_name, options).wait_for_any
 
-    # open -g no longer launches application in the background. We want the
-    # Simulator to open in the background because when it is opened in the
-    # foreground, it steals (key application) focus which is disruptive.
-    send_simulator_to_background
-
     if merged_options[:wait_for_stable]
       device.simulator_wait_for_stable_state
     end
@@ -678,23 +681,6 @@ Command had no output.
     hash
   end
 
-  # @!visibility private
-  def send_simulator_to_background
-    script = "tell application \"System Events\" to tell process \"#{sim_name}\" to set visible to false"
-    begin
-      system("osascript",  "-e", script)
-    rescue => _
-      RunLoop.log_debug("Could not put simulator into the background")
-    end
-
-    script = "tell application \"System Events\" to tell process \"#{sim_name}\" to set visible to true"
-    begin
-      system("osascript",  "-e", script)
-    rescue => _
-      RunLoop.log_debug("Could not put simulator into the foreground")
-    end
-  end
-
   # @!visibility private
   def uninstall_app_with_simctl
     launch_simulator
@@ -824,7 +810,7 @@ Command had no output.
       return true
     end
 
-    if !device.simulator_software_keyboard_will_show?
+    if !sim_keyboard.soft_keyboard_will_show?
       RunLoop.log_debug("Simulator relaunch required:  software keyboard is minimized")
       return true
     end

data/lib/run_loop/device.rb

@@ -40,7 +40,6 @@ module RunLoop
     attr_reader :state
     attr_reader :simulator_root_dir
     attr_reader :simulator_accessibility_plist_path
-    attr_reader :simulator_preferences_plist_path
     attr_reader :simulator_log_file_path
 
     # Create a new device.
@@ -325,14 +324,6 @@ version: #{version}
       pbuddy.ensure_plist(directory, "com.apple.Accessibility.plist")
     end
 
-    # @!visibility private
-    def simulator_preferences_plist_path
-      return nil if physical_device?
-
-      directory = File.join(simulator_root_dir, "data", "Library", "Preferences")
-      pbuddy.ensure_plist(directory, "com.apple.Preferences.plist")
-    end
-
     # @!visibility private
     def simulator_log_file_path
       return nil if physical_device?
@@ -536,16 +527,6 @@ Could not update the Simulator languages.
       running_apps
     end
 
-    def simulator_software_keyboard_will_show?
-      plist = simulator_preferences_plist_path
-      pbuddy.plist_read("AutomaticMinimizationEnabled", plist).to_i == 0
-    end
-
-    def simulator_ensure_software_keyboard_will_show
-      plist = simulator_preferences_plist_path
-      pbuddy.plist_set("AutomaticMinimizationEnabled", "integer", 0, plist)
-    end
-
 =begin
   PRIVATE METHODS
 =end

data/lib/run_loop/device_agent/client.rb

@@ -111,6 +111,14 @@ module RunLoop
         if device.simulator? && app
           RunLoop::Core.expect_simulator_compatible_arch(device, app)
 
+          # Enable or disable keyboard autocorrection, caps lock and
+          # autocapitalization when running on simulator, disables these value by default
+          # unless user don't pass true values for these keys
+          sim_keyboard = RunLoop::SimKeyboardSettings.new(device)
+          sim_keyboard.enable_autocorrection(options[:autocorrection_enabled])
+          sim_keyboard.enable_caps_lock(options[:capslock_enabled])
+          sim_keyboard.enable_autocapitalization(options[:autocapitalization_enabled])
+
           if merged_options[:relaunch_simulator]
             RunLoop.log_debug("Detected :relaunch_simulator option; will force simulator to restart")
             RunLoop::CoreSimulator.quit_simulator
@@ -378,7 +386,13 @@ INSTANCE METHODS
         response = client.post(request)
         hash = expect_300_response(response)
         result = hash["result"]
-        result.count != 0
+
+        return false if result.count == 0
+        return false if result[0].count == 0
+
+        element = result[0]
+        hit_point = element["hit_point"]
+        hit_point["x"] != -1 && hit_point["y"] != -1
       end
 
       # @!visibility private

data/lib/run_loop/plist_buddy.rb

@@ -233,7 +233,9 @@ in plist:
             raise(ArgumentError, "expected '#{value_type}' to be one of '#{allowed_value_types}'")
           end
           value = args_hash[:value]
-          unless value
+          if value_type == 'bool'
+            value = !!value
+          elsif !value
             raise(ArgumentError, ':value is a required key for :add command')
           end
           key = args_hash[:key]
@@ -249,8 +251,10 @@ in plist:
           cmd_part = "Print :#{key}"
         when :set
           value = args_hash[:value]
-          unless value
-            raise(ArgumentError, ':value is a required key for :set command')
+          if args_hash[:type] == 'bool'
+            value = !!value
+          elsif !value
+            raise(ArgumentError, ':value is a required key for :add command')
           end
           key = args_hash[:key]
           unless key

data/lib/run_loop/sim_keyboard_settings.rb

@@ -0,0 +1,94 @@
+module RunLoop
+  class SimKeyboardSettings
+    attr_reader :pbuddy, :device, :plist
+
+    def initialize(device)
+      @device = device
+      @pbuddy = RunLoop::PlistBuddy.new
+    end
+
+    # Check if all the properties needed for the soft keyboard to appear are set
+    # Approach to negate 'true' and 'false' was chosen in order to do not
+    # reboot sim too often, as this will cover the cases when the properties
+    # are not set which means that keyboard will be shown anyways
+    #
+    # @return [Bool]
+    def soft_keyboard_will_show?
+      hw_keyboard_disabled = pbuddy.plist_read('HardwareKeyboardLastSeen', plist) != 'true'
+      soft_keyboard_enabled = pbuddy.plist_read('SoftwareKeyboardShownByTouch', plist) != 'false'
+      minimization_disabled = pbuddy.plist_read('AutomaticMinimizationEnabled', plist) != 'true'
+
+      hw_keyboard_disabled && minimization_disabled && soft_keyboard_enabled
+    end
+
+    # Add properties needed for soft keyboard to show into preferences plist
+    def ensure_soft_keyboard_will_show
+      pbuddy.plist_set('HardwareKeyboardLastSeen', 'bool', false, plist)
+      pbuddy.plist_set('SoftwareKeyboardShownByTouch', 'bool', true, plist)
+      pbuddy.plist_set('AutomaticMinimizationEnabled', 'bool', false, plist)
+    end
+
+    # Enable/disable keyboard autocorrection
+    #
+    # @param [Boolean] condition, option passed by the user in launch arguments
+    # default: nil(false)
+    def enable_autocorrection(condition)
+      pbuddy.plist_set('KeyboardAutocorrection', 'bool', condition, plist)
+    end
+
+    # Enable/disable keyboard caps lock
+    #
+    # @param [Boolean] condition, option passed by the user in launch arguments
+    # default: nil(false)
+    def enable_caps_lock(condition)
+      pbuddy.plist_set('KeyboardCapsLock', 'bool', condition, plist)
+    end
+
+    # Enable/disable keyboard autocapitalization
+    #
+    # @param [Boolean] condition, option passed by the user in launch arguments
+    # default: nil(false)
+    def enable_autocapitalization(condition)
+      pbuddy.plist_set('KeyboardAutocapitalization', 'bool', condition, plist)
+    end
+
+    # Checks if plist value that responds for autocorrection is set to true
+    #
+    # @return [Boolean]
+    def autocorrection_enabled?
+      pbuddy.plist_read('KeyboardAutocorrection', plist) == 'true'
+    end
+
+    # Checks if plist value that responds for caps lock is set to true
+    #
+    # @return [Boolean]
+    def caps_lock_enabled?
+      pbuddy.plist_read('KeyboardCapsLock', plist) == 'true'
+    end
+
+    # Checks if plist value that responds for autocapitalization is set to true
+    #
+    # @return [Boolean]
+    def autocapitalization_enabled?
+      pbuddy.plist_read('KeyboardAutocapitalization', plist) == 'true'
+    end
+
+    # Get plist path or use existing one
+    #
+    # @return [String] plist path
+    def plist
+      @plist ||= preferences_plist_path
+    end
+
+    # Get preferences plist path
+    #
+    # @return nil if doesn't run against simulator
+    # @return [String] with path to the plist
+    def preferences_plist_path
+      return nil if device.physical_device?
+
+      directory = File.join(device.simulator_root_dir, 'data', 'Library', 'Preferences')
+      pbuddy.ensure_plist(directory, 'com.apple.Preferences.plist')
+    end
+  end
+end

data/lib/run_loop/simctl.rb

@@ -596,7 +596,7 @@ while trying to list devices.
 
     # @!visibility private
     def device_available?(record)
-      record["availability"] == "(available)"
+      record["isAvailable"] == "YES" || record["availability"] == "(available)"
     end
 
     # @!visibility private

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "3.0.1"
+  VERSION = "4.0.0"
 
   # A model of a software release version that can be used to compare two versions.
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -391,6 +391,7 @@ files:
 - lib/run_loop/process_waiter.rb
 - lib/run_loop/regex.rb
 - lib/run_loop/shell.rb
+- lib/run_loop/sim_keyboard_settings.rb
 - lib/run_loop/simctl.rb
 - lib/run_loop/strings.rb
 - lib/run_loop/template.rb