run_loop 1.5.1 → 1.5.2

data/lib/run_loop/logging.rb

@@ -1,4 +1,8 @@
 module RunLoop
+
+  # @!visibility private
+  #
+  # This class is required for the XTC.
   class Logging
 
     def self.log_info(logger, message)
@@ -33,4 +37,68 @@ module RunLoop
     end
 
   end
+
+  # These are suitable for anything that does not need to be logged on the XTC.
+
+  # cyan
+  def self.log_unix_cmd(msg)
+    if RunLoop::Environment.debug?
+      puts self.cyan("EXEC: #{msg}") if msg
+    end
+  end
+
+  # blue
+  def self.log_warn(msg)
+    puts self.blue("WARN: #{msg}") if msg
+  end
+
+  # magenta
+  def self.log_debug(msg)
+    if RunLoop::Environment.debug?
+      puts self.magenta("DEBUG: #{msg}") if msg
+    end
+  end
+
+  # red
+  def self.log_error(msg)
+    puts self.red("ERROR: #{msg}") if msg
+  end
+
+  private
+
+  # @!visibility private
+  def self.windows_env?
+    RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  end
+
+  # @!visibility private
+  def self.colorize(string, color)
+    if self.windows_env?
+      string
+    elsif RunLoop::Environment.xtc?
+      string
+    else
+      "\033[#{color}m#{string}\033[0m"
+    end
+  end
+
+  # @!visibility private
+  def self.red(string)
+    colorize(string, 31)
+  end
+
+  # @!visibility private
+  def self.blue(string)
+    colorize(string, 34)
+  end
+
+  # @!visibility private
+  def self.magenta(string)
+    colorize(string, 35)
+  end
+
+  # @!visibility private
+  def self.cyan(string)
+    colorize(string, 36)
+  end
 end

data/lib/run_loop/simctl/bridge.rb

@@ -47,6 +47,21 @@ module RunLoop::Simctl
       terminate_core_simulator_processes
     end
 
+    # The sha1 of the installed app.
+    def installed_app_sha1
+      installed_bundle = fetch_app_dir
+      if installed_bundle
+        RunLoop::Directory.directory_digest(installed_bundle)
+      else
+        nil
+      end
+    end
+
+    # Is the app that is install the same as the one we have in hand?
+    def same_sha1_as_installed?
+      app.sha1 == installed_app_sha1
+    end
+
     # @!visibility private
     def is_sdk_8?
       @is_sdk_8 ||= device.version >= RunLoop::Version.new('8.0')
@@ -198,8 +213,6 @@ module RunLoop::Simctl
 
             # Xcode 7
             ['ids_simd', true],
-            ['com.apple.CoreSimulator.CoreSimulatorService', true],
-            ['com.apple.CoreSimulator.SimVerificationService', true]
       ].each do |pair|
         name = pair[0]
         send_term = pair[1]

data/lib/run_loop/version.rb

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

data/lib/run_loop/xcode.rb

@@ -24,6 +24,14 @@ module RunLoop
       to_s
     end
 
+    # Returns a version instance for `Xcode 7.1`; used to check for the
+    # availability of features and paths to various items on the filesystem.
+    #
+    # @return [RunLoop::Version] 7.1
+    def v71
+      fetch_version(:v71)
+    end
+
     # Returns a version instance for `Xcode 7.0`; used to check for the
     # availability of features and paths to various items on the filesystem.
     #
@@ -88,6 +96,13 @@ module RunLoop
       fetch_version(:v50)
     end
 
+    # Is the active Xcode version 7.1 or above?
+    #
+    # @return [Boolean] `true` if the current Xcode version is >= 7.1
+    def version_gte_71?
+      version >= v71
+    end
+
     # Is the active Xcode version 7 or above?
     #
     # @return [Boolean] `true` if the current Xcode version is >= 7.0

data/lib/run_loop/xcrun.rb

@@ -0,0 +1,75 @@
+module RunLoop
+  class Xcrun
+
+    DEFAULT_OPTIONS =
+          {
+                :timeout => 10,
+                :log_cmd => false
+          }
+
+    DEFAULT_TIMEOUT = 10
+
+    # Raised when Xcrun fails.
+    class XcrunError < RuntimeError; end
+
+    attr_reader :stdin, :stdout, :stderr, :pid
+
+    def exec(args, options={})
+      merged_options = DEFAULT_OPTIONS.merge(options)
+
+      timeout = merged_options[:timeout]
+
+      unless args.is_a?(Array)
+        raise ArgumentError,
+              "Expected args '#{args}' to be an Array, but found '#{args.class}'"
+      end
+
+      @stdin, @stdout, out, @stderr, err, process_status, @pid, exit_status = nil
+
+      cmd = "xcrun #{args.join(' ')}"
+
+      # Don't see your log?
+      # Commands are only logged when debugging.
+      RunLoop.log_unix_cmd(cmd) if merged_options[:log_cmd]
+
+      begin
+        Timeout.timeout(timeout, TimeoutError) do
+          @stdin, @stdout, @stderr, process_status = Open3.popen3('xcrun', *args)
+
+          @pid = process_status.pid
+          exit_status = process_status.value.exitstatus
+
+          err = @stderr.read.force_encoding('utf-8').chomp
+          err = nil if err == ''
+
+          out = @stdout.read.force_encoding('utf-8').chomp
+        end
+
+        {
+              :err => err,
+              :out => out,
+              :pid => pid,
+              :exit_status => exit_status
+        }
+      rescue StandardError => e
+        raise XcrunError, e
+      ensure
+        stdin.close if stdin && !stdin.closed?
+        stdout.close if stdout && !stdout.closed?
+        stderr.close if stderr && !stderr.closed?
+
+        if pid
+          terminator = RunLoop::ProcessTerminator.new(pid, 'TERM', cmd)
+          unless terminator.kill_process
+            terminator = RunLoop::ProcessTerminator.new(pid, 'KILL', cmd)
+            terminator.kill_process
+          end
+        end
+
+        if process_status
+          process_status.join
+        end
+      end
+    end
+  end
+end

data/lib/run_loop/xctools.rb

@@ -22,6 +22,16 @@ module RunLoop
   # @todo Refactor instruments related code to instruments class.
   class XCTools
 
+    # @deprecated Since 1.5.0 - replaced with RunLoop::Xcode
+    # Returns a version instance for `Xcode 7.1`; used to check for the
+    # availability of features and paths to various items on the filesystem.
+    #
+    # @return [RunLoop::Version] 7.1
+    def v71
+      RunLoop.deprecated('1.5.0', 'Replaced with RunLoop::Xcode')
+      xcode.v71
+    end
+
     # @deprecated Since 1.5.0 - replaced with RunLoop::Xcode
     # Returns a version instance for `Xcode 7.0`; used to check for the
     # availability of features and paths to various items on the filesystem.
@@ -147,6 +157,15 @@ module RunLoop
       xcode.version_gte_6?
     end
 
+    # @deprecated Since 1.5.0 - replaced with RunLoop::Xcode
+    # Are we running Xcode 7.1 or above?
+    #
+    # @return [Boolean] `true` if the current Xcode version is >= 7.1
+    def xcode_version_gte_71?
+      RunLoop.deprecated('1.5.0', 'Replaced with RunLoop::Xcode')
+      xcode.version_gte_71?
+    end
+
     # @deprecated Since 1.5.0 - replaced with RunLoop::Xcode
     # Are we running Xcode 7 or above?
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -210,20 +210,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: stub_env
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +285,7 @@ files:
 - lib/run_loop/instruments.rb
 - lib/run_loop/ipa.rb
 - lib/run_loop/l10n.rb
+- lib/run_loop/life_cycle/core_simulator.rb
 - lib/run_loop/lipo.rb
 - lib/run_loop/lldb.rb
 - lib/run_loop/logging.rb
@@ -313,6 +300,7 @@ files:
 - lib/run_loop/simctl/plists.rb
 - lib/run_loop/version.rb
 - lib/run_loop/xcode.rb
+- lib/run_loop/xcrun.rb
 - lib/run_loop/xctools.rb
 - plists/simctl/com.apple.UIAutomation.plist
 - plists/simctl/com.apple.UIAutomationPlugIn.plist
@@ -353,3 +341,4 @@ specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments
   and simctl.
 test_files: []
+has_rdoc: