asrake 0.13.3 → 0.14.0

data/asrake.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |spec|
 	spec.name        = 'asrake'
-	spec.version     = '0.13.3'
+	spec.version     = '0.14.0'
 	spec.platform	  = Gem::Platform::RUBY
 	
 	spec.authors     = ["Malachi Griffie"]

data/lib/asrake/adt.rb

@@ -1,9 +1,9 @@
 require 'asrake/util'
-require 'asrake/base_task'
+require 'asrake/base_executable'
 require 'nokogiri'
 
 module ASRake
-class Adt < BaseTask
+class Adt < BaseExecutable
 
 	include Rake::DSL
 	include ASRake
@@ -38,6 +38,7 @@ class Adt < BaseTask
 	attr_accessor :additional_args
 
 	def initialize(file)
+		super
 
 		self.storetype = "pkcs12"
 		self.target = "air"
@@ -45,26 +46,6 @@ class Adt < BaseTask
 
 		@keystore = "cert.p12"
 		@application_descriptor = "application.xml"
-
-		super(file)
-
-		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
@@ -90,10 +71,10 @@ class Adt < BaseTask
 		command << " -keystore #{self.keystore}"
 		command << " -storepass #{self.storepass}"
 		command << " -target #{target}" if target != nil && target != "air"
+		command << " #{additional_args}" if self.additional_args != nil
 		command << " #{self.output}"
 		command << " #{self.application_descriptor}"
 		self.include_files.each {|entry| command << " -C #{entry}" }
-		command << " #{additional_args}" if self.additional_args != nil
 		
 		status = run command, false
 
@@ -144,40 +125,40 @@ class Adt < BaseTask
 		end
 	end
 
-	def keystore= value
-		# clear prvious keystore task
-		Rake::Task[@keystore].clear
-		@keystore = value
-		create_keystore_task()
-	end
+	protected
 
-	def application_descriptor= value
-		# clear the previous task
-		Rake::Task[@application_descriptor].clear
-		@application_descriptor = value
-		create_application_descriptor_task()
-	end
+	def task_pre_invoke
+		super
 
-	private
+		dependencies = FileList.new
+		self.include_files.each do |value|
+			dependencies.include(Path::forward value.sub(' ', '/').sub(/\.$/, "*"))
+		end
+		@task.enhance(dependencies) if !dependencies.empty?
 
-	def create_application_descriptor_task
-		if File.exists?(@application_descriptor)
-			file self.output => @application_descriptor
+		if self.keystore != nil
+			file self.keystore do
+				run "#{FlexSDK::adt} -certificate -cn #{self.keystore_name} 1024-RSA #{self.keystore} #{self.storepass}"
+				puts "Certificate created at #{self.keystore} with password '#{self.storepass}'"
+			end
+			@task.enhance([self.keystore])
+		end
 
+		if self.application_descriptor != nil && File.exists?(self.application_descriptor)
+			@task.enhance([self.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
-		file self.keystore do
-			run "#{FlexSDK::adt} -certificate -cn #{self.keystore_name} 1024-RSA #{self.keystore} #{self.storepass}"
-			puts "Certificate created at #{self.keystore} with password '#{self.storepass}'"
-		end
 
-		file self.output => self.keystore
+		# 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
 	end
 
 end

data/lib/asrake/asdoc.rb

@@ -1,11 +1,10 @@
 require 'asrake/util'
-require 'rake/tasklib'
 require 'nokogiri'
 
 # http://help.adobe.com/en_US/flex/using/WSd0ded3821e0d52fe1e63e3d11c2f44bc36-7ffa.html
 
 module ASRake
-class Asdoc < BaseTask
+class Asdoc < BaseExecutable
 
 	include Rake::DSL
 	include ASRake
@@ -125,8 +124,6 @@ class Asdoc < BaseTask
 		end
 
 		@doc_sources = []
-
-		yield self if block_given?
 	end
 
 	def add(args)
@@ -179,5 +176,22 @@ class Asdoc < BaseTask
 		run("#{FlexSDK::asdoc} #{args}", true, &block)
 	end
 
+	protected
+
+	def handle_execute_error code
+	end
+	
+	def task_pre_invoke
+		super
+		# set dependencies on all .as and .mxml files in the source paths
+		dependencies = FileList.new
+		self.source_path.each do |path|
+			dependencies.include(Path::forward File.join(path, "**/*.as"))
+			dependencies.include(Path::forward File.join(path, "**/*.mxml"))
+		end
+		dependencies.include(self.library_path) if !self.library_path.empty?
+		@task.enhance(dependencies) if !dependencies.empty?
+	end
+
 end
 end

data/lib/asrake/base_compiler.rb

@@ -1,9 +1,9 @@
-require 'asrake/base_task'
+require 'asrake/base_executable'
 require 'asrake/flexsdk'
 require 'nokogiri'
 
 module ASRake
-class BaseCompiler < BaseTask
+class BaseCompiler < BaseExecutable
 
 	include Rake::DSL
 	
@@ -30,6 +30,8 @@ class BaseCompiler < BaseTask
 	attr_accessor *@@args
 
 	def initialize(file, exe_path)
+		super(file)
+
 		@exe = exe_path
 
 		@isAIR = false
@@ -40,21 +42,11 @@ class BaseCompiler < BaseTask
 		@debug = false
 		#include default flex-config
 		@load_config = [ FlexSDK::flex_config ]
-
-		super(file)
-
-		# set dependencies on all .as and .mxml files in the source paths
-		dependencies = FileList.new
-		self.source_path.each do |path|
-			dependencies.include(Path::forward File.join(path, "**/*.as"))
-			dependencies.include(Path::forward File.join(path, "**/*.mxml"))
-		end
-		file(self.output => dependencies) if !dependencies.empty?
+		@additional_args = ""
 		
 		# allow setting source_path with '=' instead of '<<'
 		# actually, no, this is really bad and confusing we should probably throw when they try to assign
 		#self.source_path = [self.source_path] if self.source_path.is_a? String
-
 	end
 
 	# provide a more understandable alias 
@@ -133,7 +125,7 @@ class BaseCompiler < BaseTask
 		args << " +configname=air" if self.isAIR
 
 		args << " -debug=#{debug}"
-		args << " -source-path=#{Path::forward source_path.join(',')}" if !self.source_path.empty?
+		args << " -source-path+=#{Path::forward source_path.join(',')}" if !self.source_path.empty?
 
 		# add the -load-config option if it is anything other than the default
 		unless self.load_config.length == 1 && is_default_config?(self.load_config[0])
@@ -145,24 +137,46 @@ class BaseCompiler < BaseTask
 			end
 		end
 
-		args << " -library-path=#{Path::forward library_path.join(',')}" if !self.library_path.empty?
-		args << " -external-library-path=#{Path::forward external_library_path.join(',')}" if !self.external_library_path.empty?
-		args << " -include-libraries=#{Path::forward include_libraries.join(',')}" if !self.include_libraries.empty?
+		args << " -library-path+=#{Path::forward library_path.join(',')}" if !self.library_path.empty?
+		args << " -external-library-path+=#{Path::forward external_library_path.join(',')}" if !self.external_library_path.empty?
+		args << " -include-libraries+=#{Path::forward include_libraries.join(',')}" if !self.include_libraries.empty?
 
 		args << " -dump-config=#{Path::forward dump_config}" if self.dump_config != nil
 		
-		args << " #{additional_args}" if self.additional_args != nil
-		#args << ' -include-file images\core_logo.png ..\nexuslib\code\etc\core_logo.png'
+		args << " #{additional_args}" if self.additional_args != nil && self.additional_args != ""
 		
 		return args
 	end
 
 	def execute
 		puts "> #{@exe}#{generate_args}"
-		run "#{@exe}#{generate_args}" do |line|
+		status = run "#{@exe}#{generate_args}", false do |line|
 			puts ">    #{line}"
 			generate_error_message_tips(line)
 		end
+
+		handle_execute_error status.exitstatus
+
+		raise "Operation exited with status #{status.exitstatus}" if status.exitstatus != 0
+	end
+
+	protected
+
+	def handle_execute_error code
+	end
+	
+	def task_pre_invoke
+		super
+		# set dependencies on all .as and .mxml files in the source paths
+		dependencies = FileList.new
+		self.source_path.each do |path|
+			dependencies.include(Path::forward File.join(path, "**/*.as"))
+			dependencies.include(Path::forward File.join(path, "**/*.mxml"))
+		end
+		dependencies.include(self.library_path) if !self.library_path.empty?
+		dependencies.include(self.external_library_path) if !self.external_library_path.empty?
+		dependencies.include(self.include_libraries) if !self.include_libraries.empty?
+		@task.enhance(dependencies) if !dependencies.empty?
 	end
 
 	private

data/lib/asrake/{base_task.rb → base_executable.rb}

@@ -1,7 +1,8 @@
 require 'asrake/util'
+require 'asrake/exe_task'
 
 module ASRake
-class BaseTask
+class BaseExecutable
 
 	include Rake::DSL
 
@@ -16,7 +17,7 @@ class BaseTask
 	def initialize(file)
 
 		raise "An output file must be provided" if file == nil
-
+		
 		@output = file.to_s
 		# if the output path ends in a path separator, it is a directory
 		if @output =~ /[\/\\]$/
@@ -28,19 +29,18 @@ class BaseTask
 			@output_file = File.basename(@output)
 		end
 
-		yield self if block_given?
-
 		# create file task for output
-		file self.output do
+		@task = ASRake::ExeTask.define_task self.output do
 			self.execute
-			# TODO: Want to output this even if the dependencies are met and the task isn't run
-			puts "#{Path::env self.output} (#{File.size(output)} bytes)" unless self.output_is_dir?
 		end
 
+		@task.pre_invoke = method(:task_pre_invoke)
+		@task.post_invoke = method(:task_post_invoke)
+
 		# create directory task for output
-		if !output_is_dir?
+		if !self.output_is_dir?
 			directory self.output_dir
-			file self.output => self.output_dir
+			@task.enhance([self.output_dir])
 		end
 	end
 
@@ -63,7 +63,7 @@ class BaseTask
 		@output
 	end
 
-	# this is probably a terrible idea
+	# used so we can add this task to a FileList. This is probably a terrible idea.
 	def pathmap *args
 		to_s.pathmap *args
 	end
@@ -72,5 +72,18 @@ class BaseTask
 		raise "Must define execute in subclass"
 	end
 
+	protected
+
+	def task_pre_invoke
+		# only run once to add prereqs
+		@task.pre_invoke = nil
+	end
+
+	def task_post_invoke
+		puts "#{Path::env self.output} (#{File.size(self.output)} bytes)" unless self.output_is_dir?
+		# only run once incase invoked again
+		@task.post_invoke = nil
+	end
+
 end
 end

data/lib/asrake/exe_task.rb

@@ -0,0 +1,20 @@
+require 'asrake/util'
+require 'rake/file_task'
+
+module ASRake
+class ExeTask < Rake::FileTask
+
+	attr_accessor :pre_invoke
+	attr_accessor :post_invoke
+
+	def initialize(task_name, app)
+		super
+	end
+
+	def invoke_with_call_chain(task_args, invocation_chain)
+		pre_invoke.call() if pre_invoke != nil
+		super
+		post_invoke.call() if post_invoke != nil
+    end
+end
+end

data/lib/asrake/mxmlc.rb

@@ -6,10 +6,32 @@ module ASRake
 class Mxmlc < BaseCompiler
 
 	include Rake::DSL
+
+	attr_accessor :file_specs
 	
 	def initialize(swf_file)
 		super(swf_file, FlexSDK::mxmlc)
 	end
 
+	def generate_args
+		mxmlc = super
+		
+		mxmlc << " -file-specs=#{file_specs}" if file_specs != nil
+
+		return mxmlc
+	end
+
+	protected
+
+	def handle_execute_error code
+		case code
+		when 1
+			raise "A target file can be specified by setting file_specs to a valid .as or .mxml file.\n" +
+				"eg:\n" +
+				"  swf = ASRake::Mxmlc.new #{output}\n" +
+				"  swf.file_specs = 'src/Main.as'" if file_specs == nil
+		end
+	end
+
 end
 end

data/lib/asrake/package.rb

@@ -1,9 +1,9 @@
 require 'asrake/util'
-require 'asrake/base_task'
+require 'asrake/base_executable'
 require 'zip/zip'
 
 module ASRake
-class Package < BaseTask
+class Package < BaseExecutable
 
 	include Rake::DSL
 	

data/lib/asrake/util.rb

@@ -65,8 +65,8 @@ def run(command, abort_on_failure = true)
 
 	if $?.exitstatus != 0
 		msg = "Operation exited with status #{$?.exitstatus}"
-		fail msg if abort_on_failure
-		puts msg
+		raise msg if abort_on_failure
+		#puts msg
 	end
 
 	return $?

data/lib/asrake/version_task.rb

@@ -1,9 +1,9 @@
-require 'rake/tasklib'
-
 require 'asrake/version/version'
 
 module ASRake
-class VersionTask < Rake::TaskLib
+class VersionTask
+
+	include Rake::DSL
 
 	attr_accessor :filename
 	attr_accessor :filetype

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asrake
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,8 +79,9 @@ files:
 - lib/asrake/adt.rb
 - lib/asrake/asdoc.rb
 - lib/asrake/base_compiler.rb
-- lib/asrake/base_task.rb
+- lib/asrake/base_executable.rb
 - lib/asrake/compc.rb
+- lib/asrake/exe_task.rb
 - lib/asrake/file_utils.rb
 - lib/asrake/flexsdk.rb
 - lib/asrake/mxmlc.rb