calabash-cucumber 0.19.0.pre2 → 0.19.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61fbe0eef72ea0385aa0cf321511e2244859d9d1
-  data.tar.gz: e5fbdc2d622be9ac945e84702efaab211ad458ab
+  metadata.gz: 227255a957e46df2f354db1352c0e7bcdbb26062
+  data.tar.gz: 7f56b0929540d9019a1a34640917cdad68d979b4
 SHA512:
-  metadata.gz: d9b4b3c41344b11573130ee4d03242f922d8eb4ff78e00e949edc3c9f1e45ca87977a3525e03f05576658bb1eb73b060e0427b2d05ff8866f2a5e0ddcf59c131
-  data.tar.gz: 41d569aca733c9c507b1e2017565494378bbe0e177693fbbf16b9c0c9b09c063e1bf4ba373c4f4f732c6a5c4846566d073c16a67e2633cd6fdc01fe521f50991
+  metadata.gz: f35bcecf41a3166830e70dd7cb5132ecd6d6b2246a807d7bae9519000ebd8a74d4608ea161937e6e91e97902baee3be249829d24a37d15b1955da11610449417
+  data.tar.gz: d498b59943d3a096c9eae4660cd25cb0386c9ea96e3e6b7311347275dd68ad1a753ff41a854d60b078d6ac5ddab43e439ceabf316c300f4f2bdcf074b5d1a0ea

data/bin/calabash-ios

@@ -55,8 +55,6 @@ elsif cmd == 'sim'
     calabash_sim_reset
   elsif subcmd == 'acc'
     calabash_sim_accessibility
-  elsif subcmd == 'location'
-      calabash_sim_location(ARGV)
   elsif subcmd == 'locale'
     calabash_sim_locale(ARGV)
   else

data/bin/calabash-ios-helpers.rb

@@ -1,15 +1,12 @@
 require 'tempfile'
 require 'json'
 
-UPDATE_TARGETS = ['hooks']
-
 def msg(title, &block)
   puts "\n" + "-"*10 + title + "-"*10
   block.call
   puts "-"*10 + "-------" + "-"*10 + "\n"
 end
 
-
 def print_usage
   puts <<EOF
   Usage: calabash-ios <command> [<args>]
@@ -20,26 +17,24 @@ def print_usage
       generate a features folder structure.
     console
       starts an interactive console to interact with your app via Calabash
-    setup [<path>]
-      setup your XCode project for calabash-ios (EXPERIMENTAL)
     download
       install latest compatible version of calabash.framework
-    check [{<path to .ipa>|<path to .app>}]
-      check whether an app or ipa is linked with calabash.framework (EXPERIMENTAL)
-    sim locale <lang> [<region>]
-      change locale and regional settings in all iOS Simulators
-    sim location {on|off} <bundleid>
-      set allow location on/off for current project or bundleid
+    sim locale [language code] [locale code]
+      change locale and regional settings for an iOS Simulator
     sim reset
       reset content and settings in all iOS Simulators
     sim acc
       enable accessibility in all iOS Simulators
+    check [{<path to .ipa>|<path to .app>}]
+      check whether an app or ipa is linked with calabash.framework (EXPERIMENTAL)
+    setup [<path>]
+      setup your Xcode project for calabash-ios (EXPERIMENTAL)
 EOF
 end
 
 def print_help
   file = File.join(File.dirname(__FILE__), '..', 'doc', 'calabash-ios-help.txt')
-  system("less #{file}")
+  puts File.read(file)
 end
 
 def ensure_correct_path(args)

data/bin/calabash-ios-sim.rb

@@ -1,5 +1,4 @@
-require "calabash-cucumber/environment"
-require 'run_loop'
+require "run_loop"
 
 def quit_sim
   RunLoop::SimControl.new.quit_sim
@@ -13,49 +12,6 @@ def calabash_sim_accessibility
   RunLoop::SimControl.new.enable_accessibility_on_sims
 end
 
-def calabash_sim_location(args)
-
-  if args.length == 0
-    print_usage
-    exit 0
-  end
-  on_off = args.shift
-  if args.length == 0
-    print_usage
-    exit 0
-  end
-  bundle_id = args.shift
-
-
-  dirs = Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "*.*", "Library", "Caches", "locationd"))
-  dirs.each do |sim_dir|
-    existing_path = "#{sim_dir}/clients.plist"
-    if File.exist?(existing_path)
-      plist_path = existing_path
-    else
-      plist_path = File.expand_path("#{@script_dir}/data/clients.plist")
-    end
-
-    plist = CFPropertyList::List.new(:file => plist_path)
-    hash = CFPropertyList.native_types(plist.value)
-
-    app_hash = hash[bundle_id]
-    if not app_hash
-      app_hash = hash[bundle_id] = {}
-    end
-    app_hash["BundleId"] = bundle_id
-    app_hash["Authorized"] = on_off == "on" ? true : false
-    app_hash["LocationTimeStarted"] = 0
-
-    ##Plist edit the template
-    res_plist = CFPropertyList::List.new
-    res_plist.value = CFPropertyList.guess(hash)
-    res_plist.save(existing_path, CFPropertyList::List::FORMAT_BINARY)
-
-  end
-end
-
-
 def calabash_sim_locale(args)
 
   if args.length != 2
@@ -87,19 +43,18 @@ This operation will quit and reset the simulator.
   language = args[0]
   locale = args[1]
 
-  device_target = Calabash::Cucumber::Environment.device_target
-  default_target = RunLoop::Core.default_simulator
-
-  target = device_target || default_target
+  xcode = RunLoop::Xcode.new
+  instruments = RunLoop::Instruments.new
+  simctl = RunLoop::Simctl.new
 
-  device = RunLoop::Device.device_with_identifier(target)
+  device = RunLoop::Device.detect_device({}, xcode, simctl, instruments)
 
   if device.nil?
-    if target == device_target
+    if RunLoop::Environment.device_target
       puts %Q{
 Could not find simulator matching:
 
-DEVICE_TARGET=#{device_target}
+  DEVICE_TARGET=#{RunLoop::Environment.device_target}
 
 Check the output of:
 
@@ -109,8 +64,12 @@ for a list of available simulators.
 }
     else
       puts %Q{
-Could not find the default simulator.  Make sure that you have
-the right version of run_loop installed for your Xcode version.
+Could not find the default simulator:
+
+  #{RunLoop::Core.default_simulator}
+
+1. Your Xcode version might not be compatible with run-loop #{RunLoop::VERSION}.
+2. You might need to install additional simulators in Xcode.
 }
     end
 
@@ -121,7 +80,7 @@ the right version of run_loop installed for your Xcode version.
     puts %Q{
 This tool is for simulators only.
 
-#{target} is a physical device.
+#{device} is a physical device.
 }
     return false
   end

data/doc/calabash-ios-help.txt

@@ -1,77 +1,35 @@
 Usage: calabash-ios <command-name> [parameters]
-  <command-name> can be one of
-    help
-    gen
-    setup (EXPERIMENTAL) [opt path]?
-    download [opt path]?
-    check (EXPERIMENTAL) [opt path to .ipa/.app]?
-    sim locale [lang] [regional]?
-    sim reset
-    sim acc
-    sim location {on|off} <bundleid>
 
   Commands:
-  gen creates a skeleton features dir. This is usually used once when
-      setting up calabash to ensure that the features folder contains
-      the right step definitions and environment to run with cucumber.
-  console
-      starts an interactive console to interact with your app via Calabash.
-      Supports setting environment var CALABASH_IRBRC for custom .irbrc file.
-
-  setup [path]? (EXPERIMENTAL) Automates setting up your iOS Xcode project
-        with calabash-ios-server. It is your responsibility to ensure
-        that your production build does not link with calabash.framework.
-        setup will try to ensure this, but you should check manually.
-
-        setup will download calabash.framework and modify you Xcode project
-        file. The parameter [path] is optional (default is the current dir).
-        If specified [path] should be the path to your iOS Xcode project
-        (i.e., the folder which contains projectname.xcodeproj).
 
-        The following modifications are made
-          - duplicate an existing target of your choice
-          - add the calabash.framework to your Frameworks folder
-          - add $(SRCROOT) to framework search path
-          - link with calabash.framework in duped target
-          - link with Apple's CFNetwork.framework in duped target
-          - setup special linker options to ensure calabash is loaded
+  version
+      Print the version of the Calabash iOS gem.
 
-        Your Xcode project file will be backed up as project.pbxproj.bak.
-        The backup is placed in the .xcodeproj folder for your project.
-        If something goes wrong. Close Xcode and copy project.pbxproj.bak
-        to project.pbxproj inside your .xcodeproj folder.
-
-  download [opt_path]?
-        copies current compatible version of calabash.framework to your project.
-        It should be run from a directory containing an Xcode project,
-        or optionally opt_path should be supplied and pointing to a
-        directory containing an Xcode project.
-        Will copy in the latest version that matches the
-        currently installed calabash-cucumber gem.
-        To update Calabash for your project run
+  gen
+      Creates a skeleton features dir. This is usually used once when
+      setting up calabash to ensure that the features folder contains
+      the right step definitions and environment to run with cucumber.
 
-        gem install calabash-cucumber
-        calabash-ios download
+  console
+      Starts an interactive console to interact with your app via Calabash.
+      If there is a .irbrc in your local directory, the IRB will load that file.
+      To share an .irbrc across projects, use the CALABASH_IRBRC environment
+      variable.
 
-        Then clean and rebuild to your project.
-        Check the current server version on http://localhost:37265/version
+  download
+      Copies current compatible version of calabash.framework to your project.
+      It should be run from a directory containing an Xcode project,
 
-  check (EXPERIMENTAL) [.app or .ipa]?
-        check whether an app or ipa is linked with calabash.framework
-        if called without parameter [.app or .ipa] then pwd should be
-        a directory containing an xcodeproj. In this case we'll check
-        the default Xcode simulator build path for a Debug and Calabash
-        build configurations. We check that Debug doesn't link with
-        calabash.framework but Calabash does.
+  check { path/to/My.app | path/to/My.ipa }
+      Check whether an app or ipa is linked with calabash.framework
 
-  sim locale  [lang] [regional]? Changes the regional settings
-      for the iOS Simulators. You must ensure the correct format
-      for the optional regional parameter, for example,
-      da_DK, en_US.
+  sim locale [lang code] [locale code]
+      Changes the regional settings.  For usage information, run:
+      $ calabash-ios sim locale
 
-  sim location {on|off} <bundleid>
-      set allow location on/off for current project or bundleid
+  sim reset
+      Reset the Content & Settings of all iOS Simulators
 
-  sim reset (EXPERIMENTAL) Will select "Reset Content and Settings"
-      in the iOS Simulators using AppleScript.
+  setup [path]? (EXPERIMENTAL)
+      https://github.com/calabash/calabash-ios/wiki/calabash-ios-setup
 

data/lib/calabash-cucumber/actions/instruments_actions.rb

@@ -1,14 +1,14 @@
 require 'calabash-cucumber/uia'
 require 'calabash-cucumber/connection_helpers'
 require 'calabash-cucumber/query_helpers'
-require 'calabash-cucumber/map'
 
 # @!visibility private
 class Calabash::Cucumber::InstrumentsActions
   include Calabash::Cucumber::UIA
   include Calabash::Cucumber::ConnectionHelpers
   include Calabash::Cucumber::QueryHelpers
-  include Calabash::Cucumber::Map
+
+  require "calabash-cucumber/map"
 
   # @!visibility private
   def touch(options)
@@ -100,7 +100,7 @@ class Calabash::Cucumber::InstrumentsActions
 
   # @!visibility private
   def find_and_normalize(ui_query)
-    raw_result = raw_map(ui_query, :query)
+    raw_result = Calabash::Cucumber::Map.raw_map(ui_query, :query)
     orientation = raw_result['status_bar_orientation']
     res = raw_result['results']
 

data/lib/calabash-cucumber/console_helpers.rb

@@ -0,0 +1,388 @@
+module Calabash
+  module Cucumber
+    # A collection of methods that help you use console.
+    module ConsoleHelpers
+
+      # Print a representation of the current view hierarchy.
+      def tree
+        hash = http_fetch_view_hierarchy
+        dump_json_data(hash)
+        true
+      end
+
+      # Print the visible element ids.
+      def ids
+        accessibility_marks(:id)
+      end
+
+      # Print the visible element labels.
+      def labels
+        accessibility_marks(:label)
+      end
+
+      # Print the visible element texts.
+      def text
+        text_marks
+      end
+
+      # List the visible element with all marks.
+      def marks
+        opts = {:print => false, :return => true }
+        res = accessibility_marks(:id, opts).each { |elm|elm << :id }
+        res.concat(accessibility_marks(:label, opts).each { |elm| elm << :label })
+        res.concat(text_marks(opts).each { |elm| elm << :text })
+        max_width = 0
+        res.each { |elm|
+          len = elm[0].length
+          max_width = len if len > max_width
+        }
+
+        counter = -1
+        res.sort.each { |elm|
+          printf("%4s %-6s => %#{max_width}s => %s\n",
+                 "[#{counter = counter + 1}]",
+                 elm[2], elm[0], elm[1])
+        }
+        true
+      end
+
+      # @!visibility private
+      #
+      # Users should not call this!!!
+      #
+      # Needs to be called in the .irbrc to ensure good `copy` behavior.
+      def self.start_readline_history!
+        require "irb"
+        file_name = IRB.conf[:HISTORY_FILE]
+
+        if File.exist?(file_name)
+          contents = File.read(file_name)
+          history = ConsoleHelpers.encode_utf8_or_raise(contents)
+          @@start_readline_history = history.split($-0)
+        else
+          @@start_readline_history = []
+        end
+      end
+
+      # Copy all the commands entered in the current console session into the OS
+      # Clipboard.
+      def copy
+        ConsoleHelpers.copy
+      end
+
+      # Clear the clipboard
+      def clear_clipboard
+        ConsoleHelpers.clear_clipboard!
+      end
+
+      # Clear the console history.
+      def clear
+        ConsoleHelpers.clear
+      end
+
+      # Print a message to the console.
+      def puts_message_of_the_day
+        messages = [
+          "Let's get this done!",
+          "Ready to rumble.",
+          "Enjoy.",
+          "Remember to breathe.",
+          "Take a deep breath.",
+          "Isn't it time for a break?",
+          "Can I get you a coffee?",
+          "What is a calabash anyway?",
+          "Smile! You are on camera!",
+          "Let op! Wild Rooster!",
+          "Don't touch that button!",
+          "I'm gonna take this to 11.",
+          "Console. Engaged.",
+          "Your wish is my command.",
+          "This console session was created just for you.",
+          "Den som jager to harer, får ingen.",
+          "Uti, non abuti.",
+          "Non Satis Scire",
+          "Nullius in verba",
+          "Det ka æn jå væer ei jált"
+        ]
+        puts RunLoop::Color.green("Calabash says, \"#{messages.shuffle.first}\"")
+      end
+
+      # Turn on debug logging.
+      def verbose
+        if RunLoop::Environment.debug?
+          puts RunLoop::Color.cyan("Debug logging is already turned on.")
+        else
+          ENV["DEBUG"] = "1"
+          puts RunLoop::Color.cyan("Turned on debug logging.")
+        end
+
+        true
+      end
+
+      # Turn off debug logging.
+      def quiet
+        if RunLoop::Environment.debug?
+          ENV["DEBUG"] = "0"
+          puts RunLoop::Color.cyan("Turned off debug logging.")
+        else
+          puts RunLoop::Color.cyan("Debug logging is already turned off.")
+        end
+
+        true
+      end
+
+      # @!visibility private
+      def puts_console_details
+        puts ""
+        puts RunLoop::Color.magenta("#########################  Useful Methods  ##########################")
+        puts RunLoop::Color.cyan("     ids => List all the visible accessibility ids.")
+        puts RunLoop::Color.cyan("  labels => List all the visible accessibility labels.")
+        puts RunLoop::Color.cyan("    text => List all the visible texts.")
+        puts RunLoop::Color.cyan("   marks => List all the visible marks.")
+        puts RunLoop::Color.cyan("    tree => The app's visible view hierarchy.")
+        puts RunLoop::Color.cyan("   flash => flash(<query>); Disco effect for views matching <query>")
+        puts RunLoop::Color.cyan(" verbose => Turn debug logging on.")
+        puts RunLoop::Color.cyan("   quiet => Turn debug logging off.")
+        puts RunLoop::Color.cyan("    copy => Copy console commands to clipboard.")
+        puts RunLoop::Color.cyan("   clear => Clear the console.")
+        puts ""
+      end
+
+      private
+
+      # List the visible element with given mark(s).
+      # @param {Array} marks
+      # @param {Integer} max_width
+      def print_marks(marks, max_width)
+        counter = -1
+        marks.sort.each { |elm|
+          printf("%4s %#{max_width + 2}s => %s\n", "[#{counter = counter + 1}]", elm[0], elm[1])
+        }
+      end
+
+      # @!visibility private
+      # List the visible element with accessibility marks.
+      def accessibility_marks(kind, opts={})
+        merged_opts = {:print => true, :return => false}.merge(opts)
+
+        kinds = [:id, :label]
+        raise ArgumentError,
+              "'#{kind}' is not one of '#{kinds}'" unless kinds.include?(kind)
+
+        results = Array.new
+        max_width = 0
+
+        query("*").each { |view|
+          aid = view[kind.to_s]
+          unless aid.nil? or aid.eql?("")
+            cls = view["class"]
+            len = cls.length
+            max_width = len if len > max_width
+            results << [cls, aid]
+          end
+        }
+
+        if merged_opts[:print]
+          print_marks(results, max_width)
+        end
+
+        if merged_opts[:return]
+          results
+        else
+          true
+        end
+      end
+
+      # @!visibility private
+      # List the visible element with text marks.
+      def text_marks(opts={})
+        merged_opts = {:print => true, :return => false}.merge(opts)
+
+        indexes = Array.new
+        idx = 0
+        all_texts = query("*", :text)
+        all_texts.each { |view|
+          indexes << idx unless view.eql?("*****") or view.eql?("")
+          idx = idx + 1
+        }
+
+        results = Array.new
+
+        all_views = query("*")
+        max_width = 0
+        indexes.each { |index|
+          view = all_views[index]
+          cls = view["class"]
+          text = all_texts[index]
+          len = cls.length
+          max_width = len if len > max_width
+          results << [cls, text]
+        }
+
+        if merged_opts[:print]
+          print_marks(results, max_width)
+        end
+
+        if merged_opts[:return]
+          results
+        else
+          true
+        end
+      end
+
+      def http_fetch_view_hierarchy
+        require "json"
+        response_body = http({:method => :get, :path => "dump"})
+
+        if response_body.nil? || response_body == ""
+          raise ResponseError,
+                "Server replied with an empty response.  Your app has probably crashed"
+        end
+
+        begin
+          hash = JSON.parse(response_body)
+        rescue TypeError, JSON::ParserError => e
+          raise ResponseError,  %Q{Could not parse server response:
+
+#{e}
+
+There was a problem parsing your app's view hierarchy.
+
+Please report this issue.
+}
+        end
+
+        hash
+      end
+
+      def dump_json_data(json_data)
+        json_data["children"].each {|child| write_child(child)}
+      end
+
+      def write_child(data, indentation=0)
+        render(data, indentation)
+        data["children"].each do |child|
+          write_child(child, indentation+1)
+        end
+      end
+
+      def render(data, indentation)
+        if visible?(data)
+          type = data["type"]
+
+          str_type = if data["type"] == "dom"
+            "#{RunLoop::Color.cyan("[")}#{type}:#{RunLoop::Color.cyan("#{data["nodeName"]}]")} "
+          else
+            RunLoop::Color.cyan("[#{type}] ")
+          end
+
+          str_id = data["id"] ? "[id:#{RunLoop::Color.blue(data["id"])}] " : ""
+          str_label = data["label"] ? "[label:#{RunLoop::Color.green(data["label"])}] " : ""
+          str_text = data["value"] ? "[text:#{RunLoop::Color.magenta(data["value"])}] " : ""
+          output("#{str_type}#{str_id}#{str_label}#{str_text}", indentation)
+          output("\n", indentation)
+        end
+      end
+
+      def visible?(data)
+        (data["visible"] == 1) || data["children"].map{|child| visible?(child)}.any?
+      end
+
+      def output(string, indentation)
+        (indentation*2).times {print " "}
+        print "#{string}"
+      end
+
+      # @!visibility private
+      def self.copy
+        require "clipboard"
+        history = ConsoleHelpers.current_console_history
+        commands = ConsoleHelpers.filter_commands(history)
+        string = commands.join($-0)
+        Clipboard.copy(string)
+        true
+      end
+
+      # @!visibility private
+      def self.clear_clipboard!
+        require "clipboard"
+        @@start_readline_history = ConsoleHelpers.readline_history
+        Clipboard.clear
+        true
+      end
+
+      # @!visibility private
+      def self.clear
+        if RunLoop::Environment.windows_env?
+          ConsoleHelpers.system_clear("cls")
+        else
+          ConsoleHelpers.system_clear("clear")
+        end
+        true
+      end
+
+      # @!visibility private
+      def self.system_clear(command)
+        system(command)
+      end
+
+      # @!visibility private
+      def self.current_console_history
+        readline_history = ConsoleHelpers.readline_history
+        length = readline_history.length - @@start_readline_history.length
+
+        readline_history.last(length)
+      end
+
+      # @!visibility private
+      FILTER_REGEX = Regexp.union(/\s*tree(\(|\z)/,
+                                  /\s*flash(\(|\z)/,
+                                  /\s*ids(\(|\z)/,
+                                  /\s*labels(\(|\z)/,
+                                  /\s*text(\(|\z)/,
+                                  /\s*marks(\(|\z)/,
+                                  /\s*verbose(\(|\z)/,
+                                  /\s*quiet(\(|\z)/,
+                                  /\s*clear(\(|\z)/,
+                                  /\s*clear_clipboard(\(|\z)/,
+                                  /\s*copy(\(|\z)/,
+                                  /\s*start_test_server_in_background(\(|\z)/,
+                                  /\s*exit(\(|\z)/)
+
+      # @!visibility private
+      def self.filter_commands(commands)
+        commands.reject {|command| command =~ FILTER_REGEX}
+      end
+
+      # @!visibility private
+      def self.readline_history
+        require "readline"
+        Readline::HISTORY.to_a
+      end
+
+      # @!visibility private
+      def self.encode_utf8_or_raise(string)
+        return "" if !string
+
+        utf8 = string.force_encoding("UTF-8").chomp
+
+        return utf8 if utf8.valid_encoding?
+
+        encoded = utf8.encode("UTF-8", "UTF-8",
+                              invalid: :replace, undef: :replace, replace: "")
+
+        return encoded if encoded.valid_encoding?
+
+        raise RuntimeError, %Q{
+Could not force UTF-8 encoding on this string:
+
+#{string}
+
+Please file an issue with a stacktrace and the text of this error.
+
+https://github.com/calabash/calabash-ios/issues
+}
+      end
+    end
+  end
+end

data/lib/calabash-cucumber/core.rb

@@ -17,18 +17,22 @@ module Calabash
     # A collection of methods that provide the core calabash behaviors.
     module Core
 
+      require "calabash-cucumber/map"
       include Calabash::Cucumber::EnvironmentHelpers
       include Calabash::Cucumber::ConnectionHelpers
       include Calabash::Cucumber::QueryHelpers
       include Calabash::Cucumber::FailureHelpers
-      include Calabash::Cucumber::Map
       include Calabash::Cucumber::UIA
       include Calabash::Cucumber::StatusBarHelpers
       include Calabash::Cucumber::RotationHelpers
 
       # @!visibility private
-      # @deprecated Use Cucumber's step method (avoid this: using step is not considered best practice).
+      # @deprecated Use Cucumber's step method.
+      #
+      # Using `step` is not considered a best practice.
+      #
       # Used in older cucumber versions that didn't have the `step` method.
+      #
       # Shouldn't be used anymore.
       def macro(txt)
         if self.respond_to? :step
@@ -139,7 +143,7 @@ module Calabash
       # @param [Array] args optional var-args list describing a chain of method selectors.
       #   Full details {http://developer.xamarin.com/guides/testcloud/calabash/calabash-query-syntax/ Query Syntax}.
       def query(uiquery, *args)
-        map(uiquery, :query, *args)
+        Map.map(uiquery, :query, *args)
       end
 
       # Shorthand alias for `query`.
@@ -160,7 +164,7 @@ module Calabash
       def flash(uiquery, *args)
         # todo deprecate the *args argument in the flash method
         # todo :flash operation should return views as JSON objects
-        map(uiquery, :flash, *args).compact
+        Map.map(uiquery, :flash, *args).compact
       end
 
       # Returns the version of the running calabash server.
@@ -410,9 +414,9 @@ module Calabash
           raise ArgumentError, "Expected '#{direction} to be one of #{allowed_directions}"
         end
 
-        views_touched=map(uiquery, :scroll, dir_symbol)
+        views_touched = Map.map(uiquery, :scroll, dir_symbol)
         msg = "could not find view to scroll: '#{uiquery}', args: #{dir_symbol}"
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -425,9 +429,9 @@ module Calabash
       #
       # @param {String} uiquery query describing view scroll (should be  UIScrollView or a web view).
       def scroll_to_row(uiquery, number)
-        views_touched=map(uiquery, :scrollToRow, number)
+        views_touched = Map.map(uiquery, :scrollToRow, number)
         msg = "unable to scroll: '#{uiquery}' to: #{number}"
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -468,9 +472,9 @@ module Calabash
         if options.has_key?(:animate)
           args << options[:animate]
         end
-        views_touched=map(uiquery, :scrollToRow, row.to_i, sec.to_i, *args)
+        views_touched = Map.map(uiquery, :scrollToRow, row.to_i, sec.to_i, *args)
         msg = "unable to scroll: '#{uiquery}' to '#{options}'"
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -517,9 +521,9 @@ module Calabash
           args << options[:animate]
         end
 
-        views_touched=map(uiquery, :scrollToRowWithMark, mark, *args)
+        views_touched = Map.map(uiquery, :scrollToRowWithMark, mark, *args)
         msg = options[:failed_message] || "Unable to scroll: '#{uiquery}' to: #{options}"
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -574,7 +578,9 @@ module Calabash
 
         animate = opts[:animate]
 
-        views_touched=map(uiquery, :collectionViewScroll, item.to_i, section.to_i, scroll_position, animate)
+        views_touched = Map.map(uiquery, :collectionViewScroll,
+                                item.to_i, section.to_i,
+                                scroll_position, animate)
 
         if opts[:failed_message]
           msg = opts[:failed_message]
@@ -582,7 +588,7 @@ module Calabash
           msg = "unable to scroll: '#{uiquery}' to item '#{item}' in section '#{section}'"
         end
 
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -640,9 +646,11 @@ module Calabash
         args << scroll_position
         args << opts[:animate]
 
-        views_touched=map(uiquery, :collectionViewScrollToItemWithMark, mark, *args)
+        views_touched = Map.map(uiquery, :collectionViewScrollToItemWithMark,
+                                mark, *args)
+
         msg = opts[:failed_message] || "Unable to scroll: '#{uiquery}' to cell with mark: '#{mark}' with #{opts}"
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -758,17 +766,6 @@ details => '#{result["details"]}'
         Geocoder.search(place)
       end
 
-      # @!visibility private
-      def move_wheel(opts={})
-        q = opts[:query] || 'pickerView'
-        wheel = opts[:wheel] || 0
-        dir = opts[:dir] || :down
-
-        raise 'Wheel index must be non negative' if wheel < 0
-        raise "Only up and down supported :dir (#{dir})" unless [:up, :down].include?(dir)
-        raise NotImplementedError
-      end
-
       # @!visibility private
       def picker(opts={:query => 'pickerView', :action => :texts})
         raise 'Not implemented' unless opts[:action] == :texts
@@ -830,10 +827,10 @@ details => '#{result["details"]}'
         value_str = value.to_s
 
         args = [merged_options[:animate], merged_options[:notify_targets]]
-        views_touched = map(uiquery, :changeSlider, value_str, *args)
+        views_touched = Map.map(uiquery, :changeSlider, value_str, *args)
 
         msg = "Could not set value of slider to '#{value}' using query '#{uiquery}'"
-        assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
@@ -849,7 +846,7 @@ details => '#{result["details"]}'
       #   trailing ":"
       #
       # @param [String] selector the selector to perform on the app delegate
-      # @param [Object] argument the argument to pass to the selector
+      # @param [Object] arguments the arguments to pass to the selector
       # @return [Object] the result of performing the selector with the argument
       def backdoor(selector, *arguments)
         parameters = {
@@ -1075,10 +1072,10 @@ arguments => '#{arguments}'
       #
       # @return [Array<String>] The text fields that were modified.
       def set_text(uiquery, txt)
-        text_fields_modified = map(uiquery, :setText, txt)
+        text_fields_modified = Map.map(uiquery, :setText, txt)
 
         msg = "query '#{uiquery}' returned no matching views that respond to 'setText'"
-        assert_map_results(text_fields_modified, msg)
+        Map.assert_map_results(text_fields_modified, msg)
         text_fields_modified
       end
 
@@ -1095,9 +1092,9 @@ arguments => '#{arguments}'
       #
       # @return [Array<String>] The text fields that were modified.
       def clear_text(uiquery)
-        views_modified = map(uiquery, :setText, '')
+        views_modified = Map.map(uiquery, :setText, '')
         msg = "query '#{uiquery}' returned no matching views that respond to 'setText'"
-        assert_map_results(views_modified, msg)
+        Map.assert_map_results(views_modified, msg)
         views_modified
       end
 
@@ -1222,7 +1219,7 @@ arguments => '#{arguments}'
         views_touched = launcher.actions.send(action, options)
         unless uiquery.nil?
           msg = "#{action} could not find view: '#{uiquery}', args: #{options}"
-          assert_map_results(views_touched, msg)
+          Map.assert_map_results(views_touched, msg)
         end
         views_touched
       end

data/lib/calabash-cucumber/date_picker.rb

@@ -281,9 +281,10 @@ module Calabash
         args = args_for_change_date_on_picker options
         query_str = query_string_for_picker picker_id
 
-        views_touched = map(query_str, :changeDatePickerDate, target_str, fmt_str, *args)
+        views_touched = Map.map(query_str, :changeDatePickerDate, target_str,
+                                fmt_str, *args)
         msg = "could not change date on picker to '#{target_dt}' using query '#{query_str}' with options '#{options}'"
-        assert_map_results(views_touched,msg)
+        Map.assert_map_results(views_touched,msg)
         views_touched
       end
     end

data/lib/calabash-cucumber/environment.rb

@@ -26,7 +26,7 @@ module Calabash
       # @!visibility private
       def self.simctl
         return nil if self.xtc?
-        @@simctl ||= RunLoop::SimControl.new
+        @@simctl ||= RunLoop::Simctl.new
       end
 
       # @!visibility private

data/lib/calabash-cucumber/http/http.rb

@@ -66,6 +66,7 @@ module Calabash
 
           begin
             success, body = self.ping_app
+            RunLoop.log_debug("Connected to Calaash Server on try: #{try + 1} of #{max_retry_count}")
             return success, body if success
           rescue => e
             last_error = e

data/lib/calabash-cucumber/launcher.rb

@@ -292,10 +292,11 @@ Resetting physical devices is not supported.
 
         options = launch_options.clone
 
-        # Reusing SimControl, Instruments, and Xcode can speed up launches.
+        # Reusing Simctl, Instruments, and Xcode can speed up launches.
         options[:simctl] = simctl || Calabash::Cucumber::Environment.simctl
         options[:instruments] = instruments || Calabash::Cucumber::Environment.instruments
         options[:xcode] = xcode || Calabash::Cucumber::Environment.xcode
+        options[:inject_dylib] = detect_inject_dylib_option(launch_options)
 
         self.launch_args = options
 
@@ -507,6 +508,25 @@ true.  Please remove this method call from your hooks.
       # The version of the embedded LPServer
       # @return RunLoop::Version
       attr_reader :server_version
+
+      # @!visibility private
+      #
+      # @param [Hash] options the launch options passed by the user
+      def detect_inject_dylib_option(options)
+        return nil if !options[:inject_dylib]
+
+        value = options[:inject_dylib]
+
+        # Test for boolean true.
+        if [true].include?(value)
+          # Injection is only supported on simulators, so this cool for now.
+          # Depend on run-loop to raise an error.
+          Calabash::Cucumber::Dylibs.path_to_sim_dylib
+        else
+          # User supplied a path
+          value
+        end
+      end
     end
   end
 end

data/lib/calabash-cucumber/map.rb

@@ -1,10 +1,15 @@
-require 'json'
-
 module Calabash
   module Cucumber
 
     # @!visibility private
-    module Map
+    class Map
+
+      require "json"
+      require "calabash-cucumber/http_helpers"
+      require "calabash-cucumber/failure_helpers"
+
+      include Calabash::Cucumber::HTTPHelpers
+      include Calabash::Cucumber::FailureHelpers
 
       # Returns an array of views matched by the `query` or the result of
       # performing the Objective-C sequence defined by the `method_name` and
@@ -49,8 +54,8 @@ module Calabash
       # Well behaved LPOperations should return the view as JSON objects.
       #
       # @todo Calabash LPOperations should return 'views touched' in JSON format
-      def map(query, method_name, *method_args)
-        raw_map(query, method_name, *method_args)['results']
+      def self.map(query, method_name, *method_args)
+        self.raw_map(query, method_name, *method_args)['results']
       end
 
       # Returns a JSON object the represents the result of performing an http
@@ -70,17 +75,24 @@ module Calabash
       #                  the `method_name` with arguments defined in
       #                  `method_args` on all views matched by the `query`
       #
-      # @see Calabash::Cucumber::Map#map for examples.
-      def raw_map(query, method_name, *method_args)
+      # @see map for examples.
+      def self.raw_map(query, method_name, *method_args)
         operation_map = {
             :method_name => method_name,
             :arguments => method_args
         }
-        res = http({:method => :post, :path => 'map'},
-                   {:query => query, :operation => operation_map})
+
+        res = Map.new.http({:method => :post, :path => 'map'},
+                                {:query => query, :operation => operation_map})
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "map #{query}, #{method_name} failed because: #{res['reason']}\n#{res['details']}"
+          message = %Q[
+map #{query}, #{method_name} failed for:
+
+ reason: #{res["reason"]}
+details: #{res["details"]}
+]
+          Map.new.screenshot_and_raise(message)
         end
 
         res
@@ -121,10 +133,10 @@ module Calabash
       # Here a <tt>[ nil ]</tt> should be considered invalid because the
       # the operation could not be performed because there is not row that
       # matches `mark`
-      def assert_map_results(map_results, msg)
+      def self.assert_map_results(map_results, msg)
         compact = map_results.compact
         if compact.empty? or compact.member? '<VOID>' or compact.member? '*****'
-          screenshot_and_raise msg
+          Map.new.screenshot_and_raise msg
         end
       end
     end

data/lib/calabash-cucumber/status_bar_helpers.rb

@@ -21,7 +21,7 @@ module Calabash
       # @return [Symbol] Returns the device orientation as one of
       #  `{:down, :up, :left, :right}`.
       def device_orientation(force_down=false)
-        res = map(nil, :orientation, :device).first
+        res = Map.map(nil, :orientation, :device).first
 
         if ['face up', 'face down'].include?(res)
           if force_down
@@ -47,7 +47,7 @@ module Calabash
       # @return [String] Returns the device orientation as one of
       #  `{'down' | 'up' | 'left' | 'right'}`.
       def status_bar_orientation
-        map(nil, :orientation, :status_bar).first
+        Map.map(nil, :orientation, :status_bar).first
       end
 
       # Is the device in the portrait orientation?

data/lib/calabash-cucumber/version.rb

@@ -3,7 +3,7 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.19.0.pre2"
+    VERSION = "0.19.0.pre3"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.

data/scripts/.irbrc

@@ -0,0 +1,87 @@
+require "irb/completion"
+require "irb/ext/save-history"
+require "benchmark"
+
+begin
+  require "awesome_print"
+rescue LoadError => e
+  puts %Q[
+Caught a LoadError: could not load 'awesome_print'",
+
+#{e}
+
+Use bundler (recommended) or uninstall awesome_print.
+
+# Use bundler (recommended)
+$ bundle update
+$ bundle exec calabash-ios console
+
+# Uninstall awesome_print and reinstall calabash-cucumber
+$ gem update --system
+$ gem uninstall -Vax --force --no-abort-on-dependent awesome_print
+$ gem install calabash-cucumber
+
+]
+  exit(1)
+end
+
+AwesomePrint.irb!
+
+ARGV.concat ["--readline", "--prompt-mode", "simple"]
+
+IRB.conf[:SAVE_HISTORY] = 100
+IRB.conf[:HISTORY_FILE] = ".irb-history"
+
+begin
+  require "pry"
+  Pry.config.history.should_save = false
+  Pry.config.history.should_load = false
+  require "pry-nav"
+rescue LoadError => _
+
+end
+
+def embed(x,y=nil,z=nil)
+  puts "Screenshot at #{x}"
+end
+
+require "calabash-cucumber"
+
+IRB.conf[:AUTO_INDENT] = true
+
+IRB.conf[:PROMPT][:CALABASH_IOS] = {
+  :PROMPT_I => "calabash-ios #{Calabash::Cucumber::VERSION}> ",
+  :PROMPT_N => "calabash-ios #{Calabash::Cucumber::VERSION}> ",
+  :PROMPT_S => nil,
+  :PROMPT_C => "> ",
+  :AUTO_INDENT => false,
+  :RETURN => "%s\n"
+}
+
+IRB.conf[:PROMPT_MODE] = :CALABASH_IOS
+
+require "calabash-cucumber/operations"
+extend Calabash::Cucumber::Operations
+
+require "calabash-cucumber/console_helpers"
+include Calabash::Cucumber::ConsoleHelpers
+Calabash::Cucumber::ConsoleHelpers.start_readline_history!
+
+def preferences
+  Calabash::Cucumber::Preferences.new
+end
+
+def disable_usage_tracking
+  preferences.usage_tracking = "none"
+  puts "Calabash will not collect usage information."
+  "none"
+end
+
+def enable_usage_tracking(level="system_info")
+  preferences.usage_tracking = level
+  puts "Calabash will collect statistics using the '#{level}' rule."
+  level
+end
+
+puts_console_details
+puts_message_of_the_day

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.19.0.pre2
+  version: 0.19.0.pre3
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -113,35 +113,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: run_loop
+  name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1.pre4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1.pre4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: run_loop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: CFPropertyList
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -336,6 +342,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -371,6 +391,7 @@ files:
 - lib/calabash-cucumber/calabash_steps.rb
 - lib/calabash-cucumber/connection.rb
 - lib/calabash-cucumber/connection_helpers.rb
+- lib/calabash-cucumber/console_helpers.rb
 - lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
 - lib/calabash-cucumber/date_picker.rb
@@ -401,6 +422,7 @@ files:
 - lib/calabash-cucumber/wait_helpers.rb
 - lib/calabash/formatters/html.rb
 - lib/frank-calabash.rb
+- scripts/.irbrc
 - scripts/calabash.xcconfig.erb
 - scripts/data/clients.plist
 - scripts/data/com.apple.Accessibility-5.1.plist