asrake 0.11.0 → 0.12.3

data/README.md

@@ -12,7 +12,7 @@ Overview
 Add the path(s) to your Flex SDK for all systems that will need to run the Rake tasks.
 ```ruby
 FlexSDK::SDK_PATHS << 'C:\develop\sdk\flex_sdk_4.6.0.23201'
-FlexSDK::SDK_PATHS << "C:/develop/sdk/flex_sdk_4.5.1"
+FlexSDK::SDK_PATHS << "C:/develop/sdk/flex_sdk 4.5.1"
 FlexSDK::SDK_PATHS << "/opt/lib/adobe/flex_4.6"
 ```
 
@@ -31,66 +31,45 @@ How to Tasks
 ### Build a SWF or SWC
 
 ```
-ASRake::MxmlcTask(task_name = :build, compiler_args = nil) |self|
+ASRake::Mxmlc(file) |self|
 ```
 ```
-ASRake::CompcTask(task_name = :build, compiler_args = nil) |self|
+ASRake::Compc(file) |self|
 ```
 
-You can define the compile arguments elsewhere and pass it to the task, or set them inside the task block, or a combination of both. It is purely preference.
-
-The following snippets produce identical tasks.
-
-```ruby
-desc "Build swc"
-ASRake::CompcTask.new :build do |build|
-# You can store the compiler arguments for later
-# For example, maybe we need to know the output_dir later on
-#compc = ASRake::CompcTask.new :build do |build|
-	build.target_player = 11.0
-	build.output = "bin/bin/my_project.swc"
-	build.debug = true
-	build.source_path << "bin/src"
-	build.statically_link_only_referenced_classes << "lib/lib_used_in_project.swc"
-end
-```
+Assign arguments for your build and optionally run it with a friendlier-named task:
 
 ```ruby
-args = ASRake::CompcArguments.new
+args = ASRake::Compc.new "bin/bin/my_project.swc"
 args.target_player = 11.0
-args.output = "bin/bin/my_project.swc"
 args.debug = true
 args.source_path << "bin/src"
 args.statically_link_only_referenced_classes << "lib/lib_used_in_project.swc"
 
 desc "Build swc"
-ASRake::CompcTask.new :build, args
+task :build => args
 ```
 
-```ruby
-args = ASRake::CompcArguments.new
-args.target_player = 11.0
-args.output = "bin/bin/my_project.swc"
-args.debug = false
-args.source_path << "bin/src"
+You can also define arguments in a block on creation:
 
+```ruby
 desc "Build swc"
-ASRake::CompcTask.new :build, args do |compc|
-	compc.debug = true
-	compc.statically_link_only_referenced_classes << "lib/lib_used_in_project.swc"
+ASRake::Compc.new "bin/bin/my_project.swc" do |build|
+	build.target_player = 11.0
+	build.debug = true
+	build.source_path << "bin/src"
+	build.statically_link_only_referenced_classes << "lib/lib_used_in_project.swc"
 end
 ```
 
 ### Include ASDoc in a SWC
 
-If you are compiling with `CompcArgs` or a `CompcTask`, you can set the field `include_asdoc` to have documentation added to your swc
+If you are compiling with `Compc`, you can set the field `include_asdoc` to have documentation added to your swc
 
 ```ruby
 desc "Build swc"
-ASRake::CompcTask.new :build do |build|
+ASRake::Compc.new "bin/bin/my_project.swc" do |build|
 	build.target_player = 11.0
-	build.output = "bin/bin/my_project.swc"
-	build.debug = true
 	build.source_path << "bin/src"
 	build.statically_link_only_referenced_classes << "lib/lib_used_in_project.swc"
 	build.include_asdoc = true
@@ -103,9 +82,8 @@ Compile your SWF file as normal, but set the `isAIR` property to true
 
 ```ruby
 desc "Build app"
-ASRake::MxmlcTask.new :build do |build|
+ASRake::Mxmlc.new "bin/my_app.swf" do |build|
 	build.load_config << "mxmlc_config.xml"
-	build.output = "bin/my_app.swf"
 	build.isAIR = true
 end
 ```
@@ -183,23 +161,20 @@ cp_u FileList["lib/**/*.swc"], "bin/lib"
 
 ### Build without a task
 
-You don't need to create a rake task to build a swf or swc. Just call `build()` on an instance of CompcArguments or MxmlcArguments.
+You don't need to create a rake task to build a swf or swc. Just call `execute()` on an instance of Compc or Mxmlc.
 
 > Note that this will not do any dependency checks, so the build will run even if it is unnecessary
 
 ```ruby
-args = ASRake::CompcArguments.new
+args = ASRake::Compc.new "bin/bin/my_project.swc"
 args.target_player = 11.0
-args.output = "bin/bin/my_project.swc"
 args.source_path << "bin/src"
 args.statically_link_only_referenced_classes << "lib/lib_used_in_project.swc"
-args.build()
+args.execute()
 
-ASRake::MxmlcArguments.new do |mxmlc|
+(ASRake::Mxmlc.new "bin/bin/my_project.swf" do |mxmlc|
 	mxmlc.target_player = 11.0
-	mxmlc.output = "bin/bin/my_project.swf"
 	mxmlc.debug = true
 	mxmlc.source_path << "bin/src"
-	mxmlc.build()
-end
+end).execute()
 ```

data/lib/asrake/adt_task.rb

@@ -1,9 +1,13 @@
+require 'asrake/util'
 require 'rake/tasklib'
 require 'nokogiri'
 
 module ASRake
 class AdtTask < Rake::TaskLib
 
+	include ASRake::PathUtils
+	include Rake::DSL
+	
 	attr_accessor :output
 	# http://help.adobe.com/en_US/air/build/WS5b3ccc516d4fbf351e63e3d118666ade46-7ff1.html
 	attr_accessor :application_descriptor

data/lib/asrake/asdoc.rb

@@ -1,11 +1,14 @@
+require 'asrake/util'
 require 'rake/tasklib'
 require 'nokogiri'
 
 # http://help.adobe.com/en_US/flex/using/WSd0ded3821e0d52fe1e63e3d11c2f44bc36-7ffa.html
 
-module ASRake
-class Asdoc
+class ASRake::Asdoc
 
+	include ASRake::PathUtils
+	include Rake::DSL
+	
 	attr_accessor :additional_args
 
 	# we have some special handling of this
@@ -112,7 +115,10 @@ class Asdoc
 		attr_accessor name
 	end
 
-	def initialize
+	def initialize(output=nil)
+
+		raise "Output directory must be provided to ASDoc.new" if output == nil
+
 		# set all defaults
 		@@compiler_args.each do |name, type|
 			instance_variable_set("@#{name}", []) if type == :array || type == :dirs
@@ -120,6 +126,8 @@ class Asdoc
 
 		@doc_sources = []
 
+		@output = output
+
 		yield self if block_given?
 	end
 
@@ -128,7 +136,7 @@ class Asdoc
 		self.library_path << args.library_path
 		self.library_path << args.include_libraries
 		self.library_path << args.external_library_path
-		args.source_path.each { |p| self.doc_classes << ASRake::get_classes(p) } if args.kind_of? ASRake::CompcArguments_Module
+		args.source_path.each { |p| self.doc_classes << ASRake::get_classes(p) } if args.kind_of? ASRake::Compc
 	end
 
 	def execute(&block)
@@ -172,5 +180,4 @@ class Asdoc
 		run(command, true, &block)
 	end
 
-end
 end

data/lib/asrake/{base_compiler_args.rb → base_compiler.rb}

@@ -1,17 +1,18 @@
+require 'asrake/base_task'
 require 'asrake/flexsdk'
 require 'nokogiri'
 
 module ASRake
+class BaseCompiler < BaseTask
 
-module BaseCompilerArguments_Module
-
+	include ASRake::PathUtils
+	include Rake::DSL
+	
 	#
 	# compiler arguments
 	#
 
 	@@args = [
-		:output,
-
 		:source_path,
 		:library_path,
 		:external_library_path,
@@ -23,20 +24,15 @@ module BaseCompilerArguments_Module
 
 		:debug,
 
-		:dump_config
+		:dump_config,
+
+		:additional_args
 	]
 	attr_accessor *@@args
 
-	attr_accessor :additional_args
-
-	#
-	# non-compiler arguments
-	#
-	
-	attr_reader :output_file
-	attr_reader :output_dir
+	def initialize(file, exe_path)
+		@exe = exe_path
 
-	def initialize(args=nil)
 		@isAIR = false
 		@library_path = []
 		@external_library_path = []
@@ -46,35 +42,12 @@ module BaseCompilerArguments_Module
 		#include default flex-config
 		@load_config = [ FlexSDK::flex_config ]
 
-		self.merge_in args if args != nil
-
-		yield self if block_given?
-	end
-
-	# compiler needs to be defined in subclass
-	def compiler
-		fail "'compiler' must be defined in subclass"
-	end
-
-	def output
-		@output
-	end
+		super(file)
 
-	def output= value
-		@output = value
-		# if the output path ends in a path separator, it is a directory
-		if @output =~ /[\/\\]$/
-			@output_dir = @output
-		else
-			# forward-slashes required for File methods
-			@output = cf @output
-			@output_dir = File.dirname(@output)
-			@output_file = File.basename(@output)
-		end
-	end
+		# 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
 
-	def output_is_dir?
-		output_file == nil
 	end
 
 	# provide a more understandable alias 
@@ -107,49 +80,34 @@ module BaseCompilerArguments_Module
 	alias_method :isAir, :isAIR
 	alias_method :isAir=, :isAIR=
 
-	def merge_in(args)
-		@@args.each do |arg|
-			# TODO: This needs to concat arrays not overwite them
-			self.send("#{arg}=", args.send(arg))
-		end
-	end
-
-	def to_s
-		@output
-	end
-
 	#
 	# Verify properties and then return build arguments
 	#
 	def generate_args
 		
-		#
-		# allow all the array arguments to be set as single strings
-		#
-
-		# TODO: have this be part of the attribute accessor
-		self.source_path = [self.source_path] if self.source_path.is_a? String
-		self.load_config = [self.load_config] if self.load_config.is_a? String
-		self.library_path = [self.library_path] if self.library_path.is_a? String
-		self.external_library_path = [self.external_library_path] if self.external_library_path.is_a? String
-		self.include_libraries = [self.include_libraries] if self.include_libraries.is_a? String
+		# TODO: have this be checked when assigned and throw on string so the user understands the proper syntax
+		#self.source_path = [self.source_path] if self.source_path.is_a? String
+		#self.load_config = [self.load_config] if self.load_config.is_a? String
+		#self.library_path = [self.library_path] if self.library_path.is_a? String
+		#self.external_library_path = [self.external_library_path] if self.external_library_path.is_a? String
+		#self.include_libraries = [self.include_libraries] if self.include_libraries.is_a? String
 
 		# set to true if the version is defined in one of the referenced configs
-		isTargetDefined = false
+		is_target_defined = false
 		if self.target_player == nil
 			# try to find necessary args in any loaded config files
-			unless self.load_config.length == 1 && isDefaultConfig?(self.load_config[0])
+			unless self.load_config.length == 1 && is_default_config?(self.load_config[0])
 				# load config in reverse so last added has priority
 				self.load_config.reverse.each do |config|
 					flex_config = Nokogiri::XML(File.read(config))
 					
-					isTargetDefined = true if flex_config.at_css('target-player')
+					is_target_defined = true if flex_config.at_css('target-player')
 					#configSource? = true if 
 				end
 			end
 		end
 
-		fail "You must define 'target_player' for #{self}" if self.target_player == nil && !isTargetDefined
+		fail "You must define 'target_player' for #{self}" if self.target_player == nil && !is_target_defined
 
 		# TODO: iterate over all non-default config files provided and look for source-path entries
 		#fail "You must add at least one path to 'source_path' for #{self}" if source_path.empty? && !configSource?
@@ -175,11 +133,11 @@ module BaseCompilerArguments_Module
 		args << " -source-path=#{cf 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 && isDefaultConfig?(self.load_config[0])
+		unless self.load_config.length == 1 && is_default_config?(self.load_config[0])
 			# if the default flex config is still in the load_config array, then append all config files, otherwise have the first one replace
-			op = hasDefaultConfigFile? ? "+=" : "="
+			op = has_default_config_file? ? "+=" : "="
 			self.load_config.each do |config|
-				args << " -load-config#{op}#{cf config}" unless isDefaultConfig?(config)
+				args << " -load-config#{op}#{cf config}" unless is_default_config?(config)
 				op = "+="
 			end
 		end
@@ -196,30 +154,24 @@ module BaseCompilerArguments_Module
 		return args
 	end
 
-	def build(tips=true)
-		fail "Compiler not defined in #{self}" if compiler == nil
-		puts
-		if tips
-			puts "> #{compiler}#{generate_args}"
-			run "#{compiler}#{generate_args}" do |line|
-				puts ">    #{line}"
-				generate_error_message_tips(line)
-			end
-		else
-			run "#{compiler}#{generate_args}"
+	def execute
+		puts "> #{@exe}#{generate_args}"
+		run "#{@exe}#{generate_args}" do |line|
+			puts ">    #{line}"
+			generate_error_message_tips(line)
 		end
 	end
 
 	private
 
-	def hasDefaultConfigFile?
+	def has_default_config_file?
 		self.load_config.each do |path|
-			return true if isDefaultConfig? path
+			return true if is_default_config? path
 		end
 		return false
 	end
 
-	def isDefaultConfig?(path)
+	def is_default_config?(path)
 		return (path == FlexSDK::flex_config || path == FlexSDK::air_config)
 	end
 
@@ -231,7 +183,7 @@ module BaseCompilerArguments_Module
 			advice << "to have access to the native JSON parser. It is currently set to #{target_player}"
 		elsif line.include?("Error: The definition of base class Object was not found")
 			advice << "If you have removed the default flex-config by setting 'load_config' to"
-			advice << "an empty or alternate value (i.e., not appended to it) you must be sure to"
+			advice << "an empty or alternate value using = instead of << you must be sure to"
 			advice << "still reference the necessary core Flash files, especially playerglobal.swc"
 		end
 
@@ -258,10 +210,6 @@ end
 #	}
 #end
 
-#http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
-#https://github.com/nexussays/playerglobal/raw/master/player/11.2/playerglobal.swc
-#frameworks\libs\player
-
 #-dump-config compiler_config.xml
 #-link-report compiler_linkreport.xml
 #-size-report compiler_sizereport.xml

data/lib/asrake/base_task.rb

@@ -0,0 +1,70 @@
+require 'asrake/util'
+
+module ASRake
+class BaseTask
+
+	include ASRake::PathUtils
+	include Rake::DSL
+
+	#
+	# non-compiler arguments
+	#
+	
+	attr_reader :output
+	attr_reader :output_file
+	attr_reader :output_dir
+
+	def initialize(file=nil)
+
+		raise "Output file/directory 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 =~ /[\/\\]$/
+			@output_dir = @output
+		else
+			# forward-slashes required for File methods
+			@output = cf @output
+			@output_dir = File.dirname(@output)
+			@output_file = File.basename(@output)
+		end
+
+		yield self if block_given?
+
+		# create file task for output
+		file self.output do
+			self.execute
+			# TODO: Want to output this even if the dependencies are met and the task isn't run
+			result = c self.output
+			result << " (#{File.size(output)} bytes)" unless self.output_is_dir?
+			puts result
+		end
+
+		# create directory task for output
+		if !output_is_dir?
+			directory self.output_dir
+			file self.output => self.output_dir
+		end
+	end
+
+	def output_is_dir?
+		output_file == nil
+	end
+
+	def merge_in(args)
+		@@args.each do |arg|
+			# TODO: This needs to concat arrays not overwite them
+			self.send("#{arg}=", args.send(arg))
+		end
+	end
+
+	def to_s
+		@output
+	end
+
+	def execute
+		raise "Must define execute in subclass"
+	end
+
+end
+end

data/lib/asrake/compc.rb

@@ -0,0 +1,77 @@
+require 'asrake/util'
+require 'asrake/base_compiler'
+require 'asrake/asdoc'
+
+module ASRake
+class Compc < BaseCompiler
+
+	include ASRake::PathUtils
+	include Rake::DSL
+	
+	attr_accessor :include_asdoc
+
+	#
+	# Create a compc task for the provided swc
+	#
+	def initialize(swc_file)
+		super(swc_file, FlexSDK::compc)
+
+		# set dependencies on all .as and .mxml files in the source paths
+		dependencies = FileList.new
+		self.source_path.each do |path|
+			dependencies.include(File.join(cf path, "**/*.as"))
+			dependencies.include(File.join(cf path, "**/*.mxml"))
+		end
+		file(self.output => dependencies) if !dependencies.empty?
+
+		# update build task to include asdoc
+		file self.output do
+			if self.include_asdoc
+				asdoc = ASRake::Asdoc.new File.join(self.output_dir, ".asrake_temp")
+				asdoc.add(self)
+				asdoc.keep_xml = true
+				asdoc.skip_xsl = true
+				asdoc.lenient = true
+				# capture output in a block to prevent it from going to console
+				asdoc.execute { |line| }
+
+				if output_is_dir?
+					cp_r "#{asdoc.output}/tempdita", File.join(self.output_dir, "docs")
+				else
+					Zip::ZipFile.open(self.output) do |zipfile|
+						# remove existing docs (eg, from -include-libraries linking a swc with pre-existing docs)
+						begin
+							zipfile.remove("docs")
+						rescue
+							#no rescue
+						end
+						FileList["#{asdoc.output}/tempdita/*"].each do |file|
+							zipfile.add("docs/#{File.basename(file)}", file)
+						end
+					end
+				end
+
+				rm_rf asdoc.output, :verbose => false
+			end
+		end
+
+	end
+
+	def generate_args
+		compc = super
+		
+		#compc << " -include-sources=#{cf source_path.join(',')}" if !source_path.empty?
+		self.source_path.each do |path|
+			compc << " -include-classes #{ASRake::get_classes(path).join(' ')}"
+		end
+
+		return compc
+	end
+
+	def merge_in(args)
+		super
+		self.include_asdoc = args.include_asdoc
+	end
+
+end
+end

data/lib/asrake/flexsdk.rb

@@ -1,4 +1,4 @@
-require 'asrake/host'
+require 'asrake/util'
 
 class FlexSDK
 
@@ -6,6 +6,8 @@ SDK_PATHS = []
 
 class << self
 
+	include ASRake::PathUtils
+	
 	@@initialized = false
 
 	# dynamically create getters for the executables and config files
@@ -44,12 +46,14 @@ class << self
 				@@configs.each do |name|
 					config = c File.join(path, 'frameworks', "#{name}.xml")
 					missing[SDK_PATHS] << config if !File.exists?(config)
+					config = "\"#{config}\"" if config =~ /\s/
 					instance_variable_set "@#{name.gsub('-','_')}", config
 				end
 
 				@@executables.each do |name|
 					exec = c File.join(path, 'bin', name)
 					missing[SDK_PATHS] << exec if !File.exists?(exec)
+					exec = "\"#{exec}\"" if exec =~ /\s/
 					instance_variable_set "@#{name}", exec
 				end
 				
@@ -69,7 +73,7 @@ class << self
 				str << "\n"
 			end
 			str << "Append a valid SDK path in your rakefile, e.g.:\nFlexSDK::SDK_PATHS << 'C:\\develop\\sdk\\flex_sdk_4.6.0.23201'"
-			str << "\nFor more information, see: http://adobe.com/go/flex_sdk/"
+			#str << "\nFor more information, see: http://adobe.com/go/flex_sdk/"
 			fail str
 		end
 	end

data/lib/asrake/mxmlc.rb

@@ -0,0 +1,16 @@
+require 'asrake/util'
+require 'asrake/base_compiler'
+require 'asrake/asdoc'
+
+module ASRake
+class Mxmlc < BaseCompiler
+
+	include ASRake::PathUtils
+	include Rake::DSL
+	
+	def initialize(swf_file)
+		super(swf_file, FlexSDK::mxmlc)
+	end
+
+end
+end

data/lib/asrake/package.rb

@@ -0,0 +1,40 @@
+require 'asrake/util'
+require 'asrake/base_task'
+require 'zip/zip'
+
+module ASRake
+class Package < BaseTask
+
+	include ASRake::PathUtils
+	include Rake::DSL
+	
+	attr_accessor :files
+
+	def initialize(file=nil)
+		super(file)
+	end
+
+	def files
+		@files
+	end
+	def files= value
+		@files = value
+		files.each do |to, from|
+			file output => [cf(from)]
+		end
+	end
+
+	def to_s
+		@output
+	end
+
+	def execute
+		rm_r output rescue nil
+		Zip::ZipFile.open(output, Zip::ZipFile::CREATE) do |zipfile|
+			files.each do |to, from|
+				zipfile.add(cf(to), cf(from))
+			end
+		end
+	end
+end
+end

data/lib/asrake/util.rb

@@ -0,0 +1,68 @@
+module ASRake
+class << self
+
+	def get_classes(path)
+		arr = []
+		Dir.chdir(path) do
+			FileList["**/*.as"].pathmap('%X').each do |file|
+				name = file.gsub(/^\.[\/\\]/, "").gsub(/[\/\\]/, ".")
+				yield name if block_given?
+				arr << name
+			end
+		end
+		return arr
+	end
+
+end
+end
+
+module ASRake::OS
+class << self
+	def is_mac?
+		RUBY_PLATFORM.downcase.include?("darwin")
+	end
+
+	def is_windows?
+		require 'rbconfig'
+		RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+	end
+
+	def is_linux?
+		RUBY_PLATFORM.downcase.include?("linux")
+	end
+end
+end
+
+module ASRake::PathUtils
+	def c(str)
+		ASRake::OS::is_windows? ? cb(str) : cf(str)
+	end
+
+	def cb(str)
+		str.gsub("/", "\\")
+	end
+
+	def cf(str)
+		str.gsub("\\", "/")
+	end
+end
+
+def run(command, abort_on_failure = true)
+	command.strip!
+
+	puts "> #{command}" if !block_given?
+	IO.popen("#{command} 2>&1") do |proc|
+		while !proc.closed? && (line = proc.gets)
+			puts ">    #{line}" if !block_given?
+			yield line if block_given?
+		end
+	end
+
+	if $?.exitstatus != 0
+		msg = "Operation exited with status #{$?.exitstatus}"
+		fail msg if abort_on_failure
+		puts msg
+	end
+
+	return $?
+end

data/lib/asrake.rb

@@ -20,26 +20,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =end
 
-# require all the task files so users can create them just by requiring asrake
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), "asrake/*_task.rb")).each {|f| require f }
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), "asrake/*_args.rb")).each {|f| require f }
-
-require 'asrake/file_utils'
-
-module ASRake
-class << self
-
-def get_classes(path)
-	arr = []
-	Dir.chdir(path) do
-		FileList["**/*.as"].pathmap('%X').each do |file|
-			name = file.gsub(/^\.[\/\\]/, "").gsub(/[\/\\]/, ".")
-			yield name if block_given?
-			arr << name
-		end
-	end
-	return arr
-end
-
-end
-end
+# require all files
+Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), "asrake/*.rb")).each {|f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asrake
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -71,16 +71,14 @@ extra_rdoc_files: []
 files:
 - lib/asrake/adt_task.rb
 - lib/asrake/asdoc.rb
-- lib/asrake/base_compiler_args.rb
-- lib/asrake/base_compiler_task.rb
-- lib/asrake/compc_args.rb
-- lib/asrake/compc_task.rb
+- lib/asrake/base_compiler.rb
+- lib/asrake/base_task.rb
+- lib/asrake/compc.rb
 - lib/asrake/file_utils.rb
 - lib/asrake/flexsdk.rb
-- lib/asrake/host.rb
-- lib/asrake/mxmlc_args.rb
-- lib/asrake/mxmlc_task.rb
-- lib/asrake/package_task.rb
+- lib/asrake/mxmlc.rb
+- lib/asrake/package.rb
+- lib/asrake/util.rb
 - lib/asrake/version/component.rb
 - lib/asrake/version/version.rb
 - lib/asrake/version_task.rb
@@ -111,5 +109,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Rake library for Actionscript 3, Flex, and AIR projects
+summary: A cross-platform Rake library for Actionscript 3, Flex, and AIR projects
 test_files: []

data/lib/asrake/base_compiler_task.rb

@@ -1,22 +0,0 @@
-require 'rake/tasklib'
-require 'asrake/base_compiler_args'
-
-module ASRake
-class BaseCompilerTask < Rake::TaskLib
-	include BaseCompilerArguments_Module
-
-	def initialize(name, args)
-		super(args)
-
-		@name = name
-		
-		# create named task first so it gets the desc if one is added
-		Rake::Task.define_task @name
-
-		# if the task name is a hash (ie, has dependencies defined) make sure we pull out the task name from it
-		@name, _ = name.first if name.is_a? Hash
-
-	end
-
-end
-end

data/lib/asrake/compc_args.rb

@@ -1,37 +0,0 @@
-require 'asrake/flexsdk'
-require 'asrake/base_compiler_args'
-
-module ASRake
-
-module CompcArguments_Module
-	include BaseCompilerArguments_Module
-
-	attr_accessor :include_asdoc
-	
-	def compiler
-		FlexSDK::compc
-	end
-
-	def generate_args
-		compc = super
-		
-		#compc << " -include-sources=#{cf source_path.join(',')}" if !source_path.empty?
-		self.source_path.each do |path|
-			compc << " -include-classes #{ASRake::get_classes(path).join(' ')}"
-		end
-
-		return compc
-	end
-
-	def merge_in(args)
-		super
-		self.include_asdoc = args.include_asdoc
-	end
-
-end
-
-class CompcArguments
-	include CompcArguments_Module
-end
-
-end

data/lib/asrake/compc_task.rb

@@ -1,80 +0,0 @@
-require 'rake/tasklib'
-
-require 'asrake/host'
-require 'asrake/base_compiler_task'
-require 'asrake/compc_args'
-require 'asrake/asdoc'
-
-module ASRake
-class CompcTask < BaseCompilerTask
-	include CompcArguments_Module
-
-	# Create a swc compilation task with the given name.
-	def initialize(name = :build, args = nil)
-		super
-
-		# create directory task for output
-		if !output_is_dir?
-			directory self.output_dir
-			file self.output => self.output_dir
-		end
-		
-		# create file task for output
-		file self.output do
-			self.build
-		end
-
-		# allow setting source_path with '=' instead of '<<'
-		self.source_path = [self.source_path] if self.source_path.is_a? String
-
-		# set dependencies on all .as and .mxml files in the source paths
-		dependencies = FileList.new
-		self.source_path.each do |path|
-			path = cf path
-			dependencies.include(File.join(path, "*.as"))
-			dependencies.include(File.join(path, "*.mxml"))
-			dependencies.include(File.join(path, "**", "*.as"))
-			dependencies.include(File.join(path, "**", "*.mxml"))
-		end
-		file(self.output => dependencies) if !dependencies.empty?
-
-		# add output file task as a dependency to the named task created
-		task @name => self.output do
-			result = c self.output
-			result << " (#{File.size(output)} bytes)" unless self.output_is_dir?
-			puts result
-		end
-
-		if @include_asdoc
-			file self.output do
-				asdoc = ASRake::Asdoc.new
-				asdoc.output = "#{self.output_dir}/.asrake_temp/"
-				asdoc.add(self)
-				asdoc.keep_xml = true
-				asdoc.skip_xsl = true
-				asdoc.lenient = true
-				asdoc.execute { |line| }
-
-				if output_is_dir?
-					cp_r File.join(asdoc.output, 'tempdita'), File.join(self.output_dir, 'docs')
-				else
-					Zip::ZipFile.open(self.output) do |zipfile|
-						# remove any existing docs (eg, from -include-libraries linking a swc with asdoc)
-						begin
-							zipfile.remove('docs')
-						rescue
-						end
-						FileList[File.join(asdoc.output, 'tempdita', '*')].each do |file|
-							zipfile.add(File.join('docs', File.basename(file)), file)
-						end
-					end
-				end
-
-				rm_rf asdoc.output, :verbose => false
-			end
-		end
-
-	end
-
-end
-end

data/lib/asrake/host.rb

@@ -1,46 +0,0 @@
-module OS
-	def OS.is_mac?
-		RUBY_PLATFORM.downcase.include?("darwin")
-	end
-
-	def OS.is_windows?
-		require 'rbconfig'
-		RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-	end
-
-	def OS.is_linux?
-		RUBY_PLATFORM.downcase.include?("linux")
-	end
-end
-
-def run(command, abort_on_failure = true)
-	command.strip!
-
-	puts "> #{command}" if !block_given?
-	IO.popen("#{command} 2>&1") do |proc|
-		while !proc.closed? && (line = proc.gets)
-			puts ">    #{line}" if !block_given?
-			yield line if block_given?
-		end
-	end
-
-	if $?.exitstatus != 0
-		msg = "Operation exited with status #{$?.exitstatus}"
-		fail msg if abort_on_failure
-		puts msg
-	end
-
-	return $?
-end
-
-def c(str)
-	OS::is_windows? ? cb(str) : cf(str)
-end
-
-def cb(str)
-	str.gsub("/", "\\")
-end
-
-def cf(str)
-	str.gsub("\\", "/")
-end

data/lib/asrake/mxmlc_args.rb

@@ -1,18 +0,0 @@
-require 'asrake/flexsdk'
-require 'asrake/base_compiler_args'
-
-module ASRake
-
-module MxmlcArguments_Module
-	include BaseCompilerArguments_Module
-
-	def compiler
-		FlexSDK::mxmlc
-	end
-end
-
-class MxmlcArguments
-	include MxmlcArguments_Module
-end
-
-end

data/lib/asrake/mxmlc_task.rb

@@ -1,29 +0,0 @@
-require 'rake/tasklib'
-
-require 'asrake/host'
-require 'asrake/base_compiler_task'
-require 'asrake/mxmlc_args'
-
-module ASRake
-class MxmlcTask < BaseCompilerTask
-	include MxmlcArguments_Module
-
-	# Create a swc compilation task with the given name.
-	def initialize(name = :build, args = nil)
-		super
-
-		# create directory task for output
-		directory self.output_dir
-
-		# always build until we can properly grab dependencies
-		task @name => self.output_dir do
-			self.build
-			result = c self.output
-			result << " (#{File.size(output)} bytes)" unless self.output_is_dir?
-			puts result
-		end
-
-	end
-
-end
-end

data/lib/asrake/package_task.rb

@@ -1,55 +0,0 @@
-require 'rake/tasklib'
-require 'zip/zip'
-
-module ASRake
-class PackageTask < Rake::TaskLib
-
-	attr_accessor :output
-	attr_accessor :files
-
-	attr_reader :output_file
-	attr_reader :output_dir
-
-	def initialize(name = :package)
-
-		yield self if block_given?
-
-		fail "You must define 'output' for #{self}" if output == nil
-		fail "You must define 'files' to include for #{self}" if files == nil
-
-		#define named task first so if desc was called it will be attached to it instead of the file task
-		Rake::Task.define_task name do
-			puts "#{c output} (#{File.size(output)} bytes)"
-		end
-
-		#if the task name is a hash (ie, has dependencies defined) make sure we pull out the task name from it
-		name, _ = name.first if name.is_a? Hash
-
-		@output_dir = File.dirname(output)
-		@output_file = File.basename(output)
-
-		directory output_dir
-
-		# setup file dependencies
-		file output => output_dir
-		files.each do |to, from|
-			file output => [cf(from)]
-		end
-		
-		#add output file task as a dependency to the named task created
-		task name => output
-
-		#create the zip task
-		file output do
-			rm_r output rescue nil
-			Zip::ZipFile.open(output, Zip::ZipFile::CREATE) do |zipfile|
-				files.each do |to, from|
-					zipfile.add(cf(to), cf(from))
-				end
-			end
-		end
-
-	end
-
-end
-end