testautoi 0.9.133 → 0.9.134

data/bin/testautoi

@@ -25,13 +25,15 @@ def print_usage
       Install the app
     install tools
       Download and install tools from Subversion.
+    uninstall
+      Uninstall the app
     launch
       Launch the app
     getip
       Get the device's IP address
     gen
       Generate the skeleton of features directory
-    sim run
+    sim start
       Start an iOS Simulator
     sim quit
       Quit the iOS Simulator
@@ -204,6 +206,12 @@ def smb_connect_mac(location,username,password)
     location = location.tr('\\','/')
     username = username.tr('\\',';').tr('/',';')
     raise "The build drop location is incorrect" if not location.start_with?("//")
+    paths = location.split('/')
+    if paths.size > 4
+        location = paths.shift(4).join('/')
+        @settings["build_drop_branch_dir"] = [paths.join('/'), @settings["build_drop_branch_dir"]].join('/')
+        @settings["build_drop_trunk_dir"] = [paths.join('/'), @settings["build_drop_trunk_dir"]].join('/')       
+    end
     cmd = "mount -t smbfs //'#{username}':#{password}@#{location[2..-1]}  #{mount_node}"
     output=`#{cmd}` ; result=$?.success?
     raise "the command '#{cmd}' failed" if result == false
@@ -234,16 +242,22 @@ def smb_disconnect(mount_node)
 end
 
 def unzip_file (file, destination)
+    filenames = []
     Zip::ZipFile.open(file) { |zip_file|
         zip_file.each { |f|
             f_path=File.join(destination, f.name)
+            FileUtils.rm_rf(f_path) if File.exist?(f_path)
             FileUtils.mkdir_p(File.dirname(f_path))
             zip_file.extract(f, f_path){ true }
+            filenames << f_path
         }
     }
+    filenames
 end
 
 def get_build
+    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"], 
                              @settings["build_drop_username"], 
                              @settings["build_drop_password"])
@@ -267,18 +281,18 @@ def get_build
             # copy the version build
             release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iPhone#{version}", "ConcurMobile", sim, "Release")
         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 
+        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)
         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}"
-        FileUtils.rm_rf(File.join(FileUtils.pwd, (sim=='Emulator')?"Debug-iphonesimulator":"Release-iphoneos"))
-        unzip_file(dest, FileUtils.pwd)
+        filenames = unzip_file(dest, FileUtils.pwd)
         FileUtils.rm_rf(File.join(FileUtils.pwd, app_bundle))
-        FileUtils.cp_r(File.join(FileUtils.pwd, (sim=='Emulator')?"Debug-iphonesimulator":"Release-iphoneos", app_bundle), 
-                       FileUtils.pwd)
+        FileUtils.cp_r(filenames.find{|e| File.basename(e) == app_bundle}, FileUtils.pwd)
     end
 
     smb_disconnect(mount_node)
@@ -299,8 +313,8 @@ def get_script
         uri = URI.join(uri, feature)
         puts `svn export --force #{uri} features --username #{username} --password #{password}`
 
-        #uri = URI.join(@settings["svn_location"], "_support/", "support/")
-        #puts `svn export --force #{uri} features/support --username #{username} --password #{password}`
+        uri = URI.join(@settings["svn_location"], "_support/", "support/")
+        puts `svn export --force #{uri} features/support --username #{username} --password #{password}`
         uri = URI.join(svn_location, "_support/", "step_definition/")
         puts `svn export --force #{uri} features/step_definitions --username #{username} --password #{password}`
     end
@@ -369,7 +383,7 @@ end
 def app_bundle_id(app_bundle)
     plist = CFPropertyList::List.new(:file => File.join(app_bundle, "Info.plist"))
     hash = CFPropertyList.native_types(plist.value)
-    hash['CFBundleURLTypes'][0]["CFBundleIdentifier"]
+    hash["CFBundleIdentifier"]
 end
 
 def app_bundle_url_schemes(app_bundle)

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.133"
+    VERSION = "0.9.134"
     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.133
+  version: 0.9.134
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber