run_loop 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c125e357c95d69d1ef1e4b74ce1bfbf4faddb920
-  data.tar.gz: f27d253bba7d6f3faeb4ee37d9f4d0e209d1393b
+  metadata.gz: 14c23a62a0cf301b62d65aa43ef9bb51fd0f8100
+  data.tar.gz: 4e8f52d124fd7f17975317a09467ad12c39a39d8
 SHA512:
-  metadata.gz: 009bddf011cdb692c5ee738b0b9a2e4a3c033e4b01fb29e0db6b548cadea44be2d068b3190af2a34db4b7c38cf7ed880b03c23943a7769f974da0d106ad98742
-  data.tar.gz: e26d021e69d642bdc9c115e47a235c993b837ac5b88ceaab43570bd86a3f0756de7d37ffea55418cf6818628eeb2cf8af6579decc4ca69924c450dba3a8db6fd
+  metadata.gz: 6aaeec05f315cba210c7c914f4f2c7fd50ab996a3fe0e42e4696376cc940d3d05508ba8066542a273fd9764a6400236243b210fad34c513f6c0b2676acf14210
+  data.tar.gz: 789c10cfc7de7e83e0622a8b28948bb063360154c5d589d582a386794932ac51f4eacb94d6986900e19444506319b0babb93157f42399c1325d7b5597ee2d602

data/lib/run_loop/app.rb

@@ -369,7 +369,7 @@ Bundle must:
     def font?(file)
       extension = File.extname(file)
 
-      extension == ".tff" || extension == ".otf"
+      extension == ".ttf" || extension == ".otf"
     end
   end
 end

data/lib/run_loop/cli/simctl.rb

@@ -10,19 +10,22 @@ module RunLoop
 
       desc 'tail', 'Tail the log file of the booted simulator'
       def tail
-        tail_booted
+        tail_simulator_logs
       end
 
       no_commands do
-        def tail_booted
-          device = booted_device
-          if device.nil?
-            version = xcode.version
-            puts "No simulator for active Xcode (version #{version}) is booted."
-          else
-            log_file = device.simulator_log_file_path
-            exec('tail', *["-n", "5000", '-F', log_file])
-          end
+        def tail_simulator_logs
+          paths = simctl.simulators.map do |simulator|
+            log_file_path = simulator.simulator_log_file_path
+            if log_file_path && File.exist?(log_file_path)
+              log_file_path
+            else
+              nil
+            end
+          end.compact
+
+          args = ["-n", "1000", "-F"] + paths
+          exec("tail", *args)
         end
       end
 

data/lib/run_loop/core.rb

@@ -320,7 +320,9 @@ Logfile: #{log_file}
     #  version.
     def self.default_simulator(xcode=RunLoop::Xcode.new)
 
-      if xcode.version_gte_81?
+      if xcode.version_gte_82?
+        "iPhone 7 (10.2)"
+      elsif xcode.version_gte_81?
         "iPhone 7 (10.1)"
       elsif xcode.version_gte_8?
         "iPhone 7 (10.0)"

data/lib/run_loop/device_agent/bin/CLI.json

@@ -28,6 +28,33 @@
             "default" : true
         }        
     },
+  "upload" : {
+    "-b" : {
+      "longFlag" : "--bundle-identifier",
+      "optionName" : "bundle-id",
+      "info" : "bundle identifier (e.g. com.my.app)",
+      "required" : true
+      },
+    "-d" : {
+      "longFlag" : "--device-id",
+      "optionName" : "device-identifier",
+      "info" : "iOS Simulator GUID or 40-digit physical device ID",
+      "required" : true
+    },
+    "-f" : {
+      "longFlag" : "--filepath",
+      "optionName" : "filepath",
+      "info" : "absolute path to file to be uploaded",
+      "required" : true
+    },
+    "-o" : {
+      "longFlag" : "--overwrite",
+      "optionName" : "overwrite",
+      "info" : "overwrite file if already in app container",
+      "required" : false,
+      "default" : false
+    }
+  },
     "is_installed" : {
         "-b" : {
             "longFlag" : "--bundle-identifier",

data/lib/run_loop/device_agent/client.rb

@@ -29,15 +29,16 @@ module RunLoop
       # For example:
       #
       # RunLoop::DeviceAgent::Client::DEFAULTS[:http_timeout] = 60
+      # RunLoop::DeviceAgent::Client::DEFAULTS[:device_agent_install_timeout] = 120
       DEFAULTS = {
         :port => 27753,
         :simulator_ip => "127.0.0.1",
-        :http_timeout => (RunLoop::Environment.ci? || RunLoop::Environment.xtc?) ? 120 : 10,
+        :http_timeout => (RunLoop::Environment.ci? || RunLoop::Environment.xtc?) ? 120 : 20,
         :route_version => "1.0",
 
         # Ignored in the XTC.
         # This key is subject to removal or changes
-        :device_agent_install_timeout => RunLoop::Environment.ci? ? 120 : 60,
+        :device_agent_install_timeout => RunLoop::Environment.ci? ? 120 : 90,
         # This value must always be false on the XTC.
         # This is should only be used by gem maintainers or very advanced users.
         :shutdown_device_agent_before_launch => false
@@ -106,33 +107,20 @@ module RunLoop
           code_sign_identity = RunLoop::Environment::code_sign_identity
         end
 
-        if device.physical_device? && cbx_launcher.name == :ios_device_manager
-          if !code_sign_identity
-            raise RuntimeError, %Q[
-Targeting a physical devices requires a code signing identity.
-
-Rerun your test with:
-
-$ CODE_SIGN_IDENTITY="iPhone Developer: Your Name (ABCDEF1234)" cucumber
-
-To see the valid code signing identities on your device run:
-
-$ xcrun security find-identity -v -p codesigning
-
-]
-          end
-        end
-
         install_timeout = options.fetch(:device_agent_install_timeout,
                                                      DEFAULTS[:device_agent_install_timeout])
         shutdown_before_launch = options.fetch(:shutdown_device_agent_before_launch,
                                                DEFAULTS[:shutdown_device_agent_before_launch])
+        aut_args = options.fetch(:args, [])
+        aut_env = options.fetch(:env, {})
 
         launcher_options = {
             code_sign_identity: code_sign_identity,
             device_agent_install_timeout: install_timeout,
             shutdown_device_agent_before_launch: shutdown_before_launch,
-            dylib_injection_details: dylib_injection_details
+            dylib_injection_details: dylib_injection_details,
+            aut_args: aut_args,
+            aut_env: aut_env
         }
 
         xcuitest = RunLoop::DeviceAgent::Client.new(bundle_id, device,
@@ -307,10 +295,6 @@ INSTANCE METHODS
         expect_300_response(response)
       end
 
-      # TODO Legacy API; remove once this branch is merged:
-      # https://github.com/calabash/DeviceAgent.iOS/pull/133
-      alias_method :runtime, :device_info
-
       # @!visibility private
       def server_version
         options = http_options
@@ -362,7 +346,7 @@ INSTANCE METHODS
         parameters = {
           :gesture => "enter_text",
           :options => {
-            :string => string
+            :string => string.to_s
           }
         }
         request = request("gesture", parameters)
@@ -382,7 +366,7 @@ INSTANCE METHODS
         parameters = {
           :gesture => "enter_text",
           :options => {
-            :string => string
+            :string => string.to_s
           }
         }
         request = request("gesture", parameters)
@@ -802,6 +786,8 @@ Timed out after #{timeout} seconds waiting for an alert to disappear.
         merged_options = WAIT_DEFAULTS.merge(options)
         result = wait_for_view(uiquery, merged_options)
 
+        # This is not quite right.  It is possible to get a false positive.
+        # If result does not have "value" or "label" and the text is nil
         candidates = [result["value"],
                       result["label"]]
         match = candidates.any? do |elm|
@@ -1250,7 +1236,7 @@ device: #{device}
 
 To diagnose the problem tail the launcher log file:
 
-$ tail -1000 -F #{cbx_launcher.class.log_file}
+$ tail -1000 -F #{cbx_launcher_log_file}
 
 ]
         end
@@ -1294,9 +1280,19 @@ Please install it.
 
         retries = 5
 
+        # Launch arguments and environment arguments cannot be nil
+        # The public interface Client.run has a guard against this, but
+        # internal callers to do not.
+        aut_args = launcher_options.fetch(:aut_args, [])
+        aut_env = launcher_options.fetch(:aut_env, {})
         begin
           client = http_client(http_options)
-          request = request("session", {:bundleID => bundle_id})
+          request = request("session",
+                            {
+                              :bundleID => bundle_id,
+                              :launchArgs => aut_args,
+                              :environment => aut_env
+                            })
           response = client.post(request)
           RunLoop.log_debug("Launched #{bundle_id} on #{device}")
           RunLoop.log_debug("#{response.body}")
@@ -1421,6 +1417,17 @@ Valid values are: :down, :up, :right, :left, :bottom, :top
         end
       end
 
+      # @!visibility private
+      def cbx_launcher_log_file
+        if cbx_launcher.name == :ios_device_manager
+          # The location of the iOSDeviceManager logs has changed
+          File.join(RunLoop::Environment.user_home_directory,
+                    ".calabash", "iOSDeviceManager", "logs", "current.log")
+        else
+          cbx_launcher.class.log_file
+        end
+      end
+
       # @!visibility private
       # Private method.  Do not call.
       # Flattens the result of `tree`.

data/lib/run_loop/device_agent/ios_device_manager.rb

@@ -67,6 +67,15 @@ but binary does not exist at that path.
       end
 
       # @!visibility private
+      #
+      # In earlier implementations, the ios-device-manager.log was located in
+      # ~/.run-loop/xcuitest/ios-device-manager.log
+      #
+      # Now iOSDeviceManager logs almost everything to a fixed location.
+      #
+      # ~/.calabash/iOSDeviceManager/logs/current.log
+      #
+      # There is still occasional output to ~/.run-loop.
       def self.log_file
         path = File.join(LauncherStrategy.dot_dir, "ios-device-manager.log")
         FileUtils.touch(path) if !File.exist?(path)
@@ -98,27 +107,24 @@ Expected :device_agent_install_timeout key in options:
 
 #{options}
 
-]
-          end
-
-          if !code_sign_identity
-            raise ArgumentError, %Q[
-Targeting a physical devices requires a code signing identity.
-
-Rerun your test with:
-
-$ CODE_SIGN_IDENTITY="iPhone Developer: Your Name (ABCDEF1234)" cucumber
-
 ]
           end
 
           options = {:log_cmd => true, :timeout => install_timeout}
-          args = [
-            cmd, "install",
-            "--device-id", device.udid,
-            "--app-bundle", runner.runner,
-            "--codesign-identity", code_sign_identity
-          ]
+          if code_sign_identity
+            args = [
+              cmd, "install",
+              "--device-id", device.udid,
+              "--app-bundle", runner.runner,
+              "--codesign-identity", code_sign_identity
+            ]
+          else
+            args = [
+              cmd, "install",
+              "--device-id", device.udid,
+              "--app-bundle", runner.runner
+            ]
+          end
 
           start = Time.now
           hash = run_shell_command(args, options)

data/lib/run_loop/patches/awesome_print.rb

@@ -15,3 +15,19 @@ module AwesomePrint
     end
   end
 end
+
+module Kernel
+  # Patch for BasicObject inspections.
+  # https://github.com/awesome-print/awesome_print/pull/253
+  def ap(object, options = {})
+    if object_id
+      begin
+        puts object.ai(options)
+      rescue NoMethodError => _
+        puts "(Object doesn't support #inspect)"
+      end
+
+      object unless AwesomePrint.console?
+    end
+  end
+end

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 
   # 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 8.2 ; used to check for the
+    # availability of features and paths to various items on the filesystem
+    #
+    # @return [RunLoop::Version] 8.2
+    def v82
+      fetch_version(:v82)
+    end
+
     # Returns a version instance for `Xcode 8.1`; used to check for the
     # availability of features and paths to various items on the filesystem.
     #
@@ -128,9 +136,16 @@ module RunLoop
       fetch_version(:v50)
     end
 
+    # Is the active Xcode version 8.2 or above?
+    #
+    # @return [Boolean] `true` if the current Xcode version is >= 8.2
+    def version_gte_82?
+      version >= v82
+    end
+
     # Is the active Xcode version 8.1 or above?
     #
-    # @return [Boolean] `true` if the current Xcode version is >= 8.0
+    # @return [Boolean] `true` if the current Xcode version is >= 8.1
     def version_gte_81?
       version >= v81
     end

data/scripts/lib/on_alert.js

@@ -155,6 +155,23 @@ function frenchLocalizations() {
   ];
 }
 
+function portugueseBrazilLocalizations() {
+  return [
+    ["Permitir", /acesso à sua localização/],
+    ["Permitir", /acesso à sua localização/],
+    ["OK", /Deseja Ter Acesso às Suas Fotos/],
+    ["OK", /Deseja Ter Acesso aos Seus Contatos/],
+    ["OK", /Acesso ao Seu Calendário/],
+    ["OK", /Deseja Ter Acesso aos Seus Lembretes/],
+    ["OK", /Would Like to Access Your Motion Activity/],
+    ["OK", /Deseja Ter Acesso à Câmera/],
+    ["OK", /Deseja Ter Acesso às Suas Atividades de Movimento e Preparo Físico/],
+    ["OK", /Deseja Ter Acesso às Contas do Twitter/],
+    ["OK", /data available to nearby bluetooth devices/],
+    ["OK", /[Dd]eseja [Ee]nviar-lhe [Nn]otificações/]  
+  ];
+}
+
 function localizations() {
   return [].concat(
      danishLocalizations(),
@@ -163,7 +180,8 @@ function localizations() {
      germanLocalizations(),
      russianLocalizations(),
      spanishLocalizations(),
-     frenchLocalizations()
+     frenchLocalizations(),
+     portugueseBrazilLocalizations() 
   );
 }
 
@@ -207,8 +225,8 @@ function isPrivacyAlert(alert) {
   // $ APP_LANG="nl" APP_LOCALE="nl" be cucumber -t @supported -p macmini
 
   // This is very slow, so only do this if you are trying to capture regexes.
-  //var buttonNames = findAlertButtonNames(alert);
-  //Log.output({"alert":{"title":title, "buttons":buttonNames, "capture":"YES"}});
+  // var buttonNames = findAlertButtonNames(alert);
+  // Log.output({"alert":{"title":title, "buttons":buttonNames, "capture":"YES"}});
 
   var answer;
   var expression;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -301,20 +301,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - karl.krukow@xamarin.com