asrake 0.13.0 → 0.13.1

data/lib/asrake/adt.rb

@@ -6,6 +6,7 @@ module ASRake
 class Adt < BaseTask
 
 	include Rake::DSL
+	include ASRake
 	
 	# http://help.adobe.com/en_US/air/build/WS5b3ccc516d4fbf351e63e3d118666ade46-7ff1.html
 	attr_accessor :application_descriptor
@@ -38,26 +39,43 @@ class Adt < BaseTask
 
 	def initialize(file)
 
-		self.application_descriptor = "application.xml"
 		self.storetype = "pkcs12"
 		self.target = "air"
 		self.include_files = []
+
 		@keystore = "cert.p12"
+		@application_descriptor = "application.xml"
 
 		super(file)
 
-		create_keystore_task
+		self.include_files.each do |value|
+			files = Path::forward value.sub(' ', '/')
+			files.sub!(/\.$/, "*")
+			FileList[files].each {|file|  Rake::FileTask.define_task self.output => file}
+		end
+
+		# add a prerequisite file task for all files included in the package
+		#def include_files.<<(value)
+		#	super
+		#	files = Path::forward value.sub(' ', '/')
+		#	files.sub!(/\.$/, "*")
+		#	FileList[files].each {|file| puts @output; Rake::FileTask.define_task @output => file}
+		#end
+
+		create_keystore_task()
+		create_application_descriptor_task()
 
 	end
 
 	# define named task first so if desc was called it will be attached to it instead of the file task
 	def execute
 
-		fail "You must define 'output' for #{self}" if self.output == nil
-		fail "You must define 'application_descriptor'" if self.application_descriptor == nil || !File.exists?(self.application_descriptor)
-		fail "You must define 'keystore' for #{self}" if self.keystore == nil
-		fail "You must define 'keystore_name' for #{self}" if self.keystore_name == nil
-		fail "You must define 'storepass' for #{self}" if self.storepass == nil
+		raise "You must define 'output' for #{self}" if self.output == nil
+		raise "You must define 'application_descriptor'" if self.application_descriptor == nil || !File.exists?(self.application_descriptor)
+		raise "You must define 'keystore' for #{self}" if self.keystore == nil
+		raise "You must define 'keystore_name' for #{self}" if self.keystore_name == nil
+		raise "You must define 'storepass' for #{self}" if self.storepass == nil
+		raise "You must define 'include_files' for #{self}\neg: include_files << 'bin .'" if self.include_files.length < 1
 
 		# TODO: Somehow confirm that the initialWindow content is included in the build
 		#app_xml = Nokogiri::XML(File.read(application_descriptor))
@@ -74,69 +92,83 @@ class Adt < BaseTask
 		command << " -target #{target}" if target != nil && target != "air"
 		command << " #{self.output}"
 		command << " #{self.application_descriptor}"
+		self.include_files.each {|entry| command << " -C #{entry}" }
 		command << " #{additional_args}" if self.additional_args != nil
-		if self.include_files == nil || self.include_files.length < 1
-			command << " -C #{self.output_dir} ."
-		else
-			self.include_files.each {|entry| command << " -C #{entry}" }
-		end
+		
 		status = run command, false
+
 		if status.exitstatus != 0
 			case status.exitstatus
 			when 2
-				fail "Usage error\n" + 
+				raise "Usage error\n" + 
 					 "Check the command line arguments for errors"
 			when 5
-				fail "Unknown error\n" +
+				raise "Unknown error\n" +
 					 "This error indicates a situation that cannot be explained by common error conditions.\n" +
-					 "Possible root causes include incompatibility between ADT and the Java Runtime Environment,\n"
+					 "Possible root causes include incompatibility between ADT and the Java Runtime Environment,\n" +
 					 "corrupt ADT or JRE installations, and programming errors within ADT."
 			when 6
-				fail "Could not write to output directory\n" +
+				raise "Could not write to output directory\n" +
 					 "Make sure that the specified (or implied) output directory is accessible and\n" +
 					 "that the containing drive has sufficient disk space."
 			when 7
-				fail "Could not access certificate\n" +
+				raise "Could not access certificate\n" +
 					 "Make sure that the path to the keystore is specified correctly: #{self.keystore}\n" +
 					 "Make sure that the keystore password is correct: #{self.storepass}"
 					 #"Check that the certificate within the keystore can be accessed."
 			when 8
-				fail "Invalid certificate\n" +
+				raise "Invalid certificate\n" +
 					 "The certificate file is malformed, modified, expired, or revoked."
 			when 9
-				fail "Could not sign AIR file\n" +
+				raise "Could not sign AIR file\n" +
 					 "Verify the signing options passed to ADT."
 			when 10
-				fail "Could not create time stamp\n" +
+				raise "Could not create time stamp\n" +
 					 "ADT could not establish a connection to the timestamp server.\n" + 
 					 "If you connect to the internet through a proxy server, you may need to configure\n" + 
 					 "the JRE proxy settings. There have also been errors reported with Java 7: \n" +
 					 "http://www.flashdevelop.org/community/viewtopic.php?p=41221\n" + 
 					 "You can disable checking a timestamp server by setting 'tsa' to 'none' in your task"
 			when 11
-				fail "Certificate creation error\n" +
+				raise "Certificate creation error\n" +
 					 "Verify the command line arguments used for creating signatures."
 			when 12
-				fail "Invalid input\n" +
-					 "Verify file paths and other arguments passed to ADT on the command line."#\n" +
-					 #"Be sure the initial content in #{self.application_descriptor} is included in the build:\n" +
+				raise "Invalid input\n" +
+					 "Verify file paths and other arguments passed to ADT on the command line.\n" +
+					 "Be sure the initial content in #{self.application_descriptor} is included in the build by\n" +
+					 "appnding it to includ_files (eg, adt.include_files << 'bin .')"
 					 #"<initialWindow>\n   <content>#{swf}</content>\n</initialWindow>"
 			else
-				fail "Operation exited with status #{status.exitstatus}"
+				raise "Operation exited with status #{status.exitstatus}"
 			end
 		end
 	end
 
 	def keystore= value
-		remove_keystore_task()
+		# clear prvious keystore task
+		Rake::Task[@keystore].clear
 		@keystore = value
 		create_keystore_task()
 	end
 
+	def application_descriptor= value
+		# clear the previous task
+		Rake::Task[@application_descriptor].clear
+		@application_descriptor = value
+		create_application_descriptor_task()
+	end
+
 	private
 
-	def remove_keystore_task
-		Rake::Task[@keystore].clear
+	def create_application_descriptor_task
+		if File.exists?(@application_descriptor)
+			file self.output => @application_descriptor
+
+			#app_xml = Nokogiri::XML(File.read(@application_descriptor))
+			#swf = app_xml.at_css("initialWindow > content").content.to_s
+			#file self.output => swf
+			#raise "Initial content in #{@application_descriptor} does not exist" if !File.exists?(swf)
+		end
 	end
 
 	def create_keystore_task

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asrake
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri