run_loop 2.2.4 → 2.3.0

data/lib/run_loop/device_agent/ios_device_manager.rb

@@ -94,8 +94,7 @@ but binary does not exist at that path.
         if device.simulator?
           cbxapp = RunLoop::App.new(runner.runner)
 
-          # Quits the simulator if CoreSimulator is not already in control of it.
-          sim = CoreSimulator.new(device, cbxapp, {:quit_sim_on_init => false})
+          sim = CoreSimulator.new(device, cbxapp)
           sim.install
           sim.launch_simulator
         else
@@ -111,19 +110,15 @@ Expected :device_agent_install_timeout key in options:
           end
 
           options = {:log_cmd => true, :timeout => install_timeout}
+          args = [
+            cmd, "install",
+            "--device-id", device.udid,
+            # -a <== --app-bundle (1.0.4) and --app-path (> 1.0.4)
+            "-a", runner.runner
+          ]
+
           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
-            ]
+            args = args + ["--codesign-identity", code_sign_identity]
           end
 
           start = Time.now

data/lib/run_loop/logging.rb

@@ -43,7 +43,7 @@ module RunLoop
   # cyan
   def self.log_unix_cmd(msg)
     if RunLoop::Environment.debug?
-      puts Color.cyan("EXEC: #{msg}") if msg
+      puts Color.cyan("SHELL: #{msg}") if msg
     end
   end
 

data/lib/run_loop/process_waiter.rb

@@ -3,8 +3,28 @@ module RunLoop
   # A class for waiting on processes.
   class ProcessWaiter
 
+    require "run_loop/shell"
+
+    include RunLoop::Shell
+
     attr_reader :process_name
 
+    # Return a list of pids by matching `match_string` against the command
+    # and full argument list of the command.  As the name suggests, this
+    # method uses `pgrep -f`.
+    #
+    # @param match_string the string to match against
+    # @return Array[Integer] an array of pids
+    def self.pgrep_f(match_string)
+      cmd = ["pgrep", "-f", match_string]
+      hash = RunLoop::Shell.run_shell_command(cmd)
+
+      out = hash[:out]
+      return [] if out.nil? || out == ""
+
+      out.split($-0).map { |pid| pid.to_i }
+    end
+
     def initialize(process_name, options={})
       @options = DEFAULT_OPTIONS.merge(options)
       @process_name = process_name
@@ -13,9 +33,21 @@ module RunLoop
     # Collect a list of Integer pids.
     # @return [Array<Integer>] An array of integer pids for the `process_name`
     def pids
-      process_info = `ps x -o pid,comm | grep -v grep | grep '#{process_name}'`
-      process_array = process_info.split("\n")
-      process_array.map { |process| process.split(' ').first.strip.to_i }
+      cmd = ["pgrep", "-x", process_name]
+      hash = run_shell_command(cmd)
+      out = hash[:out]
+
+      if out.nil? || out == ""
+        []
+      else
+        out.split($-0).map do |pid|
+          if pid.nil? || pid == ""
+            nil
+          else
+            pid.to_i
+          end
+        end.compact
+      end
     end
 
     # Is the `process_name` a running?
@@ -58,7 +90,6 @@ module RunLoop
       there_are_n
     end
 
-
     # Wait for `process_name` to start.
     def wait_for_any
       return true if running_process?

data/lib/run_loop/simctl.rb

@@ -288,12 +288,12 @@ $ bundle exec run-loop simctl manage-processes
 
     # @!visibility private
     #
-    # Launches the app on on the device.
+    # Removes the application from the device.
     #
     # Caller is responsible for the following:
     #
     # 1. Launching the simulator.
-    # 2. That the application is installed; simctl uninstall will fail if app
+    # 2. Verifying that the application is installed; simctl uninstall will fail if app
     #    is installed.
     #
     # No checks are made.

data/lib/run_loop/version.rb

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

data/scripts/lib/on_alert.js

@@ -131,6 +131,35 @@ function dutchLocalizations() {
   ];
 }
 
+function dutch_BE_Localizations() {
+	return [
+		["Sta toe", /toegang tot je locatie toestaan terwijl je de app gebruikt/],
+		["Sta toe", /toegang tot je locatie toestaan, zelfs als je de app niet gebruikt/],
+		["OK", /wil toegang tot je contacten/],
+		["OK", /wil toegang tot je agenda/],
+		["OK", /wil toegang tot je herinneringen/],
+		["OK", /wil toegang tot je foto's/],
+		["OK", /wil toegang tot je bewegings- en fitnessactiviteit/]
+	];
+}
+
+function swedishLocalizations() {
+  return [
+    ["Tillåt", /att se din platsinfo när du använder appen/],
+    ["Tillåt", /att se din platsinfo även när du inte använder appen/],
+    ["Tillåt", /även ser din platsinfo när du inte använder appen/],
+    ["OK", /begär åtkomst till dina kontakter/],
+    ["OK", /begär åtkomst till din kalender/],
+    ["OK", /begär åtkomst till dina påminnelser/],
+    ["OK", /begär åtkomst till dina bilder/],
+    ["OK", /vill komma åt dina Twitter-konton/],
+    ["OK", /begär åtkomst till mikrofonen/],
+    ["OK", /begär åtkomst till din rörelse- och träningsaktivitet/],
+    ["OK", /begär åtkomst till kameran/],
+    ["OK", /vill skicka notiser till dig/]
+  ];
+}
+
 function russianLocalizations() {
   return [
     // Location
@@ -168,7 +197,7 @@ function portugueseBrazilLocalizations() {
     ["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/]  
+    ["OK", /[Dd]eseja [Ee]nviar-lhe [Nn]otificações/]
   ];
 }
 
@@ -176,12 +205,14 @@ function localizations() {
   return [].concat(
      danishLocalizations(),
      dutchLocalizations(),
+     dutch_BE_Localizations(),
+     swedishLocalizations(),
      englishLocalizations(),
      germanLocalizations(),
      russianLocalizations(),
      spanishLocalizations(),
      frenchLocalizations(),
-     portugueseBrazilLocalizations() 
+     portugueseBrazilLocalizations()
   );
 }
 

data/vendor-licenses/CocoaAsyncSocket.LICENSE

@@ -0,0 +1,4 @@
+The CocoaAsyncSocket project is under Public Domain license.
+http://code.google.com/p/cocoaasyncsocket/
+
+The AsyncSocket project has been around since 2001 and is used in many applications and frameworks.

data/vendor-licenses/CocoaHTTPServer.LICENSE

@@ -0,0 +1,18 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2011, Deusty, LLC
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Neither the name of Deusty nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of Deusty, LLC.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/vendor-licenses/CocoaLumberjack.LICENSE

@@ -0,0 +1,33 @@
+CocoaLumberjack is under the New BSD License.
+https://github.com/robbiehanson/CocoaLumberjack
+
+Extensive documentation, tutorials, etc are available:
+https://github.com/robbiehanson/CocoaLumberjack/wiki
+
+Overview of the project (copied from google code homepage):
+
+
+
+The lumberjack framework is fast & simple, yet powerful & flexible.
+It is similar in concept to other popular logging frameworks such as log4j, yet is designed specifically for objective-c, and takes advantage of features such as multi-threading, grand central dispatch (if available), lockless atomic operations, and the dynamic nature of the objective-c runtime.
+
+Lumberjack is fast:
+In most cases it is an order of magnitude faster than NSLog.
+
+Lumberjack is simple:
+It takes as little as a single line of code to configure lumberjack when your application launches. Then simply replace your NSLog statements with DDLog statements and that's about it. (And the DDLog macros have the exact same format and syntax as NSLog, so it's super easy.)
+
+Lumberjack is powerful:
+One log statement can be sent to multiple loggers, meaning you can log to a file and the console simultaneously. Want more? Create your own loggers (it's easy) and send your log statements over the network. Or to a database or distributed file system. The sky is the limit.
+
+Lumberjack is flexible:
+Configure your logging however you want. Change log levels per file (perfect for debugging). Change log levels per logger (verbose console, but concise log file). Change log levels per xcode configuration (verbose debug, but concise release). Have your log statements compiled out of the release build. Customize the number of log levels for your application. Add your own fine-grained logging. Dynamically change log levels during runtime. Choose how & when you want your log files to be rolled. Upload your log files to a central server. Compress archived log files to save disk space...
+
+
+
+This framework is for you if:
+
+You're looking for a way to track down that impossible-to-reproduce bug that keeps popping up in the field.
+You're frustrated with the super short console log on the iPhone.
+You're looking to take your application to the next level in terms of support and stability.
+You're looking for an enterprise level logging solution for your application (Mac or iPhone).

data/vendor-licenses/Facebook-WebDriverAgent.LICENSE

@@ -0,0 +1,30 @@
+BSD License
+
+For WebDriverAgent software
+
+Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/vendor-licenses/RoutingHTTPServer.LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2011 Matt Stevens
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -310,8 +310,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "./vendor-licenses/CocoaAsyncSocket.LICENSE"
+- "./vendor-licenses/CocoaHTTPServer.LICENSE"
+- "./vendor-licenses/CocoaLumberjack.LICENSE"
 - "./vendor-licenses/FBSimulatorControl.LICENSE"
-- "./vendor-licenses/xctestctl.LICENSE"
+- "./vendor-licenses/Facebook-WebDriverAgent.LICENSE"
+- "./vendor-licenses/RoutingHTTPServer.LICENSE"
 - LICENSE
 - bin/run-loop
 - lib/run_loop.rb
@@ -411,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments

data/vendor-licenses/xctestctl.LICENSE

@@ -1,32 +0,0 @@
-BSD 3-Clause License
-
-xctestctl
-
-Copyright (c) 2016-present, Xamarin
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.