buildr-as3 0.2.21.pre → 0.2.22.pre

data/VERSION

@@ -1 +1 @@
-0.2.21.pre
+0.2.22.pre

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-as3"
-  s.version = "0.2.21.pre"
+  s.version = "0.2.22.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-10-02"
+  s.date = "2011-10-03"
   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

@@ -40,7 +40,7 @@ module Buildr
           check_options options, COMPILE_OPTIONS
           flex_sdk = options[:flexsdk].invoke
           output = @project.get_as3_output( is_test(sources,target,dependencies) )
-          cmd_args = compiler_args(@project.compile.as3_dependencies, flex_sdk, output, sources)
+          cmd_args = compiler_args(get_as3_dependencies(sources,target,dependencies), flex_sdk, output, sources)
           unless Buildr.application.options.dryrun
             trace(cmd_args.join(' '))
             Java::Commands.java cmd_args
@@ -59,6 +59,10 @@ module Buildr
 
         private
 
+        def get_as3_dependencies(sources, target, dependencies)
+          is_test(sources,target,dependencies) ? @project.test.compile.as3_dependencies : @project.compile.as3_dependencies
+        end
+
         def compiler_args(as3_dependencies, flex_sdk, output, sources)
           cmd_args = []
           cmd_args << "-jar" << compiler_jar

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

@@ -38,14 +38,14 @@ class Buildr::CompileTask
     specs.each do |spec|
       case spec
         when Hash
-          spec.each{ |key,value|
+          spec.each { |key,value|
             raise "key needs to be :library, :external or :include" unless [:library, :external, :include].include? key
-            @as3_dependencies[key] |= Buildr.artifacts(value).uniq
-            @dependencies |= Buildr.artifacts(value).uniq
+            @as3_dependencies[key] += Buildr.artifacts(value).uniq
+            @dependencies += Buildr.artifacts(value).uniq
           }
         else
-          @as3_dependencies[:library] |= Buildr.artifacts(spec).uniq
-          @dependencies |= Buildr.artifacts(spec).uniq
+          @as3_dependencies[:library] += Buildr.artifacts(spec).uniq
+          @dependencies += Buildr.artifacts(spec).uniq
       end
     end
     self

data/spec/as3/compiler/task_spec.rb

@@ -22,6 +22,16 @@ describe Buildr::CompileTask do
     define('foo').compile.with(:library => "myLibrary.swc").as3_dependencies[:library].should include(File.join( pwd, "myLibrary.swc"))
   end
 
+  it "should add dependencies array to library type when :library is specified" do
+    define('foo').compile.with(:library => ["myLibrary1.swc","myLibrary2.swc"]).as3_dependencies[:library].
+        should include(File.join( pwd, "myLibrary1.swc"),File.join( pwd, "myLibrary2.swc"))
+  end
+
+  it "should add dependencies array to @dependencies type when :library is specified" do
+    define('foo').compile.with(:library => ["myLibrary1.swc","myLibrary2.swc"]).dependencies.
+        should include(File.join( pwd, "myLibrary1.swc"),File.join( pwd, "myLibrary2.swc"))
+  end
+
   it "should add dependency to @dependencies when :library is specified" do
     define('foo').compile.with(:library => "myLibrary.swc").dependencies.should include(File.join( pwd, "myLibrary.swc"))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-as3
 version: !ruby/object:Gem::Version
-  version: 0.2.21.pre
+  version: 0.2.22.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151744700 !ruby/object:Gem::Requirement
+  requirement: &2157156780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151744700
+  version_requirements: *2157156780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151766980 !ruby/object:Gem::Requirement
+  requirement: &2157155420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151766980
+  version_requirements: *2157155420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152340580 !ruby/object:Gem::Requirement
+  requirement: &2157153800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2152340580
+  version_requirements: *2157153800
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2152706800 !ruby/object:Gem::Requirement
+  requirement: &2157152500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2152706800
+  version_requirements: *2157152500
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152872700 !ruby/object:Gem::Requirement
+  requirement: &2157151460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152872700
+  version_requirements: *2157151460
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2153061720 !ruby/object:Gem::Requirement
+  requirement: &2157149740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153061720
+  version_requirements: *2157149740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153282540 !ruby/object:Gem::Requirement
+  requirement: &2157148500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153282540
+  version_requirements: *2157148500
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2153459860 !ruby/object:Gem::Requirement
+  requirement: &2157146860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2153459860
+  version_requirements: *2157146860
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2153550220 !ruby/object:Gem::Requirement
+  requirement: &2157145020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153550220
+  version_requirements: *2157145020
 description: Build like you code - now supporting ActionScript 3 & Flex
 email: dominic @nospam@ devboy.org
 executables:
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1180282325764251786
+      hash: -2275844012035397510
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: