run_loop 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7552a576fe17fc056f8bd701a86c3f9b48a494d
-  data.tar.gz: 3cc4607e284f43dd237059386d2c4d1e97dc1934
+  metadata.gz: 5fa8d6acd657ee7230c4095b970215199e1e9d03
+  data.tar.gz: b06b85cde2448ca8f5a97f79a834c237f920d008
 SHA512:
-  metadata.gz: 2adcaae646576ab37d3ab5e0a9afff7dfcb13f262e53f1ef545521b3ca325054f0cd00b22038511d8fdad11b2c5d9072b070a64f60d645302919327977ac25a0
-  data.tar.gz: 21e54fdbf93061cb3a7ba279aede270c25e2118c22474f13a11c22a93d9c43916b4eaf52d92538878c2ef97e9311d57e69bc70bbe96bb84cf73f8799fef11ff9
+  metadata.gz: ccd75f46828607b5e5d40df9acfa688f15ff5b812f9366657b9638cb93cd316080b02652f97f8bdcc0299ffeb167461925a85b26c2177313b9f52960126f70c9
+  data.tar.gz: c87f40e81cad88dcd0f5d29b9d49a76920f3b06f263d2ad8fab45fd84eff07c509ea43f7a6af64ee1e7c8ac05172952b0878920edf18182a5ed139628993d0c0

data/lib/run_loop/device_agent/ios_device_manager.rb

@@ -75,10 +75,23 @@ but binary does not exist at that path.
       #
       # ~/.calabash/iOSDeviceManager/logs/current.log
       #
-      # There is still occasional output to ~/.run-loop.
+      # Starting in run-loop 2.4.0, iOSDeviceManager start_test was replaced
+      # by xcodebuild test-without-building.   This change causes a name
+      # conflict: there is already an xcodebuild launcher with a log file
+      # ~/.run-loop/DeviceAgent/xcodebuild.log.
+      #
+      # The original xcodebuild launcher requires access to the DeviceAgent
+      # Xcode project which is not yet available to the public.
+      #
+      # Using `current.log` seems to make sense because the file is recreated
+      # for every call to `#launch`.
       def self.log_file
-        path = File.join(LauncherStrategy.dot_dir, "ios-device-manager.log")
+        path = File.join(LauncherStrategy.dot_dir, "current.log")
         FileUtils.touch(path) if !File.exist?(path)
+        legacy_path = File.join(LauncherStrategy.dot_dir, "ios-device-manager.log")
+        if File.exist?(legacy_path)
+          FileUtils.rm_rf(legacy_path)
+        end
         path
       end
 
@@ -140,9 +153,9 @@ Could not install #{runner.runner}.  iOSDeviceManager says:
 
         cmd = "xcrun"
         args = ["xcodebuild", "test-without-building",
-                "-xctestrun", path_to_xctestrun(device),
+                "-xctestrun", path_to_xctestrun,
                 "-destination", "id=#{device.udid}",
-                "-derivedDataPath", derived_data_directory]
+                "-derivedDataPath", Xcodebuild.derived_data_directory]
 
         log_file = IOSDeviceManager.log_file
         FileUtils.rm_rf(log_file)
@@ -200,12 +213,21 @@ iOSDeviceManager says:
         hash[:exit_status] == 0
       end
 
-      def path_to_xctestrun(device)
+      def path_to_xctestrun
         if device.physical_device?
-          File.join(runner.tester, "DeviceAgent-device.xctestrun")
+          path = File.join(runner.tester, "DeviceAgent-device.xctestrun")
+          if !File.exist?(path)
+            raise RuntimeError, %Q[
+Could not find an xctestrun file at path:
+
+#{path}
+
+]
+          end
+          path
         else
-          template = File.join(runner.tester, "DeviceAgent-simulator-template.xctestrun")
-          path = File.join(RunLoop::DotDir.directory, "xcuitest", "DeviceAgent-simulator.xctestrun")
+          template = path_to_xctestrun_template
+          path = File.join(IOSDeviceManager.dot_dir, "DeviceAgent-simulator.xctestrun")
           contents = File.read(template).force_encoding("UTF-8")
           substituted = contents.gsub("TEST_HOST_PATH", runner.runner)
           File.open(path, "w:UTF-8") do |file|
@@ -215,10 +237,21 @@ iOSDeviceManager says:
         end
       end
 
-      def derived_data_directory
-        path = File.join(RunLoop::DotDir.directory, "xcuitest", "DerivedData")
-        FileUtils.mkdir_p(path) if !File.exist?(path)
-        path
+      def path_to_xctestrun_template
+        if device.physical_device?
+          raise(ArgumentError, "Physical devices do not require an xctestrun template")
+        end
+
+        template = File.join(runner.tester, "DeviceAgent-simulator-template.xctestrun")
+        if !File.exist?(template)
+          raise RuntimeError, %Q[
+Could not find an xctestrun template at path:
+
+#{template}
+
+]
+        end
+        template
       end
     end
   end

data/lib/run_loop/device_agent/launcher_strategy.rb

@@ -46,12 +46,17 @@ DeviceAgent is only available for iOS >= 9.0
 
       # @!visibility private
       def self.dot_dir
-        path = File.join(RunLoop::DotDir.directory, "xcuitest")
+        path = File.join(RunLoop::DotDir.directory, "DeviceAgent")
+        legacy_path = File.join(RunLoop::DotDir.directory, "xcuitest")
 
-        if !File.exist?(path)
-          FileUtils.mkdir_p(path)
+        if File.directory?(legacy_path)
+          FileUtils.cp_r(legacy_path, path)
+          FileUtils.rm_rf(legacy_path)
+        else
+          if !File.exist?(path)
+            FileUtils.mkdir_p(path)
+          end
         end
-
         path
       end
     end

data/lib/run_loop/device_agent/xcodebuild.rb

@@ -14,6 +14,13 @@ module RunLoop
         path
       end
 
+      # @!visibility private
+      def self.derived_data_directory
+        path = File.join(Xcodebuild.dot_dir, "DerivedData")
+        FileUtils.mkdir_p(path) if !File.exist?(path)
+        path
+      end
+
       # @!visibility private
       def to_s
         "#<Xcodebuild #{workspace}>"
@@ -75,7 +82,7 @@ Use the CBXWS environment variable to override the default.
         args = [
           "xcrun",
           "xcodebuild",
-          "-derivedDataPath", derived_data_directory,
+          "-derivedDataPath", Xcodebuild.derived_data_directory,
           "-scheme", "AppStub",
           "-workspace", workspace,
           "-config", "Debug",
@@ -109,12 +116,6 @@ Use the CBXWS environment variable to override the default.
         relative = File.expand_path(File.join(this_dir, "..", "..", "..", ".."))
         File.join(relative, "DeviceAgent.iOS/DeviceAgent.xcworkspace")
       end
-
-      def derived_data_directory
-        path = File.join(Xcodebuild.dot_dir, "DerivedData")
-        FileUtils.mkdir_p(path) if !File.exist?(path)
-        path
-      end
     end
   end
 end

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
   # 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: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json