calabash-android 0.9.1.pre1 → 0.9.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16fa5c6401f8d6fc80e1765035838c6da0a845f4
-  data.tar.gz: 70c4b3a549a006e732e0c3203021493af1f80d7d
+  metadata.gz: bb527ede0676e2c566700c53984572883dde21ae
+  data.tar.gz: 9b13e1012370185f9c2369e0e65631354bb13fe7
 SHA512:
-  metadata.gz: dc67ff6ce4574f02a9faba297575c4f221fa79fec2cdbbec2a46f5381a2612537cd9dbe28ba7bf27d193cef32fc00470035e85ae4aab8aa9edea3e2da45db89c
-  data.tar.gz: 97c7ff888702fbf06809b5cac32fc621171fa3c968057ba927568451347ad84a9985aaa35926f50495fda5165d077e6a9683e5bebff817aaa20ad9c33a4020ae
+  metadata.gz: 372f5ce062f0176201a9b67205020a70b959cfbfb89ccd2053fb223bec88739b4ac816be027110b52f87f5066a816eb2cfc03f6bf62e49eed431f15fa6d7ab8f
+  data.tar.gz: 6b2ecd546dfb0db66dfdfaa62735d9af30f103b5596d910ee6980015b6b580168f6fdd5187af6fb6aff376482c97564baa4cc48d84659fdfe7fe2b6b0270f9ba

data/irbrc

@@ -1,40 +1,45 @@
-require 'rubygems'
-require 'irb/completion'
-require 'irb/ext/save-history'
-
 begin
-  require 'awesome_print'
-rescue LoadError => e
-  msg = ["Caught a LoadError: could not load 'awesome_print'",
-         "#{e}",
-         '',
-         'Use bundler (recommended) or uninstall awesome_print.',
-         '',
-         '# Use bundler (recommended)',
-         '$ bundle update',
-         '$ bundle exec calabash-android console <path to apk>',
-         '',
-         '# Uninstall',
-         '$ gem update --system',
-         '$ gem uninstall -Vax --force --no-abort-on-dependent awesome_print']
-  puts msg
-  exit(1)
-end
+  require 'rubygems'
+  require 'irb/completion'
+  require 'irb/ext/save-history'
 
-AwesomePrint.irb!
+  begin
+    require 'awesome_print'
+  rescue LoadError => e
+    msg = ["Caught a LoadError: could not load 'awesome_print'",
+          "#{e}",
+          '',
+          'Use bundler (recommended) or uninstall awesome_print.',
+          '',
+          '# Use bundler (recommended)',
+          '$ bundle update',
+          '$ bundle exec calabash-android console <path to apk>',
+          '',
+          '# Uninstall',
+          '$ gem update --system',
+          '$ gem uninstall -Vax --force --no-abort-on-dependent awesome_print']
+    puts msg
+    exit(1)
+  end
 
-ARGV.concat [ "--readline",
-              "--prompt-mode",
-              "simple" ]
+  AwesomePrint.irb!
 
-# 50 entries in the list
-IRB.conf[:SAVE_HISTORY] = 50
+  ARGV.concat [ "--readline",
+                "--prompt-mode",
+                "simple" ]
 
-# Store results in home directory with specified file name
-IRB.conf[:HISTORY_FILE] = ".irb-history"
+  # 50 entries in the list
+  IRB.conf[:SAVE_HISTORY] = 50
 
-require 'calabash-android/defaults'
-require 'calabash-android/operations'
+  # Store results in home directory with specified file name
+  IRB.conf[:HISTORY_FILE] = ".irb-history"
+
+  require 'calabash-android/defaults'
+  require 'calabash-android/operations'
+rescue Exception => e
+  puts "Error loading Calabash irbrc: #{e}"
+  exit(1)
+end
 
 module Calabash
   module Android

data/lib/calabash-android/operations.rb

@@ -390,7 +390,7 @@ module Calabash module Android
 
       def update_app(app_path)
         if _sdk_version >= 23
-          cmd = "#{adb_command} install -rg \"#{app_path}\""
+          cmd = "#{adb_command} install -r -g \"#{app_path}\""
         else
           cmd = "#{adb_command} install -r \"#{app_path}\""
         end
@@ -733,8 +733,8 @@ module Calabash module Android
         log cmd
         raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
 
-        Calabash::Android::Retry.retry :tries => 100, :interval => 0.1 do
-          raise "App did not start" unless app_running?
+        Calabash::Android::Retry.retry :tries => 600, :interval => 0.1 do
+          raise "App did not start see adb logcat for details" unless app_running?
         end
 
         begin
@@ -1122,10 +1122,6 @@ module Calabash module Android
       ni
     end
 
-    def done
-      ni
-    end
-
     def find_scrollable_view(options={})
       timeout = options[:timeout] || 30
 

data/lib/calabash-android/text_helpers.rb

@@ -41,10 +41,24 @@ module Calabash
         perform_action("delete_surrounding_text", -1, 0)
       end
 
+      def escape_backslashes(str)
+        backslash = "\\"
+        str.gsub(backslash, backslash*4)
+      end
+
+      def escape_newlines(str)
+        newline = "\n"
+        str.gsub(newline, "\\n")
+      end
+
       def escape_quotes(str)
         str.gsub("'", "\\\\'")
       end
 
+      def escape_string(str)
+        escape_newlines(escape_quotes(escape_backslashes(str)))
+      end
+
       # Sets the selection of the currently focused view.
       #
       # @param [Integer] selection_start The start of the selection, can be

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.9.1.pre1"
+    VERSION = "0.9.1.pre2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.9.1.pre1
+  version: 0.9.1.pre2
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber