testautoi 0.9.144 → 0.9.145

data/bin/calabash-ios-setup.rb

@@ -25,6 +25,8 @@ end
 def calabash_setup(args)
   puts "Checking if Xcode is running..."
   res = `ps x -o pid,command | grep -v grep | grep Contents/MacOS/Xcode`
+  puts "Skip checking"
+  res = ""
   if res==""
     puts "Xcode not running."
     project_name, project_path, xpath = find_project_files(args)

data/bin/testautoi

@@ -114,6 +114,8 @@ def run(option)
     env = {}
     env['CALABASH_NO_DEPRECATION'] = '1'
     env["APP_BUNDLE_PATH"] =  File.join(FileUtils.pwd, app_bundle)
+    env["APP_NAME"] = app_bundle_name(env["APP_BUNDLE_PATH"])    
+    env["APP_VERSION"] = app_bundle_version(env["APP_BUNDLE_PATH"])
     if device_udid == ''
         # Use a Simulator
         #Calabash::Cucumber::SimulatorHelper.relaunch(env["APP_BUNDLE_PATH"], @settings["sim_version"], @settings["sim_device"])
@@ -153,6 +155,9 @@ def run(option)
     if device_ipaddr != ''
         env["DEVICE_ENDPOINT"] = "http://#{device_ipaddr}:37265"
     end
+    if File.exists?(File.join(FileUtils.pwd, "build_drop_dir.txt"))
+        env["BUILD_DROP_DIR"] = IO.read(File.join(FileUtils.pwd, "build_drop_dir.txt"))
+    end
     result = system(env, cmd)
     sleep(1)
     result
@@ -312,27 +317,52 @@ def get_build(version, sim)
             end
         end
     else
+        home_path = ENV['HOME'] || ENV['HOMEPATH']
         app_bundle = @settings["app_bundle"]
         sim = (sim == 'sim')?"Emulator":"Device"
         if version == 'trunk'
             # copy the trunk build
             release_path = File.join(mount_node, @settings["build_drop_trunk_dir"], "Instrumented", "ConcurMobile-cal", sim)
+            cache_path = File.join(home_path, @settings["build_drop_trunk_dir"], "Instrumented", "ConcurMobile-cal", sim)
         else
             # copy the version build
             release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iPhone#{version}", "Instrumented", "ConcurMobile-cal", sim)
+            cache_path = File.join(home_path, @settings["build_drop_branch_dir"], "iPhone#{version}", "Instrumented", "ConcurMobile-cal", sim)
             if not File.directory?(release_path)
                 release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iOSCorp#{version}", "Instrumented", "ConcurMobile-cal", sim)
+                cache_path = File.join(home_path, @settings["build_drop_branch_dir"], "iOSCorp#{version}", "Instrumented", "ConcurMobile-cal", sim)
             end
         end
         raise "No builds found in #{release_path}" unless File.directory?(release_path)
-        build_dir = Dir.entries(release_path).reject{|d|d.start_with?('.')}.sort_by{|c| File.stat(File.join(release_path,c)).ctime}.last 
+        
+        build_dirs = Dir.entries(release_path).reject{|d|d.start_with?('.')}.sort_by{|c| File.stat(File.join(release_path,c)).ctime}
+        
+        build_dir = nil
+        zip_file = nil
+        begin
+            raise "No builds found in #{release_path}" if build_dirs.size == 0
+            if File.exists?(File.join(release_path, build_dirs.last, build_dirs.last + ".zip"))
+                build_dir = build_dirs.last
+                zip_file = build_dir + ".zip"
+            else
+                build_dirs.pop 
+            end
+        end while build_dir == nil
+        
         raise "No builds found in #{release_path}" if build_dir == nil
-        zip_file = build_dir + ".zip"
-        source = File.join(release_path, build_dir, zip_file)
+        
+        source = File.join(cache_path, build_dir, zip_file)
+        if not File.exists?(source)
+            release_source = File.join(release_path, build_dir, zip_file)
+            FileUtils.mkdir_p(File.dirname(source))
+            FileUtils.copy(release_source, source)
+            puts "Copy the build from #{release_source} to #{source}"            
+        end
         raise "the file '#{source}' does not exist" if not File.exists?(source)
         dest = File.join(FileUtils.pwd, zip_file)
         FileUtils.copy(source, dest)
         puts "Copy the build from #{source}"
+        File.open(File.join(FileUtils.pwd, "build_drop_dir.txt"), 'w') {|f| f.write(build_dir) }   
         filenames = unzip_file(dest, FileUtils.pwd)
         FileUtils.rm_rf(File.join(FileUtils.pwd, app_bundle))
         FileUtils.cp_r(filenames.find{|e| File.basename(e) == app_bundle}, FileUtils.pwd)
@@ -341,18 +371,18 @@ def get_build(version, sim)
     smb_disconnect(mount_node)
 end
 
-def get_script
+def get_script(name)
     svn_location = @settings["svn_location"]
     svn_location += '/' unless svn_location.end_with?('/')
     username = @settings["svn_username"]
     password = @settings["svn_password"]
     uri = URI.join(svn_location, "Mobile/", "BVT/", "CTE/")
 
-    if ARGV.first == 'list'
+    if name == 'list'
         puts `svn list #{uri} --username #{username} --password #{password}`        
     else
-        feature = ARGV.first
-        feature += '/' unless ARGV.first.end_with?('/')
+        feature = name
+        feature += '/' unless name.end_with?('/')
         uri = URI.join(uri, feature)
         puts `svn export --force #{uri} features --username #{username} --password #{password}`
 
@@ -423,6 +453,19 @@ def app_bundle_path
     File.join(FileUtils.pwd, @settings["app_bundle"])
 end
 
+def app_bundle_name(app_bundle)
+    plist = CFPropertyList::List.new(:file => File.join(app_bundle, "Info.plist"))
+    hash = CFPropertyList.native_types(plist.value)
+    hash["CFBundleName"]
+end
+
+def app_bundle_version(app_bundle)
+    plist = CFPropertyList::List.new(:file => File.join(app_bundle, "Info.plist"))
+    hash = CFPropertyList.native_types(plist.value)
+    hash["CFBundleVersion"]
+    #hash["CFBundleShortVersionString"]
+end
+
 def app_bundle_id(app_bundle)
     plist = CFPropertyList::List.new(:file => File.join(app_bundle, "Info.plist"))
     hash = CFPropertyList.native_types(plist.value)
@@ -671,7 +714,7 @@ elsif cmd == 'getbuild'
 
 elsif cmd == 'getscript'
     read_settings
-    get_script
+    get_script(ARGV.shift)
     exit 0
 
 elsif cmd == 'getsource'
@@ -742,7 +785,7 @@ elsif cmd == 'sim'
         sim_add_photo(file)        
     end
     exit 0
-
+    
 elsif cmd == 'run' or cmd == 'console'
     read_settings
     run(cmd)

data/features/step_definitions/calabash_steps.rb

@@ -120,18 +120,17 @@ end
 
 Then /^I type "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
   tap(field_name)
-  wait_for_elements_exist( ["keyboardAutomatic"] )
+  await_keyboard()
+  sleep(STEP_PAUSE)
   keyboard_enter_text(text_to_type)
   sleep(STEP_PAUSE)
 end
 
 Then /^I type "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
-    index = index.to_i
-    screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)    
-    touch("textField index:#{index-1}")
-    wait_for_elements_exist( ["keyboardAutomatic"] )
-    keyboard_enter_text(text_to_type)
-    sleep(STEP_PAUSE)
+  macro %Q|I touch text field number #{index}|
+  await_keyboard()
+  keyboard_enter_text(text_to_type)
+  sleep(STEP_PAUSE)
 end
 
 # alias

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.144'
-    FRAMEWORK_VERSION = '0.9.144'
+    VERSION = '0.9.145'
+    FRAMEWORK_VERSION = '0.9.145'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testautoi
 version: !ruby/object:Gem::Version
-  version: 0.9.144
+  version: 0.9.145
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber