buildr-as3 0.2.18 → 0.2.19

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-07-22}
+  s.date = %q{2011-07-26}
   s.default_executable = %q{buildr-as3}
   s.description = %q{Build like you code - now supporting ActionScript 3 & Flex}
   s.email = %q{dominic @nospam@ devboy.org}

data/lib/buildr/as3/compiler/base.rb

@@ -39,7 +39,7 @@ module Buildr
         def compile(sources, target, dependencies) #:nodoc:
           check_options options, COMPILE_OPTIONS
           flex_sdk = options[:flexsdk].invoke
-          output = @project.get_as3_output( target, options )
+          output = @project.get_as3_output( is_test(sources,target,dependencies) )
           cmd_args = []
           cmd_args << "-jar" << @compiler_jar
           cmd_args << "+flexlib" << "#{flex_sdk.home}/frameworks"
@@ -60,13 +60,13 @@ module Buildr
         end
 
         def needed?(sources, target, dependencies)
-          return true unless File.exist?(@project.get_as3_output(target, options))
+          return true unless File.exist?(@project.get_as3_output(is_test(sources,target,dependencies)))
           source_files = Dir.glob(sources.collect{|source| source = "#{source}/**/*"})
           dep_files = dependencies.collect{ |dep|
             File.directory?(dep) ? Dir.glob("#{dep}/**/*") : dep
           }.flatten
           maxtime = (source_files + dep_files).collect{ |file| File.stat(file).mtime }.max || Time.at(0)
-          maxtime > File.stat(@project.get_as3_output(target, options)).mtime
+          maxtime > File.stat(@project.get_as3_output(is_test(sources,target,dependencies))).mtime
         end
 
         private
@@ -78,6 +78,10 @@ module Buildr
           args + Array(options[:other]) + Array(options[:flexsdk].default_options)
         end
 
+        def is_test( sources, target, dependencies )
+          sources==@project.test.compile.sources && dependencies==@project.test.compile.dependencies.collect{|dep|dep.to_s} && target==@project.test.compile.target.to_s
+        end
+
       end
     end
   end

data/lib/buildr/as3/packaging/air.rb

@@ -109,7 +109,7 @@ module Buildr
       def package_as_air(file_name)
         fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
         AirTask.define_task(file_name).tap do |swf|
-          swf.src_swf = get_as3_output(compile.target,compile.options)
+          swf.src_swf = get_as3_output
           swf.target_air = file_name
           swf.flexsdk = compile.options[:flexsdk]
         end

data/lib/buildr/as3/packaging/airi.rb

@@ -103,7 +103,7 @@ module Buildr
       def package_as_airi(file_name)
         fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
         AiriTask.define_task(file_name).tap do |swf|
-          swf.src_swf = get_as3_output(compile.target,compile.options)
+          swf.src_swf = get_as3_output
           swf.target_air = file_name
           swf.flexsdk = compile.options[:flexsdk]
         end

data/lib/buildr/as3/packaging/swc.rb

@@ -69,7 +69,7 @@ module Buildr
       def package_as_swc(file_name)
         fail("Package types don't match! :swc vs. :#{compile.packaging.to_s}") unless compile.packaging == :swc
         SwcTask.define_task(file_name).tap do |swc|
-          swc.src_swc = get_as3_output(compile.target,compile.options)
+          swc.src_swc = get_as3_output
           swc.target_swc = file_name
         end
       end

data/lib/buildr/as3/packaging/swf.rb

@@ -69,7 +69,7 @@ module Buildr
       def package_as_swf(file_name)
         fail("Package types don't match! :swf vs. :#{compile.packaging.to_s}") unless compile.packaging == :swf
         SwfTask.define_task(file_name).tap do |swf|
-          swf.src_swf = get_as3_output(compile.target,compile.options)
+          swf.src_swf = get_as3_output
           swf.target_swf = file_name
         end
       end

data/lib/buildr/as3/project.rb

@@ -24,10 +24,13 @@ require "buildr"
 
 class Buildr::Project
 
-  def get_as3_output( target, options )
-#    return compile.options[:output] if compile.options.has_key? :output
-    return "#{target}/#{File.basename(options[:main].to_s, File.extname(options[:main].to_s))}.swf" if compile.packaging == :swf
-    return "#{target}/#{name.gsub(":", "-")}.swc" if compile.packaging == :swc
+  def get_as3_output( is_test = false )
+    compile_task = is_test ? test.compile : compile
+    target = compile_task.target
+    options = compile_task.options
+    return compile_task.options[:output] if compile_task.options.has_key? :output
+    return "#{target}/#{File.basename(options[:main].to_s, File.extname(options[:main].to_s))}.swf" if compile_task.packaging == :swf
+    return "#{target}/#{name.gsub(":", "-")}.swc" if compile_task.packaging == :swc
     fail("Could not guess output file for #{name}")
   end
 

data/lib/buildr/as3/test/flexunit4.rb

@@ -101,7 +101,7 @@ module Buildr
                          :localTrusted => options[:localTrusted] || true,
                          :headless => options[:headless] || false,
                          :display => options[:display] || 99,
-                         :swf => task.project.get_as3_output(task.project.test.compile.target, task.project.test.compile.options)
+                         :swf => task.project.get_as3_output(true)
 
                          ant.taskdef :name=>'junitreport',
                                      :classname=>'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',

data/lib/buildr/as3/toolkits/apparat.rb

@@ -81,7 +81,7 @@ module Buildr
         end
 
         def apparat_tdsi(options = {})
-          output = project.get_as3_output(compile.target, compile.options)
+          output = project.get_as3_output
           apparat_tk = compile.options[:apparat].invoke
           cmd_args = []
           cmd_args << "#{apparat_tk.tdsi}"
@@ -96,7 +96,7 @@ module Buildr
         end
 
         def apparat_reducer(options ={})
-          output = project.get_as3_output(compile.target, compile.options)
+          output = project.get_as3_output
           apparat_tk = compile.options[:apparat].invoke
           cmd_args = []
           cmd_args << "#{apparat_tk.reducer}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-as3
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000 +02:00
+date: 2011-07-26 00:00:00.000000000 +02:00
 default_executable: buildr-as3
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157795560 !ruby/object:Gem::Requirement
+  requirement: &2157586120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157795560
+  version_requirements: *2157586120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157794440 !ruby/object:Gem::Requirement
+  requirement: &2157585540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157794440
+  version_requirements: *2157585540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157793220 !ruby/object:Gem::Requirement
+  requirement: &2157585000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2157793220
+  version_requirements: *2157585000
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2157792660 !ruby/object:Gem::Requirement
+  requirement: &2157584500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2157792660
+  version_requirements: *2157584500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2157792020 !ruby/object:Gem::Requirement
+  requirement: &2157583960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157792020
+  version_requirements: *2157583960
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2157791300 !ruby/object:Gem::Requirement
+  requirement: &2157579380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157791300
+  version_requirements: *2157579380
 description: Build like you code - now supporting ActionScript 3 & Flex
 email: dominic @nospam@ devboy.org
 executables:
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1990077160539623563
+      hash: 2111872876044542933
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: