testautoi 0.9.134 → 0.9.135

data/bin/testautoi

@@ -12,7 +12,7 @@ require File.join(File.dirname(__FILE__),"calabash-ios-sim")
 
 def print_usage
   puts <<EOF
-  Usage: testautoi <command-name> [parameters] [options]
+  Usage: testautoi <command-name>
   <command-name> can be one of
     setup
       Set up test automation configurations
@@ -21,10 +21,12 @@ def print_usage
     build <Source Dir>
       Build the instrumented app. 
       Use getsource command first to download source to <Source Dir> 
+      Use 'sim build <Source Dir>' for Simulator
     install
       Install the app
     install tools
       Download and install tools from Subversion.
+      Tools for real iOS devices, not for Simulator.
     uninstall
       Uninstall the app
     launch
@@ -37,6 +39,17 @@ def print_usage
       Start an iOS Simulator
     sim quit
       Quit the iOS Simulator
+    sim version [option]
+      One of version options: 5.0, 5.1, 6.0, and 6.1
+    sim device [option]
+      One of device options: iPad, iPad_Retina, iPhone, iPhone_Retina, iPhone_Retina_4inch 
+    sim pref [key] [value]
+      Keys:
+        KeyboardAutocorrection
+        KeyboardAutocapitalization
+      Values:
+        true
+        false
     devices
       List connected iOS Devices
     getsource list
@@ -49,8 +62,10 @@ def print_usage
       List available builds in the build drop
     getbuild <Version>
       Download the build with <Version>.
+      Use 'sim getbuild <Version>' for Simulator
     getbuild trunk
       Download the trunk build
+      Use 'sim getbuild trunk' for Simulator
     getscript list
       List available scripts
     getscript <Script>
@@ -61,10 +76,7 @@ def print_usage
       Stop recording
     version
       prints the gem version
-
-  <options> can be
-    -v, --verbose
-      Turns on verbose logging
+      
 EOF
 end
 
@@ -100,7 +112,13 @@ def run(option)
     env = {}
     env["APP_BUNDLE_PATH"] =  File.join(FileUtils.pwd, app_bundle)
     if device_udid == ''
-        # Use Simulator
+        # Use a Simulator
+        if option == 'console'
+            Calabash::Cucumber::SimulatorHelper.relaunch(env["APP_BUNDLE_PATH"], @settings["sim_version"], @settings["sim_device"])
+        else
+            ENV["SDK_VERSION"] = @settings["sim_version"]
+            ENV["DEVICE"] = @settings["sim_device"]
+        end
     else
         env["NO_LAUNCH"] = "1"
         get_device_ip
@@ -137,6 +155,9 @@ def setup
     ask_for_setting("app_bundle", "Please enter the name of app bundle", @settings["app_bundle"])
     ask_for_setting("device_udid", "Please enter the unique device ID of the device", @settings["device_udid"])
 
+    ask_for_setting("sim_version", "Please enter the version of the Simulator [5.0, 5.1, 6.0, 6.1]", @settings["sim_version"])
+    ask_for_setting("sim_device", "Please enter the device of the Simulator [iphone, ipad]", @settings["sim_device"])
+
     @settings["build_drop_branch_dir"] = "Mobile/iPhone/branch"
     @settings["build_drop_trunk_dir"] = "Mobile/iPhone/trunk"
     
@@ -255,7 +276,7 @@ def unzip_file (file, destination)
     filenames
 end
 
-def get_build
+def get_build(version, sim)
     raise "Please configure build drop location, username, and password first by running setup" if @settings["build_drop_location"].to_s.empty? or @settings["build_drop_username"].to_s.empty? or @settings["build_drop_password"].to_s.empty?
 
     mount_node = smb_connect(@settings["build_drop_location"], 
@@ -272,8 +293,7 @@ def get_build
         end
     else
         app_bundle = @settings["app_bundle"]
-        version = ARGV.shift
-        sim = (ARGV.shift == 'sim')?"Emulator":"Device"
+        sim = (sim == 'sim')?"Emulator":"Device"
         if version == 'trunk'
             # copy the trunk build
             release_path = File.join(mount_node, @settings["build_drop_trunk_dir"], "ConcurMobile", sim)
@@ -454,6 +474,45 @@ def reset_sim
     calabash_sim_reset
 end
 
+def sim_set_version(args)
+  quit_sim
+  options = ["5.0","5.1", "6.0", "6.1"]
+  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)
+
+  version = args.first
+  
+  if version
+    hash['currentSDKRoot'] = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator#{version}.sdk"
+    plist.value = CFPropertyList.guess(hash)
+    plist.save(path, CFPropertyList::List::FORMAT_BINARY)
+  end
+end
+
+def sim_set_device(device)
+    calabash_sim_device([device])
+end
+
+def sim_set_pref(key, value)
+    value_map = { "true" => true, "false" => false, "on" => true, "off" => false }
+    value = value_map[value]
+    pref_files = Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "*.*", "Library", "Preferences", "com.apple.Preferences.plist"))
+    pref_files.each do |pref_file|
+        plist = CFPropertyList::List.new(:file => pref_file)
+        hash = CFPropertyList.native_types(plist.value)
+        hash['KeyboardAutocorrection'] = value
+        plist.value = CFPropertyList.guess(hash)
+        plist.save(pref_file, CFPropertyList::List::FORMAT_BINARY)
+    end
+end
+
 class Device
     def self.call_device_detect(udid = nil)
         udid_arg = (udid == nil) ? "" : "-i #{udid}"
@@ -566,7 +625,9 @@ elsif cmd == 'getbuild'
     read_settings
     File.open("#{Dir.tmpdir}/testauto.lock", 'w') { |f|
         f.flock(File::LOCK_EX)
-        get_build
+        version = ARGV.shift
+        sim = ARGV.shift
+        get_build(version, sim)
     }
     exit 0
 
@@ -615,9 +676,20 @@ elsif cmd == 'sim'
         start_sim
     elsif option == 'quit'
         quit_sim
+    elsif option == 'device'
+        sim_set_device(ARGV.shift)
+    elsif option == 'version'
+        sim_set_version([ARGV.shift])
+    elsif option == 'pref'
+        key = ARGV.shift
+        value = ARGV.shift
+        sim_set_pref(key, value)
     elsif option == 'build'
         branch_dir = ARGV.shift
         build_app(branch_dir, 'sim')
+    elsif option == 'getbuild'
+        version = ARGV.shift
+        get_build(version, 'sim')
     end
     exit 0
 

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.134"
+    VERSION = "0.9.135"
     FRAMEWORK_VERSION = "0.9.126"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testautoi
 version: !ruby/object:Gem::Version
-  version: 0.9.134
+  version: 0.9.135
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -144,7 +144,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
@@ -152,7 +152,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency