calabash-cucumber 0.11.5.pre2 → 0.11.5.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292c9c88c06f29772a770fded22c6f1c5435bd6d
-  data.tar.gz: 017b1881d24c706aabf5fbfd7c536e162c931dd3
+  metadata.gz: 7c95f4d2f10d62d51c4e738deaf8609a0f6b5c5c
+  data.tar.gz: e7cb52842ae5531fff2d7f3e6762661ab5990a86
 SHA512:
-  metadata.gz: b20f07d18068b94b5b5b89c12facc36ba665c08b2ace5c7aae5f8de0af5959d18a768eb7c51820f794a11167eb8092386fb3e8d7025fe80e40ce7a24507e0dcb
-  data.tar.gz: 3c3ec4de0e56d32d6d6ce873539cb3e2efb33172c436f4ab9b5d83659a29db92447d9d4e86f714a1786ecb8d57e6fb27a5e87a88c50a109063a7e0489f19cd89
+  metadata.gz: 41d1cac4aff7835fc754925de60d8ecbe0b23ec42148ef7f745bdb2c11cc153adee1f0e393d1be529a3094461767b369dc5586f64316f3d1c9bdcf62c8d85c11
+  data.tar.gz: d3c775f3d41f41ec239f1f37e80d79e3fe795c4cc379d3288949636be0be934fcf37138e65c53a816b90756e6f26a1d54218e1bff2626136cffbcdd22d77d233

data/lib/calabash-cucumber/core.rb

@@ -1089,6 +1089,27 @@ module Calabash
         l && l.run_loop
       end
 
+      # @!visibility private
+      def tail_run_loop_log
+        l = run_loop
+        unless l
+          raise 'Unable to tail run_loop since there is not active run_loop...'
+        end
+        cmd = %Q[osascript -e 'tell application "Terminal" to do script "tail -n 10000 -f #{l[:log_file]} | grep -v \\"Default: \\\\*\\""']
+        raise "Unable to " unless system(cmd)
+      end
+
+      # @!visibility private
+      def dump_run_loop_log
+        l = run_loop
+        unless l
+          raise 'Unable to dump run_loop since there is not active run_loop...'
+        end
+        cmd = %Q[cat "#{l[:log_file]}" | grep -v "Default: \\*\\*\\*"]
+        puts `#{cmd}`
+      end
+
+
       # @!visibility private
       def query_action_with_options(action, uiquery, options)
         uiquery, options = extract_query_and_options(uiquery, options)

data/lib/calabash-cucumber/query_helpers.rb

@@ -4,6 +4,39 @@ module Calabash
     # A module of methods that can help you construct queries.
     module QueryHelpers
 
+      # call this method to properly escape strings with single quotes and
+      # black slashes in methods (queries and uia actions)
+      # Calabash iOS has some annoying rules for text containing single quotes,
+      # and even moreso for backslash (\).
+      # This helper frees you from manual escaping.
+      # @example
+      #   quoted = escape_string("Karl's \\ annoying problem")
+      #   # => "Karl\\'s \\\\ annoying problem"
+      # @param {String} str string to escape
+      # @return {String} escaped version of `str`
+      def escape_string(str)
+        escape_quotes(escape_backslashes(str))
+      end
+
+      # call this method to properly escape blackslashes (\) in Calabash methods
+      # (queries and uia actions).
+      # Calabash iOS has some annoying rules for text containing single quotes,
+      # and even moreso for backslash (\).
+      # This helper frees you from manual escaping.
+      # @note
+      #  In ruby it is important to remember that "\\" is a *single character* string containing
+      #  a backslash: \
+      #
+      # @example
+      #   quoted = escape_backslashes("Karl's \\ annoying problem")
+      #   # => "Karl's \\\\ annoying problem"
+      # @param {String} str string to escape
+      # @return {String} escaped version of `str`
+      def escape_backslashes(str)
+        backslash = "\\"
+        str.gsub(backslash, backslash*4)
+      end
+
       # call this method to properly escape single quotes in Calabash queries
       # Calabash iOS has some annoying rules for text containing single quotes.
       # This helper frees you from manual escaping.

data/lib/calabash-cucumber/uia.rb

@@ -260,10 +260,6 @@ module Calabash
 
       # @!visibility private
       def uia_type_string(string, opt_text_before='', escape=true)
-        if escape && string.index(/\\/)
-          indexes = string.enum_for(:scan, /\\/).map { Regexp.last_match.begin(0) }
-          indexes.reverse.each { |idx| string = string.insert(idx, '\\') }
-        end
         result = uia_handle_command(:typeString, string, opt_text_before)
 
         # When 'status' == 'success', we get back result['value'].  Sometimes,
@@ -393,8 +389,7 @@ module Calabash
 
       # @!visibility private
       def escape_uia_string(string)
-        #TODO escape '\n in query
-        escape_quotes string
+        escape_string string
       end
 
       # <b>DEPRECATED:</b> Use <tt>uia("...javascript..", options)</tt> instead.

data/lib/calabash-cucumber/version.rb

@@ -3,11 +3,11 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.11.5.pre2'
+    VERSION = '0.11.5.pre3'
 
     # @!visibility public
     # The minimum required version of the calabash.framework or, for Xamarin
     # users, the Calabash component.
-    MIN_SERVER_VERSION = '0.11.5.pre2'
+    MIN_SERVER_VERSION = '0.11.5.pre3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.11.5.pre2
+  version: 0.11.5.pre3
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1.pre3
+        version: 1.1.1.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1.pre3
+        version: 1.1.1.pre7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement