calabash-cucumber 0.18.2 → 0.19.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fcd5b3694c5b5a674846f6afdc47d9b69bee38f
-  data.tar.gz: 8355da41535f75c286004c00917c5b70a6997b31
+  metadata.gz: eee61874d45cf5a644357bbb94f66e192c7fbf21
+  data.tar.gz: f87c5f01be803264e51e31aa5d90ae24c10d6e90
 SHA512:
-  metadata.gz: 263e85bb0b112f15639b3242d2855c4f0002001048bf1b16b5b2c813ece268bcb837080935926250729c9dad7d79c50130098ec4e18ad3ac50935368db87df34
-  data.tar.gz: f1ec4ed7d7e002a190959c88f85c2f1b4e5c3256101be838cbe2538b60559259f0053ef47c3f1d92f9362f4451660feb09f07de9827a038cd9d3f8ce8b2cb206
+  metadata.gz: fc75e8e97b33cad2d2169a58c62790e73b6a016d55fb41032fc216ed7b1d02443f09564f4a3b8bb2a3ce651d716dea7fbda845b5680d9f5ada6af2b4a49f34d2
+  data.tar.gz: 7febfab9502b7054478efa2bb54817d7dcf58e7a84fe0e6e7afa818a6565a83e70ef81190266465807f2b9f0b760fade9e23d5d1ccac753b06e8650c4f4578d4

data/bin/calabash-ios

@@ -31,15 +31,6 @@ elsif cmd == 'gen'
 elsif cmd == 'console'
   console
   exit 0
-elsif cmd == 'build'
-  build
-  exit 0
-elsif cmd == 'update'
-  update(ARGV)
-  exit 0
-elsif cmd == 'run'
-  run
-  exit 0
 elsif cmd == 'download'
   calabash_download(ARGV)
   exit 0
@@ -49,9 +40,6 @@ elsif cmd == 'setup'
 elsif cmd == 'check'
   validate_setup(ARGV)
   exit 0
-elsif cmd == 'submit'
-  calabash_submit(ARGV)
-  exit 0
 elsif cmd == 'version'
   require 'calabash-cucumber'
   puts Calabash::Cucumber::VERSION
@@ -71,13 +59,9 @@ elsif cmd == 'sim'
       calabash_sim_location(ARGV)
   elsif subcmd == 'locale'
     calabash_sim_locale(ARGV)
-  elsif subcmd == 'device'
-    calabash_sim_device(ARGV)
   else
     print_usage
   end
 else
   print_usage
 end
-
-

data/bin/calabash-ios-build.rb

@@ -1,48 +1,3 @@
-def ensure_build_dir(options={:build_dir => "Calabash"})
-  if !File.exist?(options[:build_dir])
-    FileUtils.mkdir_p options[:build_dir]
-  end
-end
-
-def build(options={:build_dir=>"Calabash",
-                   :configuration => "Debug",
-                   :sdk => "iphonesimulator",
-                   :dstroot => "Calabash/build",
-                   :wrapper_name => "Calabash.app"})
-  #Follow Pete's .xcconfig-based approach with zero-config
-
-  ensure_build_dir(options)
-
-  if !File.exists?("#{options[:build_dir]}/cal.xcconfig")
-      FileUtils.cp(File.join(File.dirname(__FILE__),"cal.xcconfig"),"#{options[:build_dir]}/cal.xcconfig")
-  end
-
-  cmd=["xcodebuild"]
-  cmd << %Q[-xcconfig "#{options[:build_dir]}/cal.xcconfig"]
-  cmd << "install"
-
-  (options[:target] || []).each do |tgt|
-    options << %Q[-target "#{tgt}"]
-  end
-
-  cmd << "-configuration"
-  cmd << %Q["#{options[:configuration]}"]
-
-  cmd << "-sdk"
-  cmd << %Q["#{options[:sdk]}"]
-
-  cmd << %Q[DSTROOT="#{options[:dstroot]}"]
-
-  cmd << %Q[WRAPPER_NAME="#{options[:wrapper_name]}"]
-
-  res =nil
-  msg("Calabash Build") do
-    cmd_s = cmd.join(" ")
-    puts cmd_s
-    res=system(cmd_s)
-  end
-  res
-end
 
 def console
   path = ENV['CALABASH_IRBRC']
@@ -58,44 +13,3 @@ def console
   puts "Running irb..."
   exec("irb")
 end
-
-
-def run(options={:build_dir=>"Calabash",
-                   :configuration => "Debug",
-                   :sdk => "iphonesimulator",
-                   :dstroot => "Calabash/build",
-                   :wrapper_name => "Calabash.app"})
-  if ENV['NO_DOWNLOAD'] != "1"
-    if !File.directory?("calabash.framework")
-      calabash_download(ARGV)
-    end
-  end
-
-  if ENV['NO_BUILD'] != "1"
-    if !build(options)
-      msg("Error") do
-        puts "Build failed. Please consult logs. Aborting."
-        exit(false)
-      end
-    end
-  end
-
-  if ENV["NO_GEN"] != "1"
-    if !File.directory?("features")
-      calabash_scaffold
-    else
-      msg("Info") do
-        puts "Detected features folder, will not generate..."
-      end
-    end
-  end
-
-  default_path = "#{options[:dstroot]}/#{options[:wrapper_name]}"
-  cmd = %Q[APP_BUNDLE_PATH="#{ENV['APP_BUNDLE_PATH'] || default_path}" cucumber]
-  msg("Info") do
-    puts "Running command:"
-    puts cmd
-  end
-  system(cmd)
-  puts "Done..."
-end

data/bin/calabash-ios-helpers.rb

@@ -22,8 +22,6 @@ def print_usage
       starts an interactive console to interact with your app via Calabash
     setup [<path>]
       setup your XCode project for calabash-ios (EXPERIMENTAL)
-    update [target]
-      updates one of the following targets: hooks
     download
       install latest compatible version of calabash.framework
     check [{<path to .ipa>|<path to .app>}]
@@ -36,8 +34,6 @@ def print_usage
       reset content and settings in all iOS Simulators
     sim acc
       enable accessibility in all iOS Simulators
-    sim device {iPad|iPad_Retina|iPhone|iPhone_Retina|iPhone_Retina_4inch}
-      change the default iOS Simulator device.
 EOF
 end
 
@@ -72,64 +68,3 @@ def ensure_correct_path(args)
   end
   return dir_to_search,project_files
 end
-
-
-def is_json?(str)
- str[0..0] == '{'
-end
-
-# @!visibility private
-# @deprecated Replaced with test-cloud gem
-def calabash_submit(args)
-  if args.size < 2
-   msg("Error") do
-     puts "You must supply at path to ipa and secret."
-   end
-   exit 1
-  end
-
-  ipa_file = args[0]
-  if not File.exists?(ipa_file)
-    msg("Error") do
-      puts "Unable to find .ipa at '#{ipa_file}'"
-    end
-    exit 1
-  end
-
-  secret = args[1]
-
-  archive_path = "#{Tempfile.new("archive").path}.zip"
-
-  feature_path = "features"
-  if args.length == 3
-    msg("Error") do
-      puts "Not implemented: You can't supply a path to features folder yet."
-      puts "You should cd into your project folder containing your features folder"
-      puts "and then run this command again"
-    end
-    exit 1
-  end
-  system ("zip -r -o #{archive_path} #{feature_path}")
-
-
-
-  url = ENV['SUBMIT_URL'] || "https://www.lesspainful.com/cmd_upload"
-
-  msg("Info") do
-    puts "Uploading ipa and features to #{url}"
-  end
-  result = `curl -F "secret=#{secret}" -F "app=@#{ipa_file}" -F "env=@#{archive_path}" #{url}`
-
-  if is_json? result
-   json_result = JSON.parse(result)
-   puts "Test status is '#{json_result['status']}"
-   puts "Test id is '#{json_result['id']}"
-   puts "You can see the test result here: #{json_result['url']}"
-   puts "You can pull the status by using this command:"
-   puts "curl -F \"secret=#{secret}\" -F \"id=#{json_result['id']}\" https://www.lesspainful.com/cmd_status"
-  else
-   puts result
-  end
-
-end
-

data/bin/calabash-ios-setup.rb

@@ -79,16 +79,6 @@ def calabash_download(args)
   download_calabash(File.expand_path("."))
 end
 
-# @todo eval for deprecation - has no callers.
-def has_proxy?
-  ENV['http_proxy'] ? true : false
-end
-
-def proxy
-  url_parts = URI.split(ENV['http_proxy'])
-  [url_parts[2], url_parts[3]]
-end
-
 def download_calabash(project_path)
   file = 'calabash.framework'
   ##Download calabash.framework
@@ -155,7 +145,6 @@ def setup_project(project_name, project_path, path)
 
 end
 
-require 'calabash-cucumber/launch/simulator_launcher'
 def validate_setup(args)
   if args.length > 0
     if args[0].end_with?(".ipa")
@@ -169,63 +158,12 @@ def validate_setup(args)
       exit 1
     end
   else
-    dd_dir = Calabash::Cucumber::SimulatorLauncher.new().derived_data_dir_for_project
-      if not dd_dir
-        puts "Unable to find iOS XCode project."
-        puts "You should run this command from an XCode project directory."
-        exit 1
-      end
-      app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
-      sim_dirs = Dir.glob(File.join(dd_dir, "Build", "Products", "Debug-iphonesimulator", "*.app"))
-      sim_dirs = sim_dirs.concat(Dir.glob(File.join(dd_dir, "Build", "Products", "Calabash-iphonesimulator", "*.app")))
-      if sim_dirs.empty?
-        msg = ["Have you built your app for simulator?"]
-        msg << "You should build the -cal target and your normal target"
-        msg << "(with configuration Debug)."
-        msg << "Searched dir: #{dd_dir}/Build/Products"
-        msg("Error") do
-          puts msg.join("\n")
-        end
-        exit 1
-      elsif sim_dirs.count != 2
-        msg = ["Have you built your app for simulator?"]
-        msg << "You should build the -cal target and your normal target"
-        msg << "(with configuration Debug)."
-        msg << "Searched dir: #{dd_dir}/Build/Products"
-        msg("Error") do
-          puts msg.join("\n")
-        end
-        exit 1
-      end
-      out_debug = `otool "#{sim_dirs[0]}"/* -o 2> /dev/null | grep CalabashServer`
-      out_cal = `otool "#{sim_dirs[1]}"/* -o 2> /dev/null | grep CalabashServer 2> /dev/null`
-      ok = (not /CalabashServer/.match(out_debug)) and /CalabashServer/.match(out_cal)
-      if ok
-        msg("OK") do
-          puts "Your configuration seems ok."
-          puts "app in directory:"
-          puts sim_dirs[0]
-          puts "does not have calabash.framework linked in."
-          puts "directory:"
-          puts sim_dirs[1]
-          puts "does."
-        end
-      else
-        msg("Fail") do
-          puts "Your configuration looks bad."
-          if (not /CalabashServer/.match(out_debug))
-            puts "WARNING: You Debug build seems to be linking with Calabash."
-            puts "You should restore your xcodeproject file from backup."
-          else
-            puts "app in directory"
-            puts sim_dirs[1]
-            puts "does not have calabash.framework linked in."
-          end
-        end
-      end
+    $stderr.puts(
+      %Q["Please pass a .app or .ipa as an argument.  Ad hoc validation of projects
+is not yet supported])
+    $stderr.flush
+    exit 1
   end
-
-
 end
 
 def validate_ipa(ipa)
@@ -263,55 +201,3 @@ def validate_app(app)
     exit(1)
   end
 end
-
-def update(args)
-  if args.length > 0
-    target = args[0]
-    unless UPDATE_TARGETS.include?(target)
-      msg('Error') do
-        puts "Invalid target #{target}. Must be one of: #{UPDATE_TARGETS.join(' ')}"
-      end
-      exit 1
-    end
-
-
-
-    target_file = 'features/support/launch.rb'
-    msg('Question') do
-      puts "I'm about to update the #{target_file} file."
-      puts "Please hit return to confirm that's what you want."
-    end
-    exit 2 unless STDIN.gets.chomp == ''
-
-
-    unless File.exist?(target_file)
-      msg('Error') do
-        puts "Unable to find file #{target_file}"
-        puts "Please change directory so that #{target_file} exists."
-      end
-      exit 1
-    end
-    new_launch_script = File.join(@script_dir, 'launch.rb')
-
-    FileUtils.cp(new_launch_script, 'features/support/01_launch.rb', :verbose => true)
-    FileUtils.rm(target_file, :force => true, :verbose => true)
-
-    hooks_file = 'features/support/hooks.rb'
-    if File.exist?(hooks_file)
-      FileUtils.mv(hooks_file, 'features/support/02_pre_stop_hooks.rb', :verbose => true)
-    end
-
-    msg('Info') do
-      puts "File copied.\n"
-      puts 'Launch on device using environment variable DEVICE_TARGET=device.'
-      puts 'Launch on simulator by default or using environment variable DEVICE_TARGET=simulator.'
-    end
-  else
-    msg('Error') do
-      puts "update must take one of the following targets: #{UPDATE_TARGETS.join(' ')}"
-    end
-    exit 1
-
-  end
-
-end

data/bin/calabash-ios-sim.rb

@@ -1,11 +1,6 @@
-require 'calabash-cucumber/utils/simulator_accessibility'
-require 'calabash-cucumber/utils/logging'
 require "calabash-cucumber/environment"
 require 'run_loop'
 
-include Calabash::Cucumber::Logging
-include Calabash::Cucumber::SimulatorAccessibility
-
 def quit_sim
   RunLoop::SimControl.new.quit_sim
 end
@@ -157,35 +152,3 @@ SUCCESS!
 }
   true
 end
-
-
-def calabash_sim_device(args)
-  quit_simulator
-  options = ["iPad", "iPad_Retina", "iPhone", "iPhone_Retina", "iPhone_Retina_4inch"]
-  if args.length != 1 or not options.find { |x| x == args[0] }
-    print_usage
-    puts "Unrecognized args: #{args}"
-    puts "should be one of #{options.inspect}"
-    exit(0)
-  end
-  path =File.join(File.expand_path("~/Library"), "Preferences", "com.apple.iphonesimulator.plist")
-  plist = CFPropertyList::List.new(:file => path)
-  hash = CFPropertyList.native_types(plist.value)
-
-  device = case args[0]
-             when "iPad_Retina"
-               "iPad (Retina)"
-             when "iPhone_Retina"
-               "iPhone (Retina 3.5-inch)"
-             when "iPhone_Retina_4inch"
-               "iPhone (Retina 4-inch)"
-             else
-               args[0]
-           end
-  if device
-    hash['SimulateDevice'] = device
-    plist.value = CFPropertyList.guess(hash)
-    plist.save(path, CFPropertyList::List::FORMAT_BINARY)
-  end
-
-end

data/bin/frank-calabash

@@ -67,7 +67,6 @@ def console
   require 'frank-calabash'
   require 'calabash-cucumber/operations'
   require 'pry'
-  ENV['CALABASH_VERSION_PATH']='calabash_version'
   console = Frank::Console.new
   console.extend ::Frank::Calabash
 

data/doc/calabash-ios-help.txt

@@ -8,11 +8,8 @@ Usage: calabash-ios <command-name> [parameters]
     sim locale [lang] [regional]?
     sim reset
     sim acc
-    sim device {iPad,iPad_Retina,iPhone,iPhone_Retina,iPhone_Retina_4inch}
     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
@@ -44,9 +41,6 @@ Usage: calabash-ios <command-name> [parameters]
         If something goes wrong. Close Xcode and copy project.pbxproj.bak
         to project.pbxproj inside your .xcodeproj folder.
 
-  update [target]
-        updates one of the following targets: hooks
-
   download [opt_path]?
         copies current compatible version of calabash.framework to your project.
         It should be run from a directory containing an Xcode project,
@@ -81,5 +75,3 @@ Usage: calabash-ios <command-name> [parameters]
   sim reset (EXPERIMENTAL) Will select "Reset Content and Settings"
       in the iOS Simulators using AppleScript.
 
-  sim device [device] Will set the default iOS Simulator device.
-      [device] can be one of iPad iPad_Retina iPhone iPhone_Retina iPhone_Retina_4inch