calabash-cucumber 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ca53be02da9a57cb4baffd965a8ce32d959a80
-  data.tar.gz: 30ff3a6acafdca9a4d45b5855418e37d122a0cc0
+  metadata.gz: 634d208866c3c80558eea3cf6e002d436a38ca70
+  data.tar.gz: d2800a32dec27bbbbb2fef975ca0c0714cfe4dcb
 SHA512:
-  metadata.gz: b20587099e1b708a242899de712604b6e675768a453a09f91ba5f5dd4b4a4e088c72343ff6577b40a945c9eaca58fd3ef54af5a2711af20c16090844ae353629
-  data.tar.gz: 2b532a1873a5b4a56c141b363b0e9acb46b6012b228fe34f19afb78ab40066444df869ced45d35ffd300e5b90e604729ded46827441546cc6bf79b3a1a8d9d82
+  metadata.gz: c3d0e8203c996a79d956d3c1862a48a760a716f622ff070a053682816e0a06bd2e77daeaeb232a299592cef3a8bb060222a64d96bdc39250d484638becea859a
+  data.tar.gz: ecf56d4a6ed42028125511566d7b5a8078c43bdc2925619e7f3ee56b9ce5a715d63057355c91800480bc61b3fdc7427ff4677a515ae6e1d786175374aad9b7a8

data/lib/calabash-cucumber.rb

@@ -1,7 +1,9 @@
+require "calabash-cucumber/environment"
 require "calabash-cucumber/logging"
 require "calabash-cucumber/dot_dir"
 require "calabash-cucumber/store/preferences"
 require "calabash-cucumber/usage_tracker.rb"
+require "calabash-cucumber/dylibs"
 require 'calabash-cucumber/core'
 require 'calabash-cucumber/tests_helpers'
 require 'calabash-cucumber/keyboard_helpers'

data/lib/calabash-cucumber/device.rb

@@ -193,7 +193,7 @@ module Calabash
       # @return [Boolean] true if this device is a simulator
       def simulator?
         # Post 0.16.2 server
-        if simulator_details
+        unless simulator_details.nil? || simulator_details.empty?
           true
         else
           system == GESTALT_SIM_SYS

data/lib/calabash-cucumber/dylibs.rb

@@ -0,0 +1,37 @@
+module Calabash
+  module Cucumber
+
+    # @!visibility private
+    module Dylibs
+
+      # @!visibility private
+      def self.sim_dylib_basename
+        "libCalabashDynSim.dylib"
+      end
+
+      # @!visibility private
+      def self.path_to_sim_dylib
+        File.join(self.dylib_dir, self.sim_dylib_basename)
+      end
+
+      # @!visibility private
+      def self.device_dylib_basename
+        "libCalabashDyn.dylib"
+      end
+
+      # @!visibility private
+      def self.path_to_device_dylib
+        File.join(self.dylib_dir, self.device_dylib_basename)
+      end
+
+      private
+
+      # @!visibility private
+      def self.dylib_dir
+        dirname = File.dirname(__FILE__)
+        File.expand_path(File.join(dirname, "..", "..", "dylibs"))
+      end
+    end
+  end
+end
+

data/lib/calabash-cucumber/environment.rb

@@ -0,0 +1,16 @@
+module Calabash
+  module Cucumber
+    module Environment
+
+      def self.device_target
+        value = ENV["DEVICE_TARGET"]
+
+        if value.nil? || value == ""
+          nil
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -323,7 +323,12 @@ module Calabash
             #           on numeric keyboards, it is actually a button on the
             #           keyboard and not a key
             if code.eql?(UIA_SUPPORTED_CHARS['Delete'])
-              uia("uia.keyboard().elements().firstWithName('Delete').tap()")
+              js_tap_delete = "(function() {"\
+                  "var deleteElement = uia.keyboard().elements().firstWithName('Delete');"\
+                  "deleteElement = deleteElement.isValid() ? deleteElement : uia.keyboard().elements().firstWithName('delete');"\
+                  "deleteElement.tap();"\
+                "})();"
+              uia(js_tap_delete)
             else
               uia_type_string_raw(code)
             end

data/lib/calabash-cucumber/launcher.rb

@@ -7,7 +7,6 @@ require 'calabash-cucumber/actions/playback_actions'
 require 'run_loop'
 require 'cfpropertylist'
 require 'calabash-cucumber/utils/logging'
-require 'calabash/dylibs'
 require "calabash-cucumber/usage_tracker"
 
 # Used to launch apps for testing in iOS Simulator or on iOS Devices.  By default
@@ -31,6 +30,9 @@ require "calabash-cucumber/usage_tracker"
 #  not exit the simulator when a Scenario fails.
 class Calabash::Cucumber::Launcher
 
+  require "calabash-cucumber/dylibs"
+  require "calabash-cucumber/environment"
+
   include Calabash::Cucumber::Logging
   include Calabash::Cucumber::SimulatorAccessibility
 
@@ -109,48 +111,25 @@ class Calabash::Cucumber::Launcher
   # @see Calabash::Cucumber::Core#console_attach
   def attach(options={})
     default_options = {:max_retry => 1,
-                       :timeout => 10,
-                       :uia_strategy => nil}
+                       :timeout => 10}
     merged_options = default_options.merge(options)
 
     if calabash_no_launch?
-      self.actions= Calabash::Cucumber::PlaybackActions.new
+      self.actions = Calabash::Cucumber::PlaybackActions.new
       return
     end
 
-    # :host is is a special case and requires reading information from a cache.
-    strategy_from_options = merged_options[:uia_strategy]
-    if strategy_from_options == :host
-      self.run_loop = RunLoop::HostCache.default.read
-      return self
-    end
+    self.run_loop = RunLoop::HostCache.default.read
 
     # Sets the device attribute.
     ensure_connectivity(merged_options[:max_retry], merged_options[:timeout])
 
-    if strategy_from_options.nil? && xcode.version_gte_7?
-      self.run_loop = RunLoop::HostCache.default.read
-      return self
-    end
-
-    pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
-    pids = pids_str.split(',').map { |pid| pid.to_i }
-    pid = pids.first
-    run_loop = {}
-    if pid
-      run_loop[:pid] = pid
-      self.actions= Calabash::Cucumber::InstrumentsActions.new
+    if self.run_loop[:pid]
+      self.actions = Calabash::Cucumber::InstrumentsActions.new
     else
-      self.actions= Calabash::Cucumber::PlaybackActions.new
+      self.actions = Calabash::Cucumber::PlaybackActions.new
     end
 
-    if strategy_from_options
-      run_loop[:uia_strategy] = merged_options[:uia_strategy]
-    else
-      run_loop[:uia_strategy] = :preferences
-    end
-
-    self.run_loop = run_loop
     major = self.device.ios_major_version
     if major.to_i >= 7 && self.actions.is_a?(Calabash::Cucumber::PlaybackActions)
       puts  %Q{
@@ -296,21 +275,46 @@ Remove direct calls to reset_app_sandbox.
 })
   end
 
-  # Erases the contents and setting for every available simulator.
-  #
-  # For Xcode 6, this is equivalent to calling: `$ xcrun simctl erase` on
-  # every available simulator.  For Xcode < 6, it is equivalent to touching
-  # the 'Reset Content & Settings' menu item.
+  # Erases a simulator. This is the same as touching the Simulator
+  # "Reset Content & Settings" menu item.
   #
-  # @note
-  #  **WARNING** This is a destructive operation.  You have been warned.
+  # @param [RunLoop::Device, String] The simulator to erase.  Can be a device
+  #   instance, a simulator UUID, or a human readable simulator name.
   #
-  # @raise RuntimeError if called when targeting a physical device
-  def reset_simulator
+  # @raise ArgumentError If the simulator is a physical device
+  # @raise RuntimeError If the simulator cannot be shutdown
+  # @raise RuntimeError If the simulator cannot be erased
+  def reset_simulator(device=nil)
     if device_target?
-      raise "Calling 'reset_simulator' when targeting a device is not allowed"
+      raise ArgumentError, "Resetting physical devices is not supported."
     end
-    RunLoop::SimControl.new.reset_sim_content_and_settings
+
+    simulator = nil
+
+    if device.nil? || device == ""
+      device_target = Calabash::Cucumber::Environment.device_target
+      if device_target.nil?
+        default_simulator = RunLoop::Core.default_simulator
+        simulator = RunLoop::Device.device_with_identifier(default_simulator)
+      else
+        simulator = RunLoop::Device.device_with_identifier(device_target)
+      end
+    elsif device.is_a?(RunLoop::Device)
+      if device.physical_device?
+        raise ArgumentError,
+%Q{
+Cannot reset: #{device}.
+
+Resetting physical devices is not supported.
+}
+      end
+      simulator = device
+    else
+      simulator = RunLoop::Device.device_with_identifier(device)
+    end
+
+    RunLoop::CoreSimulator.erase(simulator)
+    simulator
   end
 
   # @!visibility private
@@ -559,9 +563,9 @@ Remove direct calls to reset_app_sandbox.
       # User passed a Boolean, not a file.
       if use_dylib.is_a?(TrueClass)
         if simulator_target?(args)
-          args[:inject_dylib] = Calabash::Dylibs.path_to_sim_dylib
+          args[:inject_dylib] = Calabash::Cucumber::Dylibs.path_to_sim_dylib
         else
-          args[:inject_dylib] = Cucumber::Dylibs.path_to_device_dylib
+          raise RuntimeError, "Injecting a dylib is not supported when targetting a device"
         end
       else
         unless File.exist? use_dylib

data/lib/calabash-cucumber/logging.rb

@@ -1,6 +1,8 @@
 module Calabash
   module Cucumber
+    require "fileutils"
     require "run_loop"
+    require "calabash-cucumber/dot_dir"
 
     # These methods are not part of the API.
     #
@@ -32,6 +34,30 @@ module Calabash
       puts self.red("ERROR: #{msg}") if msg
     end
 
+    # !@visibility private
+    def self.log_to_file(message)
+      timestamp = self.timestamp
+
+      begin
+        File.open(self.calabash_log_file, "a:UTF-8") do |file|
+          message.split($-0).each do |line|
+            file.write("#{timestamp} #{line}#{$-0}")
+          end
+        end
+      rescue => e
+        message =
+%Q{Could not write:
+
+#{message}
+
+to calabash.log because:
+
+#{e}
+}
+        self.log_debug(message)
+      end
+    end
+
     private
 
     # @!visibility private
@@ -74,6 +100,27 @@ module Calabash
     def self.green(string)
       colorize(string, 32)
     end
+
+    # @!visibility private
+    def self.timestamp
+      Time.now.strftime("%Y-%m-%d_%H-%M-%S")
+    end
+
+    # @!visibility private
+    def self.logs_directory
+      path = File.join(Calabash::Cucumber::DotDir.directory, "logs")
+      FileUtils.mkdir_p(path)
+      path
+    end
+
+    # @!visibility private
+    def self.calabash_log_file
+      path = File.join(self.logs_directory, "calabash.log")
+      if !File.exist?(path)
+        FileUtils.touch(path)
+      end
+      path
+    end
   end
 end
 

data/lib/calabash-cucumber/store/preferences.rb

@@ -8,6 +8,7 @@ module Calabash
     #
     # ~/.calabash/preferences/preferences.json
     class Preferences
+      require "calabash-cucumber/dot_dir"
 
       def initialize
         dot_dir = Calabash::Cucumber::DotDir.directory
@@ -150,12 +151,8 @@ module Calabash
       def generate_json(hash)
         begin
           JSON.pretty_generate(hash)
-        rescue TypeError, JSON::UnparserError => e
-          write_to_log(
-%Q{Error generating JSON from:
- hash: #{hash}
-error: #{e}
-})
+        rescue TypeError, JSON::UnparserError => _
+
           log_defaults_reset
 
           # Will always generate valid JSON
@@ -181,12 +178,8 @@ error: #{e}
       def parse_json(string)
         begin
           JSON.parse(string, {:symbolize_names => true})
-        rescue TypeError, JSON::ParserError => e
-          write_to_log(
-%Q{Error parsing JSON from:
-string: #{string}
- error: #{e}
-})
+        rescue TypeError, JSON::ParserError => _
+
           log_defaults_reset
 
           hash = defaults
@@ -195,11 +188,6 @@ string: #{string}
         end
       end
 
-      # @!visibility private
-      def write_to_log(error_message)
-        # TODO write to a log file?
-      end
-
       # @!visibility private
       def log_defaults_reset
         Calabash::Cucumber.log_warn(

data/lib/calabash-cucumber/usage_tracker.rb

@@ -1,6 +1,8 @@
 module Calabash
   module Cucumber
     class UsageTracker
+      require "calabash-cucumber/store/preferences"
+      require "calabash-cucumber/logging"
 
       require "httpclient"
       require "run_loop"
@@ -24,9 +26,9 @@ module Calabash
             info_we_are_allowed_to_track != "none"
           begin
             HTTPClient.post(ROUTE, info)
-          rescue => _
-            # do nothing
-            # Perhaps we should log?
+          rescue => e
+            message = %Q{ERROR: Could not post usage tracking information:#{$-0}#{e}}
+            Calabash::Cucumber::log_to_file(message)
           end
         end
       end
@@ -82,7 +84,7 @@ module Calabash
       end
 
       # @!visibility private
-      DATA_VERSION = "1.0"
+      DATA_VERSION = "1.1"
 
       # @!visibility private
       WINDOWS = "Windows"
@@ -179,7 +181,8 @@ module Calabash
               :jenkins => RunLoop::Environment.jenkins?,
               :travis => RunLoop::Environment.travis?,
               :circle_ci => RunLoop::Environment.circle_ci?,
-              :teamcity => RunLoop::Environment.teamcity?
+              :teamcity => RunLoop::Environment.teamcity?,
+              :gitlab => RunLoop::Environment.gitlab?
             }
           )
         end

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.17.0"
+    VERSION = "0.17.1"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = "0.17.0"
+    MIN_SERVER_VERSION = "0.17.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -144,16 +144,22 @@ dependencies:
   name: run_loop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +412,8 @@ files:
 - lib/calabash-cucumber/deprecated.rb
 - lib/calabash-cucumber/device.rb
 - lib/calabash-cucumber/dot_dir.rb
+- lib/calabash-cucumber/dylibs.rb
+- lib/calabash-cucumber/environment.rb
 - lib/calabash-cucumber/environment_helpers.rb
 - lib/calabash-cucumber/failure_helpers.rb
 - lib/calabash-cucumber/http_helpers.rb
@@ -533,7 +541,6 @@ files:
 - lib/calabash-cucumber/utils/xctools.rb
 - lib/calabash-cucumber/version.rb
 - lib/calabash-cucumber/wait_helpers.rb
-- lib/calabash/dylibs.rb
 - lib/frank-calabash.rb
 - scripts/.irbrc
 - scripts/calabash.xcconfig.erb

data/lib/calabash/dylibs.rb

@@ -1,21 +0,0 @@
-module Calabash
-  module Dylibs
-    def sim_dylib_basename
-      'libCalabashDynSim.dylib'
-    end
-
-    def path_to_sim_dylib
-      File.expand_path File.join(__FILE__, '..', '..', '..', 'dylibs', sim_dylib_basename)
-    end
-
-    def device_dylib_basename
-      'libCalabashDyn.dylib'
-    end
-
-    def path_to_device_dylib
-      File.expand_path File.join(__FILE__, '..', '..', '..', 'dylibs', device_dylib_basename)
-    end
-
-    module_function :path_to_sim_dylib, :path_to_device_dylib, :device_dylib_basename, :sim_dylib_basename
-  end
-end