calabash-cucumber 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858401fd6208b68bba5b454ead0fc6c0fb1cf096
-  data.tar.gz: 615e20e056d41bf5bac1617fd29c311213244a0b
+  metadata.gz: 4fcd5b3694c5b5a674846f6afdc47d9b69bee38f
+  data.tar.gz: 8355da41535f75c286004c00917c5b70a6997b31
 SHA512:
-  metadata.gz: 72c8518231bc1becf0ded6507d9f033d26639a8acdbb8f515c6c8626ba509cce2cd8987f2a4c5e8e4791f8a06d23a8d0d194bfeddcbb7f52b0421855dccc5055
-  data.tar.gz: ae4c2405c6b4091c5280f67ee0710d69838d76e1dcd007376a7350fa8bb446873188d343188d48ded4626f1be59d3903a6ffe9aafdb21e8b3d9ebacbea7326d7
+  metadata.gz: 263e85bb0b112f15639b3242d2855c4f0002001048bf1b16b5b2c813ece268bcb837080935926250729c9dad7d79c50130098ec4e18ad3ac50935368db87df34
+  data.tar.gz: f1ec4ed7d7e002a190959c88f85c2f1b4e5c3256101be838cbe2538b60559259f0053ef47c3f1d92f9362f4451660feb09f07de9827a038cd9d3f8ce8b2cb206

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -469,6 +469,11 @@ module Calabash
       #
       # @raise [RuntimeError] if the text cannot be typed.
       def done
+        _deprecated("0.10.0",
+%Q{Use tap_keyboard_action_key
+
+The `done` method will be removed in 0.19.0
+}, :warn)
         tap_keyboard_action_key
       end
 

data/lib/calabash-cucumber/launcher.rb

@@ -36,9 +36,6 @@ class Calabash::Cucumber::Launcher
   include Calabash::Cucumber::Logging
   include Calabash::Cucumber::SimulatorAccessibility
 
-  # A hash of known privacy settings that calabash can control.
-  KNOWN_PRIVACY_SETTINGS = {:photos => 'kTCCServicePhotos', :calendar => 'kTCCServiceCalendar', :address_book => 'kTCCServiceAddressBook'}
-
   # noinspection RubyClassVariableUsageInspection
 
   # @!visibility private
@@ -317,78 +314,6 @@ Resetting physical devices is not supported.
     simulator
   end
 
-  # @!visibility private
-  def directories_for_sdk_prefix(sdk)
-    if sdk == :all
-      existing_simulator_support_sdk_dirs
-    else
-      Dir["#{simulator_app_support_dir}/#{sdk}*"]
-    end
-  end
-
-  # Call as `update_privacy_settings('com.my.app', {:photos => {:allow => true}})`
-  # @!visibility private
-  def update_privacy_settings(bundle_id, opts={})
-    if debug_logging?
-      puts "Update privacy settings #{bundle_id}, #{opts}"
-    end
-    unless File.exist?(`which sqlite3`.strip)
-      raise 'Error: Unable to find sqlite3. The binary sqlite3 must be installed and on path.'
-    end
-    opts.each do |setting_name, setting_options|
-
-      setting_name = KNOWN_PRIVACY_SETTINGS[setting_name] || setting_name
-      allow = setting_options[:allow] == false ? false : true
-      sdk = setting_options[:sdk] || self.simulator_launcher.sdk_detector.latest_sdk_version
-
-      dirs = directories_for_sdk_prefix(sdk)
-      if debug_logging?
-        puts "About to update privacy setting #{setting_name} for #{bundle_id}, allow: #{allow} in sdk #{sdk}, #{dirs}"
-      end
-
-      dirs.each do |dir|
-        if debug_logging?
-          puts "Setting access for #{bundle_id} for permission #{setting_name} to allow: #{allow}"
-        end
-        path_to_tcc_db = tcc_database_for_sdk_dir(dir)
-        unless File.exist?(path_to_tcc_db)
-          puts "Warning: No TCC.db in location #{path_to_tcc_db}"
-          next
-        end
-        allowed_as_i = allow ? 1 : 0
-        if privacy_setting(dir, bundle_id,setting_name).nil?
-          sql = %Q['INSERT INTO access (service, client, client_type, allowed, prompt_count) VALUES ("#{setting_name}","#{bundle_id}",0,#{allowed_as_i},1);']
-        else
-          sql = %Q['UPDATE access SET allowed=#{allowed_as_i} where client="#{bundle_id}" AND service="#{setting_name}";']
-        end
-
-        if debug_logging?
-          puts "Executing sql #{sql} on #{path_to_tcc_db}"
-        end
-
-        unless system(%Q[sqlite3 "#{path_to_tcc_db}" #{sql}]) && privacy_setting(dir,bundle_id,setting_name) == allowed_as_i
-          puts "Warning: Error executing sql: #{sql} against #{path_to_tcc_db} (Setting is #{privacy_setting(dir,bundle_id,setting_name)}). Continuing..."
-          next
-        end
-      end
-    end
-  end
-
-  # @!visibility private
-  def tcc_database_for_sdk_dir(dir)
-    File.join(dir,'Library', 'TCC', 'TCC.db')
-  end
-
-  # @!visibility private
-  def privacy_setting(sdk_dir, bundle_id, setting_name)
-    setting_name = KNOWN_PRIVACY_SETTINGS[setting_name] || setting_name
-    path_to_tcc_db = tcc_database_for_sdk_dir(sdk_dir)
-    sql = %Q['SELECT allowed FROM access WHERE client="#{bundle_id}" and service="#{setting_name}";']
-    output = `sqlite3 "#{path_to_tcc_db}" #{sql}`.strip
-
-    (output == '0' || output == '1') ? output.to_i : nil
-  end
-
   # @!visibility private
   def default_launch_args
     # APP_BUNDLE_PATH
@@ -405,7 +330,6 @@ Resetting physical devices is not supported.
         :launch_method => default_launch_method,
         :reset => reset_between_scenarios?,
         :bundle_id => ENV['BUNDLE_ID'],
-        :device => device_env,
         :no_stop => calabash_no_stop?,
         :no_launch => calabash_no_launch?,
         :sdk_version => sdk_version,
@@ -522,40 +446,38 @@ Resetting physical devices is not supported.
         raise "Unable to find app bundle at #{args[:app]}. It should be an iOS Simulator build (typically a *.app directory)."
       end
     end
-    args[:app] = args[:app] || args[:bundle_id] || app_path || detect_app_bundle_from_args(args)
 
+    # User passed {:app => "path/to/my.app"} _and_ it exists.
+    # User defined BUNDLE_ID or passed {:bundle_id => com.example.myapp}
+    # User defined APP or APP_BUNDLE_PATH env vars _or_ APP_BUNDLE_PATH constant.
+    args[:app] = args[:app] || args[:bundle_id] || app_path
 
     if args[:app]
       if File.directory?(args[:app])
         args[:app] = File.expand_path(args[:app])
       else
-        # args[:app] is not a directory so must be a bundle id
-        if simulator_target?(args) ## bundle id set, but simulator target
-          args[:app] = app_path || detect_app_bundle_from_args(args)
+        # args[:app] is not a directory so must be a bundle id.
+        if simulator_target?(args)
+          args[:app] = app_path
         end
       end
     end
 
-    unless args[:app]
-      if simulator_target?(args)
-        device_xamarin_build_dir = 'iPhoneSimulator'
-      else
-        device_xamarin_build_dir = 'iPhone'
-      end
-      args[:app] = self.simulator_launcher.app_bundle_or_raise(app_path, device_xamarin_build_dir)
-    end
-
-    args[:bundle_id] ||= detect_bundle_id_from_app_bundle(args)
-
-    args[:device] ||= detect_device_from_args(args)
+    # At this point :app is either nil because we are targeting a simulator
+    # or it is a CFBundleIdentifier.
+    if args[:app]
+      # nothing to do because :bundle_id and :app are the same.
+    else
+      # User gave us no information about where the simulator app is located
+      # so we have to auto detect it.  This RunLoop method raises an error
+      # with a meaningful message based on the environment.  The message
+      # includes suggestions about what to do next.
+      run_loop_app = RunLoop::DetectAUT::Detect.new.app_for_simulator
 
-    if args[:privacy_settings]
-      if simulator_target?(args)
-        update_privacy_settings(args[:bundle_id], args[:privacy_settings])
-      else
-        # Not supported on device
-        puts 'Warning: :privacy_settings not supported on device'
-      end
+      # This is not great - RunLoop is going to take this path and create a new
+      # RunLoop::App.  This is the best we can do for now.
+      args[:app] = run_loop_app.path
+      args[:bundle_id] = run_loop_app.bundle_identifier
     end
 
     use_dylib = args[:inject_dylib]
@@ -655,57 +577,6 @@ Resetting physical devices is not supported.
     end
   end
 
-  # @!visibility private
-  def detect_device_from_args(args)
-    if args[:app] && File.directory?(args[:app])
-      # Derive bundle id from bundle_dir
-      plist_as_hash = info_plist_from_bundle_path(args[:app])
-      if plist_as_hash
-        device_family = plist_as_hash['UIDeviceFamily']
-        if device_family
-          first_device = device_family.first
-          if first_device == 2
-            return 'ipad'
-          else
-            return 'iphone'
-          end
-        end
-      end
-    else
-      args[:app]
-    end
-  end
-
-  # @!visibility private
-  def detect_app_bundle_from_args(args)
-    if simulator_target?(args)
-      device_xamarin_build_dir = 'iPhoneSimulator'
-    else
-      device_xamarin_build_dir = 'iPhone'
-    end
-    # is this really only applicable to the Xamarin IDE?
-    self.simulator_launcher.detect_app_bundle(nil, device_xamarin_build_dir)
-  end
-
-  # @!visibility private
-  def detect_bundle_id_from_app_bundle(args)
-    if args[:app] && File.directory?(args[:app])
-      # Derive bundle id from bundle_dir
-      plist_as_hash = info_plist_from_bundle_path(args[:app])
-      if plist_as_hash
-        plist_as_hash['CFBundleIdentifier']
-      end
-    else
-      args[:app]
-    end
-  end
-
-  # @!visibility private
-  def info_plist_from_bundle_path(bundle_path)
-    plist_path = File.join(bundle_path, 'Info.plist')
-    info_plist_as_hash(plist_path) if File.exist?(plist_path)
-  end
-
   # @!visibility private
   def new_run_loop(args)
 
@@ -718,14 +589,14 @@ Resetting physical devices is not supported.
         return RunLoop.run(args)
       rescue RunLoop::TimeoutError => e
         last_err = e
-        if full_console_logging?
-          puts 'retrying run loop...'
-        end
-        self.simulator_launcher.stop
       end
     end
-    self.simulator_launcher.stop
-    puts "Unable to start. Make sure you've set APP_BUNDLE_PATH to a build supported by this simulator version"
+
+    if simulator_target?(args)
+      puts "Unable to launch app on Simulator."
+    else
+      puts "Unable to launch app on physical device"
+    end
     raise StartError.new(last_err)
   end
 
@@ -807,26 +678,6 @@ Resetting physical devices is not supported.
     end
   end
 
-  # @!visibility private
-  def info_plist_as_hash(plist_path)
-    unless File.exist?(plist_path)
-      raise "Unable to find Info.plist: #{plist_path}"
-    end
-    parsedplist = CFPropertyList::List.new(:file => plist_path)
-    CFPropertyList.native_types(parsedplist.value)
-  end
-
-  # @!visibility private
-  def detect_bundle_id
-    begin
-      bundle_path = self.simulator_launcher.app_bundle_or_raise(app_path)
-      plist_path = File.join(bundle_path, 'Info.plist')
-      info_plist_as_hash(plist_path)['CFBundleIdentifier']
-    rescue => e
-      raise "Unable to automatically find bundle id. Please set BUNDLE_ID environment variable. #{e}"
-    end
-  end
-
   # @!visibility private
   def calabash_no_stop?
     calabash_no_launch? or ENV['NO_STOP']=="1"
@@ -907,14 +758,9 @@ Resetting physical devices is not supported.
     ENV['RESET_BETWEEN_SCENARIOS']=="1"
   end
 
-  # @!visibility private
-  def device_env
-    ENV['DEVICE']
-  end
-
   # @!visibility private
   def app_path
-    ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH) || ENV['APP']
+    RunLoop::Environment.path_to_app_bundle || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
   end
 
   # @!visibility private

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.9
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -248,16 +248,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -557,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS