calabash-cucumber 0.9.163.pre4 → 0.9.163.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92fe46c72cf7c198d794ddba2a518ecda59757d9
-  data.tar.gz: d0fc8270c277166fcda42080a6d05adf6b3e1a02
+  metadata.gz: e3890c3b5aea8c789a8aa90c226ae528d6e17e78
+  data.tar.gz: 21991600f65969e8eb8018a2bb835a110f86bbe9
 SHA512:
-  metadata.gz: 7fd73184e610036cebeb6f8a842f258f7cd49b6fd6dbe6edb68e7c5c4f868f4b0c564d868c12523c9301f132e7c92f515ccfc572e5f7bc84b4f206e658f8addf
-  data.tar.gz: 01361b87b9afebba12e99e53d05c808ed093238ead4f5413249a227af14adf32d631664119f5b12127ea135818c03ec7b78670848a60a959cf4118c0b78fd4e8
+  metadata.gz: c46c1d2d0b74cb6f9ff7944563b71e23c1fab55df66b57ad19f7f33694df09e9c738e696ab56846ba6ee21d5d3c8e4f6b58d62c9fb071c7748c5b0c2d272d0f8
+  data.tar.gz: 641ae6857ccd75f7bf46e9837ef72fe4594baef5df30733e7a1717e0203c8aa95e4d2ecc0f1e7f14d5f3d13ac9eeaa2cc79795c256954dc1d911c43a806bec06

data/calabash-cucumber.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "geocoder", "~>1.1.8")
   s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "~> 0.1.0.pre1" )
+  s.add_dependency( "run_loop", "~> 0.1.0.pre3" )
   s.add_dependency( "awesome_print")
   s.add_dependency( "xamarin-test-cloud", "~> 0.9.25")
 

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -101,15 +101,20 @@ module Calabash
           known = KEYPLANE_NAMES.values
 
           found = false
-          ["shift", "more"].each do |key|
+          keyplane_selection_keys = ["shift", "more"]
+          keyplane_selection_keys.each do |key|
             plane = props["#{key}-alternate"]
             if (known.member?(plane) and
                 not visited.member?(plane))
               keyboard_enter_char(key.capitalize, false)
               found = search_keyplanes_and_enter_char(chr, visited)
               return true if found
-              #not found => go back
-              keyboard_enter_char(key.capitalize, false)
+              #not found => try with other keyplane selection key
+              keyplane_selection_keys.delete(key)
+              other_key = keyplane_selection_keys.last
+              keyboard_enter_char(other_key.capitalize, false)
+              found = search_keyplanes_and_enter_char(chr, visited)
+              return true if found
             end
           end
           return false

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -245,8 +245,21 @@ module Calabash
       end
 
       def self.linked_with_calabash?(d)
-        out = `otool "#{File.expand_path(d)}"/* -o 2> /dev/null | grep CalabashServer`
-        /CalabashServer/.match(out)
+        skipped_formats = [".png", ".jpg", ".jpeg", ".plist", ".nib", ".lproj"]
+        dir = File.expand_path(d)
+
+        # For every file on that .app directory
+        Dir.entries(d).each do |file|
+          # If this is an asset or any of those skipped formats, skip it.
+          next if skipped_formats.include? File.extname(file)
+
+          # If its not, try to run otool against that file, check whether we are linked against calabash framework.
+          out = `otool #{dir}/#{file} -o 2> /dev/null | grep CalabashServer`
+          return true if /CalabashServer/.match(out)
+        end
+
+        # Defaulted to false
+        false
       end
 
       def self.find_preferred_dir(sim_dirs)

data/lib/calabash-cucumber/launcher.rb

@@ -6,6 +6,8 @@ require 'cfpropertylist'
 
 class Calabash::Cucumber::Launcher
 
+  KNOWN_PRIVACY_SETTINGS = {:photos => 'kTCCServicePhotos', :calendar => 'kTCCServiceCalendar', :address_book => 'kTCCServiceAddressBook'}
+
   attr_accessor :run_loop
   attr_accessor :device
   attr_accessor :launch_args
@@ -80,13 +82,84 @@ class Calabash::Cucumber::Launcher
     path ||= Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
 
     app = File.basename(path)
-    bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name "#{app}" | head -n 1`
-    return if bundle.empty? # Assuming we're already clean
+    directories_for_sdk_prefix(sdk).each do |dir|
+      bundle = `find "#{dir}/Applications" -type d -depth 2 -name "#{app}" | head -n 1`
+      next if bundle.empty? # Assuming we're already clean
+      if ENV['DEBUG']=='1'
+        puts "Reset app state for #{bundle}"
+      end
+      sandbox = File.dirname(bundle)
+      ['Library', 'Documents', 'tmp'].each do |dir|
+        FileUtils.rm_rf(File.join(sandbox, dir))
+      end
+    end
+
+
+  end
+
+  def directories_for_sdk_prefix(sdk)
+    Dir["#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}*"]
+  end
+
+  # Call as update_privacy_settings('com.my.app', {:photo => {:allow => true}})
+  def update_privacy_settings(bundle_id, opts={})
+    if ENV['DEBUG']=='1'
+      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] || SimLauncher::SdkDetector.new().latest_sdk_version
+
+      dirs = directories_for_sdk_prefix(sdk)
+      if ENV['DEBUG']=='1'
+        puts "About to update privacy setting #{setting_name} for #{bundle_id}, allow: #{allow} in sdk #{sdk}, #{dirs}"
+      end
+
+      dirs.each do |dir|
+        if ENV['DEBUG']=='1'
+          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 ENV['DEBUG']=='1'
+          puts "Executing sql #{sql} on #{path_to_tcc_db}"
+        end
 
-    sandbox = File.dirname(bundle)
-    ['Library', 'Documents', 'tmp'].each do |dir|
-      FileUtils.rm_rf(File.join(sandbox, dir))
+        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
+
+  def tcc_database_for_sdk_dir(dir)
+    File.join(dir,'Library', 'TCC', 'TCC.db')
+  end
+
+  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
 
   def default_launch_args
@@ -127,7 +200,6 @@ class Calabash::Cucumber::Launcher
       args[:device_target] = 'simulator'
     end
 
-
     args
   end
 
@@ -196,6 +268,16 @@ class Calabash::Cucumber::Launcher
 
     reset_app_jail if args[:reset]
 
+
+    if args[:privacy_settings]
+      if args[:device_target]=='simulator'
+        update_privacy_settings(args[:bundle_id], args[:privacy_settings])
+      else
+        #Not supported on device
+        puts 'Warning: :privacy_settings not supported on device'
+      end
+    end
+
     if run_with_instruments?(args)
       self.run_loop = new_run_loop(args)
     else

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre4'
+    VERSION = '0.9.163.pre5'
     FRAMEWORK_VERSION = '0.9.163.pre3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre4
+  version: 0.9.163.pre5
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre1
+        version: 0.1.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre1
+        version: 0.1.0.pre3
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -358,10 +358,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS
 test_files:
 - features/step_definitions/calabash_steps.rb
-has_rdoc: