ios_android_toolbox 0.0.15 → 0.0.16

data/bin/get_app_path_from_xcodebuild_log.rb

@@ -9,6 +9,41 @@ IO.foreach(logfile) do |line|
   #if /^[\sa-z\/]+codesign.*\.xcent(\s|")([^\s]+\.app|".+\.app")/.match line
   if /CodeSign\s+"?(.+\.app)"?/.match line
     app_name = $1
+    if not File.exist?(app_name)
+        # Let's try another one, maybe it was archived
+        symlink_app_name = app_name.gsub('/InstallationBuildProductsLocation/Applications/','/BuildProductsPath/Distribution-iphoneos/')
+        if File.symlink?(symlink_app_name)
+            xcode_archives_location = File.join(ENV['HOME'],'Library','Developer','Xcode','Archives')
+	    	ctime = File.lstat(symlink_app_name).ctime
+    		scheme_name = ''
+    		if /\/Build\/Intermediates\/ArchiveIntermediates\/([^\/]+)/.match symlink_app_name
+    			scheme_name = $1
+    		end
+    		app_basename = File.basename(symlink_app_name)
+
+    		tries = 5
+    		while (tries -= 1) > 0
+	    		archive_date_folder = ctime.strftime('%Y-%m-%d')
+	    		archive_folder_name = "#{scheme_name} #{ctime.strftime('%y-%m-%d')} #{ctime.hour % 12}.#{ctime.strftime('%M %p')}.xcarchive"
+
+	    		dist_app_name = File.join(xcode_archives_location, 
+	    			                      archive_date_folder, 
+	    		    	                  archive_folder_name,
+	    		        	              'Products', 
+	    		            	          'Applications',
+	    		                	      app_basename)
+
+		    	# This might be a distribution one, let's check if it moved from
+		    	# InstallationBuildProductsLocation/Applications => BuildProductsPath/Distribution-iphoneos
+	    		if File.exist? dist_app_name
+	    			app_name = dist_app_name
+	    			tries = 0
+	    		end
+
+	    		ctime = ctime + 60
+	    	end
+	    end
+    end
     puts app_name
   end
 end

data/lib/ios_android_toolbox/ios_prov_profile.rb

@@ -104,7 +104,8 @@ module IosAndroidToolbox
 		def self.profile_worth_installing?(path)
 			new_profile = IosProvisioningProfile.new(path)
 			loop_through_existing_profiles do |installed_profile|
-  				if installed_profile.app_id == new_profile.app_id
+  				if installed_profile.app_id == new_profile.app_id and installed_profile.has_provisioned_devices? == new_profile.has_provisioned_devices?
+  					puts "#{installed_profile.creation_date} #{new_profile.creation_date}"
 	 			  	return false if installed_profile.creation_date >= new_profile.creation_date 
   				end
 			end

data/lib/ios_android_toolbox/version.rb

@@ -1,3 +1,3 @@
 module IosAndroidToolbox
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ios_android_toolbox
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Igor Sales
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-21 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: []
 
 description: ""