run_loop 4.3.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81d7a5431434f1687a7de8f24ade09aaf70cbe3da811fa656a49bd2cecdd8c1b
-  data.tar.gz: 2ff49f10b35b523c51b28814d19a35bcdd43e3656e6a93143d689289e71696cf
+  metadata.gz: 783cda95e8fce11354b0e1c06d0b682b2013f33f162f9a172e9d61dfa27393a4
+  data.tar.gz: 255ec74838502bde8e54e901cd9fd884098a0229ae4711c45a32913451b6f579
 SHA512:
-  metadata.gz: e69dd4687d06bf07a787db97fdaea90e894c39012165703e7b6bbfdc3fb4d49f26f0c1b0f85eef2201002a115ceb6904ba1f4c820dd65e979edeca3d86eb5801
-  data.tar.gz: 48eb4a1533dff8f7eff5e8d0241f2e542c526f8735ed89c167f4e7ee30843629d976193099f09268c6d708dfe018a82b1928804b37fb943a10a11374c30dd50b
+  metadata.gz: 04cea1bbb737d712b1eb471717f70493f203ded01631cbcb1b52990df22e8cf7bb853107dda3d0aa818a5e6479e8f14e645aa70ee6aa9e56e982e1d05e59c8a2
+  data.tar.gz: 608a3d2e5446af33d26dceb946995dcb43ededb59e200f210dcec3da706842feafae7884caddf5c019367f5382e4a4cca4461b4d406033f0ecf299ae38fc8117

data/lib/run_loop/core.rb

@@ -319,25 +319,10 @@ Logfile: #{log_file}
     # @param [RunLoop::Xcode] xcode Used to detect the current xcode
     #  version.
     def self.default_simulator(xcode=RunLoop::Xcode.new)
-      version = xcode.version
-      xcode_major = version.major
-      xcode_minor = version.minor
-      major = xcode_major + 2
-      minor = xcode_minor
-
-      if xcode_major == 11
-        model = "Xs"
-      elsif xcode_major == 10
-        if minor >= 2
-          model = "Xs"
-        else
-          model = "XS"
-        end
-      else
-        model = xcode_major - 1
-      end
+      ios_version = xcode.ios_version
+      device = xcode.default_device
 
-      "iPhone #{model} (#{major}.#{minor})"
+      "#{device} (#{ios_version.major}.#{ios_version.minor})"
     end
 
     def self.create_uia_pipe(repl_path)

data/lib/run_loop/core_simulator.rb

@@ -1163,23 +1163,18 @@ Command had no output.
 
   # @!visibility private
   def self.system_applications_dir(xcode=RunLoop::Xcode.new)
-    base_dir = xcode.developer_dir
-
-    if xcode.version_gte_110?
-      apps_dir = File.join("Platforms", "iPhoneOS.platform", "Library",
-                           "Developer", "CoreSimulator", "Profiles", "Runtimes",
-                           "iOS.simruntime", "Contents", "Resources",
-                           "RuntimeRoot", "Applications")
-    elsif xcode.version_gte_90?
-      apps_dir = File.join("Platforms", "iPhoneOS.platform", "Developer",
-                           "Library", "CoreSimulator", "Profiles", "Runtimes",
-                           "iOS.simruntime", "Contents", "Resources",
-                           "RuntimeRoot", "Applications")
+    if xcode.version_gte_90?
+      apps_dir = File.join(xcode.core_simulator_dir,
+                          "Profiles", "Runtimes", "iOS.simruntime",
+                          "Contents", "Resources", "RuntimeRoot",
+                          "Applications")
     else
-      apps_dir = File.join("Platforms", "iPhoneSimulator.platform", "Developer",
-                           "SDKs", "iPhoneSimulator.sdk", "Applications")
+      apps_dir = File.join(xcode.developer_dir,
+                          "Platforms", "iPhoneSimulator.platform",
+                          "Developer", "SDKs", "iPhoneSimulator.sdk",
+                          "Applications")
     end
-    File.expand_path(File.join(base_dir, apps_dir))
+    File.expand_path(apps_dir)
   end
 
   # @!visibility private

data/lib/run_loop/device.rb

@@ -259,9 +259,12 @@ version: #{version}
       end
 
       if ios_version.major == (xcode_version.major + 2)
-        return ios_version.minor <= xcode_version.minor
+        if xcode_version.major == 10 && xcode_version.minor == 3
+          return ios_version.minor <= 4
+        else
+          return ios_version.minor <= xcode_version.minor
+        end
       end
-
       false
     end
 
@@ -777,15 +780,12 @@ https://github.com/calabash/calabash-ios/wiki/Testing-on-Physical-Devices
 
     # @!visibility private
     def simulator_running_system_app_pids
-      base_dir = xcode.developer_dir
-      if xcode.version_gte_110?
-        sim_apps_dir = "Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications"
-      elsif xcode.version_gte_90?
-        sim_apps_dir = "Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications"
+      if xcode.version_gte_90?
+        sim_apps_dir = File.join(xcode.core_simulator_dir, "Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/Applications")
       else
-        sim_apps_dir = "Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/Applications"
+        sim_apps_dir = File.join(xcode.developer_dir, "Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/Applications")
       end
-      path = File.expand_path(File.join(base_dir, sim_apps_dir))
+      path = File.expand_path(sim_apps_dir)
       RunLoop::ProcessWaiter.pgrep_f(path)
     end
   end

data/lib/run_loop/l10n.rb

@@ -17,9 +17,8 @@ module RunLoop
       key_name_lookup_table(lookup_table_dir)[key_code]
     end
 
-    UIKIT_AXBUNDLE_PATH_CORE_SIM = 'Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/UIKit.axbundle/'
-    UIKIT_AXBUNDLE_PATH_CORE_SIM_XCODE_9 = "Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/AccessibilityBundles/UIKit.axbundle"
-    UIKIT_AXBUNDLE_PATH_CORE_SIM_XCODE_11 = "Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/AccessibilityBundles/UIKit.axbundle"
+    UIKIT_AXBUNDLE_PATH_CORE_SIM = 'Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/AccessibilityBundles/UIKit.axbundle'
+    UIKIT_AXBUNDLE_PATH_CORE_SIM_XCODE_9 = "Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/System/Library/AccessibilityBundles/UIKit.axbundle"
 
     LANG_CODE_TO_LANG_NAME_MAP = {
           'en' => 'English',
@@ -72,10 +71,8 @@ module RunLoop
     end
 
     def uikit_bundle_l10n_path
-      if xcode.version_gte_110?
-        File.join(xcode.developer_dir, UIKIT_AXBUNDLE_PATH_CORE_SIM_XCODE_11)
-      elsif xcode.version_gte_90?
-        File.join(xcode.developer_dir, UIKIT_AXBUNDLE_PATH_CORE_SIM_XCODE_9)
+      if xcode.version_gte_90?
+        File.join(xcode.core_simulator_dir, UIKIT_AXBUNDLE_PATH_CORE_SIM_XCODE_9)
       else
         File.join(xcode.developer_dir, UIKIT_AXBUNDLE_PATH_CORE_SIM)
       end

data/lib/run_loop/version.rb

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

data/lib/run_loop/xcode.rb

@@ -34,6 +34,14 @@ module RunLoop
       fetch_version(:v110)
     end
 
+  # Returns a version instance for Xcode 10.3; used to check for the
+    # availability of features and paths to various items on the filesystem
+    #
+    # @return [RunLoop::Version] 10.3
+    def v103
+      fetch_version(:v103)
+    end
+
     # Returns a version instance for Xcode 10.2; used to check for the
     # availability of features and paths to various items on the filesystem
     #
@@ -129,6 +137,13 @@ module RunLoop
       version >= v110
     end
 
+    # Is the active Xcode version 10.3 or above?
+    #
+    # @return [Boolean] `true` if the current Xcode version is >= 10.3
+    def version_gte_103?
+      version >= v103
+    end
+
     # Is the active Xcode version 10.2 or above?
     #
     # @return [Boolean] `true` if the current Xcode version is >= 10.2
@@ -299,6 +314,48 @@ $ man xcode-select
       end
     end
 
+    def core_simulator_dir
+      if version_gte_110?
+        core_simulator_dir = File.join(developer_dir,
+                                      'Platforms', 'iPhoneOS.platform', 'Library',
+                                      'Developer', 'CoreSimulator')
+      else
+        core_simulator_dir = File.join(developer_dir,
+                                      'Platforms', 'iPhoneOS.platform', 'Developer',
+                                      'Library', 'CoreSimulator')
+      end
+      File.expand_path(core_simulator_dir)
+    end
+
+    def ios_version
+      xcode_version = version
+      sim_major = xcode_version.major + 2
+      sim_minor = xcode_version.minor
+      if xcode_version == v103
+        sim_minor = 4
+      end
+
+      return RunLoop::Version.new("#{sim_major}.#{sim_minor}")
+    end
+
+    def default_device
+      xcode_version = version
+      if xcode_version.major == 11
+        return "iPhone 11"
+      end
+
+      if xcode_version.major == 10
+        if xcode_version.minor >= 2
+          return "iPhone Xs"
+        else
+          return "iPhone XS"
+        end
+      end
+
+      # Xcode < 10
+      return "iPhone #{xcode_version.major - 1}"
+    end
+
     private
 
     attr_reader :xcode_versions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments