run_loop 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11be3a1fe89681a24289e331b94823e23cf6ade9
-  data.tar.gz: 5e51d2d106452481ba15e63315ac26fb5798a0c6
+  metadata.gz: fd788e0a671931f1ce5b3bac708f21670e29b5b2
+  data.tar.gz: 5361aaeb26d981a5857aa4c67f38348c1430d8e5
 SHA512:
-  metadata.gz: 396eff04828c24cadfca702fc041a238b337c8310d65e1ebba5dfd8ba1a7a77dc7a3cee05a1e59966db913f7dbb3113ff8023a6c2bac609ede575c98b48c2f7e
-  data.tar.gz: 6c87504310686551a5bec02248b92bc24681b4bf62ae57286ba04f64e0dba3edbae7e1b804efdbeb9325e67e3be594cc2c8943fbcff8bb8405f693b973d5cfeb
+  metadata.gz: ecc950e0a6a3a014b9cad45aaa73dcb3d731b2fe68e116b9f97c35cc910e907d80c4d8eee6c1cb1ecf3763e6d929d80c2176ccdf4d05d55a7b85a61192cc4a8c
+  data.tar.gz: 909167069d0abc322404b191f97569d8f22cd603a413aed63b22a608228b02bbf3cf5264f0c4c233f0591220ad8e1c1d3f82e27b0a58785cf9014768a9943bce

data/lib/run_loop/core.rb

@@ -92,7 +92,7 @@ module RunLoop
 
       if self.simulator_target?(options, sim_control)
         # @todo only enable accessibility on the targeted simulator
-        sim_control.enable_accessibility_on_sims({:verbose => true})
+        sim_control.enable_accessibility_on_sims({:verbose => false})
       end
 
       device_target = options[:udid] || options[:device_target] || detect_connected_device || 'simulator'
@@ -358,7 +358,9 @@ module RunLoop
     # @param [RunLoop::XCTools] xcode_tools Used to detect the current xcode
     #  version.
     def self.default_simulator(xcode_tools=RunLoop::XCTools.new)
-      if xcode_tools.xcode_version_gte_6?
+      if xcode_tools.xcode_version_gte_61?
+        'iPhone 5 (8.1 Simulator)'
+      elsif xcode_tools.xcode_version_gte_6?
         'iPhone 5 (8.0 Simulator)'
       else
         'iPhone Retina (4-inch) - Simulator - iOS 7.1'
@@ -574,21 +576,11 @@ module RunLoop
 
     def self.default_tracetemplate(xctools=RunLoop::XCTools.new)
       templates = xctools.instruments :templates
-      if xctools.xcode_version_gte_61?
-        templates.delete_if do |path|
-          not path =~ /\/Automation.tracetemplate/
-        end.delete_if do |path|
-          not path =~ /Xcode/
-        end.first.tr("\"", '').strip
-      elsif xctools.xcode_version_gte_6?
-        templates.delete_if do |name|
-          not name == 'Automation'
-        end.first
+      if xctools.xcode_version_gte_6?
+        templates.select { |name| name == 'Automation' }.first
       else
-        templates.delete_if do |path|
-          not path =~ /\/Automation.tracetemplate/
-        end.delete_if do |path|
-          not path =~ /Xcode/
+        templates.select do |path|
+          path =~ /\/Automation.tracetemplate/ and path =~ /Xcode/
         end.first.tr("\"", '').strip
       end
     end
@@ -742,4 +734,4 @@ module RunLoop
     script
   end
 
-end
+end

data/lib/run_loop/sim_control.rb

@@ -290,6 +290,9 @@ module RunLoop
         details = sim_details :udid
         results = existing.map do |dir|
           enable_accessibility_in_sim_data_dir(dir, details, opts)
+          # This is done here so we don't have to make a public method
+          # to enable the keyboards for all devices.
+          enable_keyboard_in_sim_data_dir(dir, details, opts)
         end
       else
         possible = XCODE_5_SDKS.map do |sdk|
@@ -665,15 +668,15 @@ module RunLoop
     #
     # @param [String] sim_data_dir The directory where the
     #   Library/Preferences/com.apple.Accessibility.plist can be found.
-    # @param [Hash] sim_details_key_with_udid A hash table of simulator details
+    # @param [Hash] sim_details_keyed_with_udid A hash table of simulator details
     #   that can be obtained by calling `sim_details(:udid)`.
     #
     # @param [Hash] opts controls the behavior of the method
     # @option opts [Boolean] :verbose controls logging output
-    # @return [Boolean] if the plist exists and the plist was successfully
-    #   updated.
+    # @return [Boolean] If the plist exists and the plist was successfully
+    #   updated or if the directory was skipped (see code comments).
     # @raise [RuntimeError] If called when Xcode 6 is _not_ the active Xcode version.
-    def enable_accessibility_in_sim_data_dir(sim_data_dir, sim_details_key_with_udid, opts={})
+    def enable_accessibility_in_sim_data_dir(sim_data_dir, sim_details_keyed_with_udid, opts={})
       unless xcode_version_gte_6?
         raise RuntimeError, 'it is illegal to call this method when the Xcode < 6 is the current Xcode version'
       end
@@ -685,9 +688,20 @@ module RunLoop
 
       verbose = merged_opts[:verbose]
       target_udid = sim_data_dir[XCODE_6_SIM_UDID_REGEX, 0]
-      launch_name = sim_details_key_with_udid[target_udid][:launch_name]
-      sdk_version = sim_details_key_with_udid[target_udid][:sdk_version]
 
+      # Directory contains simulators not reported by instruments -s devices
+      simulator_details = sim_details_keyed_with_udid[target_udid]
+      if simulator_details.nil?
+        if verbose
+          xcode_version = xctools.xcode_version
+          puts ["INFO: Skipping '#{target_udid}' directory because",
+                "there is no corresponding simulator for active Xcode (version '#{xcode_version}')"].join("\n")
+        end
+        return true
+      end
+
+      launch_name = simulator_details.fetch(:launch_name, nil)
+      sdk_version = simulator_details.fetch(:sdk_version, nil)
       msgs = ["cannot enable accessibility for '#{target_udid}' - '#{launch_name}'"]
       plist_path = File.expand_path("#{sim_data_dir}/Library/Preferences/com.apple.Accessibility.plist")
 
@@ -717,12 +731,88 @@ module RunLoop
             msgs << "could not set #{hash_key} => '#{settings[:key]}' to #{value}"
             puts "WARN: #{msgs.join("\n")}"
           end
-          end
+        end
         success
         end
       res.all?
     end
 
+    # @!visibility private
+    # Enables the keyboard to be shown by default on the new Xcode 6 simulators.
+    #
+    # The new CoreSimulator environment has a new Hardware > Keyboard > Connect
+    #  Hardware Keyboard option which is on by default and prevents the native
+    #  keyboard from being presented.
+    #
+    # @note This will quit the simulator.
+    #
+    # @note This is for Xcode 6 only.  Will raise an error if called on Xcode 5.
+    #
+    # If the Library/Preferences/com.apple.Preferences.plist file doesn't exist
+    # this method will create one with the content to activate the keyboard.
+    #
+    # @param [String] sim_data_dir The directory where the
+    #   Library/Preferences/com.apple.Preferences.plist can be found.
+    # @param [Hash] sim_details_keyed_with_udid A hash table of simulator details
+    #   that can be obtained by calling `sim_details(:udid)`.
+    #
+    # @param [Hash] opts controls the behavior of the method
+    # @option opts [Boolean] :verbose controls logging output
+    # @return [Boolean] If the plist exists and the plist was successfully
+    #  updated or if the directory was skipped (see code comments).
+    # @raise [RuntimeError] If called when Xcode 6 is _not_ the active Xcode version.
+    def enable_keyboard_in_sim_data_dir(sim_data_dir, sim_details_keyed_with_udid, opts={})
+      unless xcode_version_gte_6?
+        raise RuntimeError, 'it is illegal to call this method when the Xcode < 6 is the current Xcode version'
+      end
+
+      hash = {:key => 'AutomaticMinimizationEnabled',
+              :value => 0,
+              :type => 'integer'}
+
+      default_opts = {:verbose => false}
+      merged_opts = default_opts.merge(opts)
+
+      quit_sim
+
+      verbose = merged_opts[:verbose]
+      target_udid = sim_data_dir[XCODE_6_SIM_UDID_REGEX, 0]
+
+      # Directory contains simulators not reported by instruments -s devices
+      simulator_details = sim_details_keyed_with_udid[target_udid]
+      if simulator_details.nil?
+        if verbose
+          xcode_version = xctools.xcode_version
+          puts ["INFO: Skipping '#{target_udid}' directory because",
+                "there is no corresponding simulator for active Xcode (version '#{xcode_version}')"].join("\n")
+        end
+        return true
+      end
+
+      launch_name = simulator_details.fetch(:launch_name, nil)
+
+      msgs = ["cannot enable keyboard for '#{target_udid}' - '#{launch_name}'"]
+      plist_path = File.expand_path("#{sim_data_dir}/Library/Preferences/com.apple.Preferences.plist")
+
+      unless File.exist? plist_path
+        FileUtils.mkdir_p("#{sim_data_dir}/Library/Preferences")
+        plist = CFPropertyList::List.new
+        data = {}
+        plist.value = CFPropertyList.guess(data)
+        plist.save(plist_path, CFPropertyList::List::FORMAT_BINARY)
+      end
+
+      success = pbuddy.plist_set(hash[:key], hash[:type], hash[:value], plist_path)
+      unless success
+        if verbose
+          msgs << "could not set #{hash[:key]} => '#{hash[:key]}' to #{hash[:value]}"
+          puts "WARN: #{msgs.join("\n")}"
+        end
+      end
+
+      success
+    end
+
     # @!visibility private
     # Returns a hash table that contains detailed information about the
     # available simulators.  Use the `primary_key` to control the primary hash

data/lib/run_loop/version.rb

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

data/lib/run_loop/xctools.rb

@@ -157,16 +157,7 @@ module RunLoop
         when :templates
           @instruments_templates ||= lambda {
             cmd = "#{instruments} -s templates"
-            if self.xcode_version >= self.v61
-              Open3.popen3(cmd) do |_, stdout, stderr, _|
-                stderr_filter.call(stderr)
-                stdout.read.chomp.split("\n").map do |line|
-                  line.strip.tr('"', '')
-                end.delete_if do |path|
-                  not path =~ /tracetemplate/
-                end
-              end
-            elsif self.xcode_version >= self.v60
+            if self.xcode_version >= self.v60
               Open3.popen3(cmd) do |_, stdout, stderr, _|
                 stderr_filter.call(stderr)
                 stdout.read.chomp.split("\n").map { |elm| elm.strip.tr('"', '') }

data/scripts/run_loop_host.js

@@ -274,7 +274,7 @@ var target = null,
     host = null;
 
 
-
+Log.output('Starting loop');
 while (true) {
     target = UIATarget.localTarget();
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -242,8 +242,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Tools related to running Calabash iOS tests
 test_files: []
+has_rdoc: