calabash-cucumber 0.21.5 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b7dfee76ce28e4b2e416e448dac9e7e23982c776
-  data.tar.gz: 068aa05c346dd2246aa432ea2f14e401fcb98f04
+SHA256:
+  metadata.gz: 326fe7b27808cd9ed0657c2d74e62ae6bae1c7162b60054e0fbff7d93d85d82a
+  data.tar.gz: 67fbb90ab864fbe889ef6f85a73255b1947bdadfbc27f91f25b4be7f9cd4a6c9
 SHA512:
-  metadata.gz: eb268b9620002b1d5400254492682a19bc1e60eb973387faabe9b4097c5e35e2d0ea54834c275c27c99e3848bdaa288341218702e88c829730be247fe733dfaa
-  data.tar.gz: faeec233cb862347585781cec66c866c0f6da97777435114d7ccd961babd92a1613b76467cfee1ef4300f9bf9bfb2b0ca872c6f09a276754bd53864886a38e54
+  metadata.gz: e0338e63050ddf15044c37b6c6fd8578874bf1999f846efabb8e096a3969ee06990915ab9a402766eff9408cd53fc0b829ea4b5e03d3fe1679d448849a3f5775
+  data.tar.gz: 6f1e61719df5febee9979947b556f2eaf4f6a6888e2bbd4f78b0e494e3a04fbf7462ba04a1df0f8e0d119c5444f8c4c35b232ecb474b44741cf9767898bfc4bc

data/bin/calabash-ios

@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'fileutils'
-require 'cfpropertylist'
 require 'rexml/document'
 
-
 require File.join(File.dirname(__FILE__),"calabash-ios-helpers")
 require File.join(File.dirname(__FILE__),"calabash-ios-generate")
 require File.join(File.dirname(__FILE__),"calabash-ios-setup")
@@ -52,8 +50,6 @@ elsif cmd == 'sim'
 
   if subcmd == 'reset'
     calabash_sim_reset
-  elsif subcmd == 'acc'
-    calabash_sim_accessibility
   elsif subcmd == 'locale'
     calabash_sim_locale(ARGV)
   else

data/bin/calabash-ios-helpers.rb

@@ -23,8 +23,6 @@ def print_usage
       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>]

data/bin/calabash-ios-setup.rb

@@ -2,28 +2,6 @@ require "calabash-cucumber/version"
 require 'rexml/rexml'
 require "rexml/document"
 
-
-def detect_accessibility_support
-  dirs = Dir.glob(File.join(File.expand_path("~/Library"),"Application Support","iPhone Simulator","*.*","Library","Preferences"))
-  dirs.each do |sim_pref_dir|
-    fp = File.expand_path("#{sim_pref_dir}/com.apple.Accessibility.plist")
-    out = `defaults read "#{fp}" AXInspectorEnabled`
-    ax_inspector = out.split("\n")[0]=="0"
-    out = `defaults read "#{fp}" ApplicationAccessibilityEnabled`
-    app_acc = out.split("\n")[0]=="0"
-    if not(File.exists?(fp)) || ax_inspector == "0" || app_acc == "0"
-        msg("Warn") do
-          puts "Accessibility is not enabled for simulator: #{sim_pref_dir}"
-          puts "Enabled accessibility as described here:"
-          puts "https://github.com/calabash/calabash-ios/wiki/01-Getting-started-guide"
-          puts "Alternatively run command:"
-          puts "calabash-ios sim acc"
-        end
-    end
-
-  end
-end
-
 def calabash_setup(args)
   puts "Checking if Xcode is running..."
   res = `ps x -o pid,command | grep -v grep | grep Contents/MacOS/Xcode`
@@ -34,9 +12,6 @@ def calabash_setup(args)
   project_name, project_path, xpath = find_project_files(args)
   setup_project(project_name, project_path, xpath)
 
-  calabash_sim_accessibility
-  detect_accessibility_support
-
   msg("Setup done") do
 
     puts "Please validate by running the -cal target"

data/bin/calabash-ios-sim.rb

@@ -1,15 +1,17 @@
 require "run_loop"
 
 def quit_sim
-  RunLoop::SimControl.new.quit_sim
+  RunLoop::CoreSimulator.quit_simulator
 end
 
 def calabash_sim_reset
-  RunLoop::SimControl.new.reset_sim_content_and_settings
-end
+  xcode = RunLoop::Xcode.new
+  instruments = RunLoop::Instruments.new
+  simctl = RunLoop::Simctl.new
+
+  device = RunLoop::Device.detect_device({}, xcode, simctl, instruments)
 
-def calabash_sim_accessibility
-  RunLoop::SimControl.new.enable_accessibility_on_sims
+  RunLoop::CoreSimulator.erase(device)
 end
 
 def calabash_sim_locale(args)

data/lib/calabash-cucumber/dylibs.rb

@@ -6,7 +6,7 @@ module Calabash
 
       # @!visibility private
       def self.sim_dylib_basename
-        "libCalabashDynSim.dylib"
+        "libCalabashSim.dylib"
       end
 
       # @!visibility private
@@ -16,7 +16,7 @@ module Calabash
 
       # @!visibility private
       def self.device_dylib_basename
-        "libCalabashDyn.dylib"
+        "libCalabashARM.dylib"
       end
 
       # @!visibility private

data/lib/calabash-cucumber/version.rb

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

data/scripts/.irbrc

@@ -47,9 +47,9 @@ IRB.conf[:HISTORY_FILE] = ".irb-history"
 
 begin
   require "pry"
-  Pry.config.history.should_save = true
-  Pry.config.history.should_load = true
-  Pry.config.history.file = ".pry-history"
+  Pry.config.history_save = true
+  Pry.config.history_load = true
+  Pry.config.history_file = ".pry-history"
   require "pry-nav"
 rescue LoadError => _
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.21.5
+  version: 0.22.2
 platform: ruby
 authors:
 - Karl Krukow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: edn
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -132,20 +118,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.6
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -390,7 +376,6 @@ email:
 - karl@lesspainful.com
 executables:
 - calabash-ios
-- frank-calabash
 extensions: []
 extra_rdoc_files: []
 files:
@@ -403,10 +388,9 @@ files:
 - bin/calabash-ios-helpers.rb
 - bin/calabash-ios-setup.rb
 - bin/calabash-ios-sim.rb
-- bin/frank-calabash
 - doc/calabash-ios-help.txt
-- dylibs/libCalabashDyn.dylib
-- dylibs/libCalabashDynSim.dylib
+- dylibs/libCalabashARM.dylib
+- dylibs/libCalabashSim.dylib
 - features-skeleton/sample.feature
 - features-skeleton/steps/sample_steps.rb
 - features-skeleton/support/01_launch.rb
@@ -455,19 +439,16 @@ files:
 - lib/calabash-cucumber/version.rb
 - 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
 - scripts/data/com.apple.Accessibility.plist
 - staticlib/calabash.framework.zip
-- staticlib/libFrankCalabash.a
 homepage: http://calaba.sh
 licenses:
 - EPL-1.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -482,9 +463,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS
 test_files: []

data/bin/frank-calabash

@@ -1,93 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-
-def print_usage
-  puts <<EOF
-  Usage: frank-calabash <command>
-  where <command> can be one of
-    install
-      installs Frank-Calabash by coping libFrankCalabash.a into
-      Frank/plugins/calabash
-    uninstall
-      uninstalls Frank.Calabash by removing Frank/plugins/calabash
-    console
-      starts the Frank console prepared for Calabash: use c = calabash_client to obtain a Calabash client. Use launch to launch using instruments.
-EOF
-end
-
-FRANK_DIR = 'Frank'
-PLUGIN_DIR = File.join(FRANK_DIR, 'plugins')
-CAL_PLUGIN_DIR = File.join(PLUGIN_DIR, 'calabash')
-XCCONFIG = File.join(File.dirname(__FILE__), '..', 'scripts', 'calabash.xcconfig.erb')
-LIB_FRANK_CAL = File.join(File.dirname(__FILE__), '..', 'staticlib', 'libFrankCalabash.a')
-
-def check_frank_exists
-  unless File.directory?(FRANK_DIR)
-    puts "Unable to find #{FRANK_DIR} directory (in #{Dir.pwd})"
-    puts "Please make sure you've run frank setup."
-    exit(false)
-  end
-end
-
-def install_frank_plugin
-  check_frank_exists
-  unless File.directory?(PLUGIN_DIR)
-    puts "Unable to find #{PLUGIN_DIR} directory (in #{Dir.pwd})"
-    puts "Please make sure you've running the latest version of Frank."
-    puts 'Try rerunning frank setup.'
-    exit(false)
-  end
-  if File.exist?(CAL_PLUGIN_DIR)
-    puts 'Clearing Calabash plugin...'
-    FileUtils.rm_f(CAL_PLUGIN_DIR)
-  end
-  puts "Creating directory #{CAL_PLUGIN_DIR}"
-  FileUtils.mkdir_p CAL_PLUGIN_DIR
-  FileUtils.cp([LIB_FRANK_CAL, XCCONFIG], CAL_PLUGIN_DIR)
-  puts "Copied files #{Dir[File.join(CAL_PLUGIN_DIR,'*')].join(', ')}"
-  puts "\nInstalled Frank-Calabash plugin."
-  puts 'Please rebuild using frank build.'
-
-end
-
-def uninstall_frank_plugin
-  check_frank_exists
-  if File.directory?(CAL_PLUGIN_DIR)
-    puts 'Found Calabash plugin...'
-    puts "Deleting #{CAL_PLUGIN_DIR}"
-    FileUtils.rm_f CAL_PLUGIN_DIR
-    puts 'Uninstalled Calabash plugin. Please rebuild.'
-  end
-end
-
-def console
-  require 'frank-cucumber/console'
-  require 'frank-calabash'
-  require 'calabash-cucumber/operations'
-  require 'pry'
-  console = Frank::Console.new
-  console.extend ::Frank::Calabash
-
-  def console.embed(*args)
-  end
-  console.pry
-end
-
-unless ARGV.length == 1
-  print_usage
-  exit(false)
-end
-
-cmd = ARGV.shift
-case cmd
-  when 'install'
-    install_frank_plugin
-  when 'uninstall'
-    uninstall_frank_plugin
-  when 'console'
-    console
-  else
-    puts "Unsupported command #{cmd}"
-    exit(false)
-end

data/lib/frank-calabash.rb

@@ -1,59 +0,0 @@
-# stubs for documentation
-require 'calabash-cucumber/core'
-require 'calabash-cucumber/operations'
-require 'calabash-cucumber/launcher'
-
-# @!visibility private
-module Calabash
-  module Cucumber
-    module Map
-      # @!visibility private
-      def raw_map(query, method_name, *method_args)
-        operation_map = {
-          :method_name => method_name,
-          :arguments => method_args
-        }
-        res = http({:method => :post, :path => 'cal_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']}"
-        end
-
-        res
-      end
-
-    end
-  end
-end
-
-# @!visibility private
-module Frank
-  # @!visibility private
-  module Calabash
-    # @!visibility private
-    def launch(options={})
-      launcher = ::Calabash::Cucumber::Launcher.launcher
-      #noinspection RubyResolve
-      options[:app] ||= File.expand_path('Frank/frankified_build/Frankified.app')
-      ::Frank::Cucumber::FrankHelper.selector_engine = 'calabash_uispec'
-
-      launcher.relaunch(options)
-    end
-
-    # @!visibility private
-    def calabash_client
-      Client.new
-    end
-
-    # @!visibility private
-    module Operations
-      include ::Calabash::Cucumber::Operations
-    end
-
-    # @!visibility private
-    class Client
-      include Operations
-    end
-  end
-end

data/scripts/calabash.xcconfig.erb

@@ -1 +0,0 @@
-CALABASH_LDFLAGS=-lFrankCalabash