buildr-as3 0.2.31.pre → 0.2.32.pre

data/VERSION

@@ -1 +1 @@
-0.2.31.pre
+0.2.32.pre

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-as3"
-  s.version = "0.2.31.pre"
+  s.version = "0.2.32.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = "2011-12-10"
+  s.date = "2012-02-19"
   s.description = "Build like you code - now supporting ActionScript 3 & Flex"
   s.email = "dominic @nospam@ devboy.org"
   s.executables = ["buildr-as3"]

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( is_test(sources,target,dependencies) )
+          output = get_output_file(target)
           cmd_args = compiler_args(get_as3_dependencies(sources,target,dependencies), flex_sdk, output, sources)
           unless Buildr.application.options.dryrun
             trace(cmd_args.join(' '))
@@ -48,13 +48,13 @@ module Buildr
         end
 
         def needed?(sources, target, dependencies)
-          return true unless File.exist?(@project.get_as3_output(is_test(sources,target,dependencies)))
-          source_files = Dir.glob(sources.collect{|source| source = "#{source}/**/*"})
+          return true unless File.exist? get_output_file(target)
+          source_files = Dir.glob(sources.map{|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(is_test(sources,target,dependencies))).mtime
+          maxtime > File.stat(get_output_file(target)).mtime
         end
 
         private
@@ -87,8 +87,12 @@ module Buildr
           args + Array(options[:args]) + Array(options[:flexsdk].default_options)
         end
 
+        def get_output_file target
+          File.join(target.to_s, options["output"] || "#{@project.name.split(":").last}.#{self.class.packaging.to_s}")
+        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
+          sources==@project.test.compile.sources && dependencies==@project.test.compile.dependencies.map(&:to_s) && target==@project.test.compile.target.to_s
         end
 
       end

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

@@ -27,7 +27,6 @@ module Buildr
     module Packaging
 
       class AirTask < Rake::FileTask
-
         include Extension
 
         attr_writer :target_air, :src_swf, :flexsdk
@@ -109,7 +108,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
+          swf.src_swf = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
           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
+          swf.src_swf = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
           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
+          swc.src_swc = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
           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
+          swf.src_swf = File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
           swf.target_swf = file_name
         end
       end

data/lib/buildr/as3/project.rb

@@ -24,14 +24,14 @@ require "buildr"
 
 class Buildr::Project
 
-  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
+  #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
 
 end

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

@@ -47,7 +47,7 @@ module Buildr
           end
 
           def swcs flexunit_version=DEFAULT_FLEXUNIT_VERSION, flexsdk_version=DEFAULT_FLEX_SDK_VERSION, type=:as3
-            raise "type has to be :as3 or :flex" unless [:flex,:as3].include? type
+            raise "type has to be :as3 or :flex" unless [:flex, :as3].include? type
             [
                 "com.adobe.flexunit:flexunit-cilistener:swc:#{flexsdk_version}:#{flexunit_version}",
                 "com.adobe.flexunit:flexunit-aircilistener:swc:#{flexsdk_version}:#{flexunit_version}",
@@ -107,7 +107,7 @@ module Buildr
                          :headless => options[:headless] || false,
                          :display => options[:display] || 99,
                          :port => options[:port] || 1024,
-                         :swf => task.project.get_as3_output(true)
+                         :swf => get_output_file(task.project)
 
             ant.taskdef :name=>'junitreport',
                         :classname=>'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
@@ -136,6 +136,11 @@ module Buildr
           tests
         end
 
+        def get_output_file project
+          compile = project.test.compile
+          File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
+        end
+
       end
     end
   end

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

@@ -48,9 +48,9 @@ module Buildr
           version = DEFAULT_SCALA_VERSION
           Buildr.artifacts('org.scala-lang:scala-library:jar:' + version).
               map { |a|
-                a.install
-                a.to_s
-              }
+            a.install
+            a.to_s
+          }
         end
 
 
@@ -87,7 +87,7 @@ module Buildr
         include Extension
 
         def apparat_tdsi(options = {})
-          output = project.get_as3_output
+          output = get_output_file
           compile.options[:apparat].invoke
           cmd_args = []
           cmd_args << "apparat.tools.tdsi.TurboDieselSportInjection"
@@ -102,7 +102,7 @@ module Buildr
         end
 
         def apparat_reducer(options ={})
-          output = project.get_as3_output
+          output = get_output_file
           compile.options[:apparat].invoke
           cmd_args = []
           cmd_args << "apparat.tools.reducer.Reducer"
@@ -125,6 +125,10 @@ module Buildr
           end
         end
 
+        def get_output_file
+          File.join(compile.target.to_s, compile.options[:output] || "#{project.name.split(":").last}.#{compile.packaging.to_s}")
+        end
+
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-as3
 version: !ruby/object:Gem::Version
-  version: 0.2.31.pre
+  version: 0.2.32.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2160482880 !ruby/object:Gem::Requirement
+  requirement: &2154164580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160482880
+  version_requirements: *2154164580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160482000 !ruby/object:Gem::Requirement
+  requirement: &2154180480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2160482000
+  version_requirements: *2154180480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2160481120 !ruby/object:Gem::Requirement
+  requirement: &2154180000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2160481120
+  version_requirements: *2154180000
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2160480040 !ruby/object:Gem::Requirement
+  requirement: &2154179520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2160480040
+  version_requirements: *2154179520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2160478640 !ruby/object:Gem::Requirement
+  requirement: &2154179040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160478640
+  version_requirements: *2154179040
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2160477000 !ruby/object:Gem::Requirement
+  requirement: &2154178560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160477000
+  version_requirements: *2154178560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160475240 !ruby/object:Gem::Requirement
+  requirement: &2154178080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2160475240
+  version_requirements: *2154178080
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2160467560 !ruby/object:Gem::Requirement
+  requirement: &2154177600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2160467560
+  version_requirements: *2154177600
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2160465880 !ruby/object:Gem::Requirement
+  requirement: &2154177120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2160465880
+  version_requirements: *2154177120
 description: Build like you code - now supporting ActionScript 3 & Flex
 email: dominic @nospam@ devboy.org
 executables:
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3428390318605212483
+      hash: 3682499044271835405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: