buildr-as3 0.1.19 → 0.1.20

data/README.rdoc

@@ -2,8 +2,23 @@
 
 "build like you code" - now supporting ActionScript 3 & Flex
 
+= Contributing to buildr_as3
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
 = Changelog
 
+== 0.1.20
+
+* [FIXED] directories of dependencies are now added as source folders in all compilers
+* [FEATURE] added :append option (Array) to add additional parameters to the compiler
+
 == 0.1.19
 
 * [FEATURE] compile.with now works with directories, which allows to use other as3-source-folders to be referenced in your project.
@@ -37,16 +52,6 @@
 * Updated compiler-wrapper for Adobe AIR (":airmxmlc" & ":aircompc")
 * Implemented packaging task for .air files "package(:air).sign(...).include(...)"
 
-= Contributing to buildr_as3
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
 = Copyright
 
 Copyright (c) 2011 Dominic Graefen. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-as3}
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
-  s.date = %q{2011-02-20}
+  s.date = %q{2011-02-23}
   s.description = %q{Build like you code - now supporting ActionScript 3 & Flex}
   s.email = %q{dominic @nospam@ devboy.org}
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/buildr/as3/flexsdk.rb",
     "lib/buildr/as3/ide/fdt4.rb",
     "lib/buildr/as3/packaging.rb",
+    "lib/buildr/as3/tests.rb",
     "test/helper.rb",
     "test/test_buildr_as3.rb"
   ]

data/lib/buildr/as3.rb

@@ -26,6 +26,7 @@ require "#{File.dirname(__FILE__)}/as3/doc"
 require "#{File.dirname(__FILE__)}/as3/alchemy"
 require "#{File.dirname(__FILE__)}/as3/apparat"
 require "#{File.dirname(__FILE__)}/as3/ide/fdt4"
+require "#{File.dirname(__FILE__)}/as3/tests"
 include Buildr::AS3::Flex
 include Buildr::AS3::Apparat
 include Buildr::AS3::Alchemy

data/lib/buildr/as3/apparat.rb

@@ -127,8 +127,6 @@ module Buildr
             cmd_args << "-#{key} #{value}"
           end
           ENV["PATH"] = "#{apparat_tk.scala_home}/bin#{File::PATH_SEPARATOR}#{ENV["PATH"]}" if apparat_tk.scala_home && !ENV["PATH"].include?("#{apparat_tk.scala_home}/bin")
-#          puts "path:", ENV["PATH"]
-#          puts "tdsi:",cmd_args.join(" "), system(cmd_args.join " ")
           system(cmd_args.join " ")
         end
 

data/lib/buildr/as3/compiler.rb

@@ -25,6 +25,19 @@ module Buildr
   module AS3
     module Compiler
       module CompilerUtils
+
+        def reserved_options
+          [:flexsdk, :main, :apparat, :output, :append]
+        end
+
+        def append_args( cmd_args, append_args )
+          unless append_args.nil? || append_args.empty?
+            append_args.each do |arg|
+              cmd_args << arg
+            end
+          end
+        end
+
         def self.get_output(project, target, package, options)
           return options[:output] if options.has_key? :output
           return "#{target}/#{File.basename(options[:main].to_s, File.extname(options[:main].to_s))}.swf" if package == :swf
@@ -77,12 +90,16 @@ module Buildr
         end
 
         def move_dependency_dirs_to_source( sources, dependencies )
+          moves = []
           dependencies.each do |dependency|
             if File.directory? dependency
-              dependencies.delete dependency
-              sources << dependency
+              moves << dependency
             end
           end
+          moves.each do |move|
+            dependencies.delete move
+            sources << move
+          end
         end
       end
 
@@ -102,6 +119,7 @@ module Buildr
         include CompilerUtils
 
         def compile(sources, target, dependencies)
+          puts dependencies.join("\n")
           flex_sdk = options[:flexsdk].invoke
           output = CompilerUtils::get_output(project, target, :swf, options)
           move_dependency_dirs_to_source( sources, dependencies)
@@ -111,12 +129,12 @@ module Buildr
           cmd_args << options[:main]
           cmd_args << "-output" << output
           cmd_args << "-load-config" << flex_sdk.flex_config
+          append_args(cmd_args,options[:append])
           sources.each {|source| cmd_args << "-source-path+=#{source}"}
 #          cmd_args << "-source-path" << sources.join(" ")
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
-          reserved = [:flexsdk, :main, :apparat]
-          options.to_hash.reject { |key, value| reserved.include?(key) }.
+          options.to_hash.reject { |key, value| reserved_options.include?(key) }.
               each do |key, value|
             cmd_args << "-#{key}=#{value}"
           end
@@ -124,6 +142,7 @@ module Buildr
             cmd_args << "-#{key}=#{value}"
           end
 
+          puts "args:", cmd_args
           unless Buildr.application.options.dryrun
             Java::Commands.java cmd_args
           end
@@ -160,8 +179,7 @@ module Buildr
           sources.each {|source| cmd_args << "-source-path+=#{source}"}
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
-          reserved = [:flexsdk, :main, :apparat]
-          options.to_hash.reject { |key, value| reserved.include?(key) }.
+          options.to_hash.reject { |key, value| reserved_options.include?(key) }.
               each do |key, value|
             cmd_args << "-#{key}=#{value}"
           end
@@ -200,9 +218,8 @@ module Buildr
           cmd_args << "-load-config" << flex_sdk.flex_config
           sources.each {|source| cmd_args << "-include-sources+=#{source}"}
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
-          reserved = [:flexsdk, :main, :apparat]
           options[:debug] = Buildr.options.debug.to_s
-          options.to_hash.reject { |key, value| reserved.include?(key) }.
+          options.to_hash.reject { |key, value| reserved_options.include?(key) }.
               each do |key, value|
             cmd_args << "-#{key}=#{value}"
           end
@@ -243,8 +260,7 @@ module Buildr
           sources.each {|source| cmd_args << "-include-sources+=#{source}"}
           cmd_args << "-library-path+=#{dependencies.join(",")}" unless dependencies.empty?
           options[:debug] = Buildr.options.debug.to_s
-          reserved = [:flexsdk, :main, :apparat]
-          options.to_hash.reject { |key, value| reserved.include?(key) }.
+          options.to_hash.reject { |key, value| reserved_options.include?(key) }.
               each do |key, value|
             cmd_args << "-#{key}=#{value}"
           end
@@ -252,6 +268,7 @@ module Buildr
             cmd_args << "-#{key}=#{value}"
           end
 
+
           unless Buildr.application.options.dryrun
             Java::Commands.java cmd_args
           end

data/lib/buildr/as3/tests.rb

@@ -0,0 +1,54 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'buildr/core/test'
+require 'buildr/core/build'
+require 'buildr/core/compile'
+require 'buildr/java/ant'
+
+
+module Buildr
+
+  class FlexUnit4 < TestFramework::Base
+
+    class << self
+      taskdef_spec = "org.flexunit:flexUnitTasks:jar:4.1.0"
+       def applies_to?(project) #:nodoc:
+        project.test.compile.language == :actionscript
+      end
+    end
+
+#    def initialize
+#      puts "FlexUnit4 init"
+#    end
+
+    def tests(dependencies) #:nodoc:
+      puts "FlexUnit4 run"
+      []
+    end
+
+    def run(tests, dependencies) #:nodoc:
+      puts "FlexUnit4 run"
+      Buildr.ant('flexunit') do |ant|
+        taskdef = Buildr.artifact(FlexUnit4.taskdef_spec)
+        taskdef.invoke
+        ant.taskdef :name=>'flexunit', :resource=>"flexUnitTasks.tasks", :classpath=>taskdef.to_s
+      end
+    end
+  end
+
+end
+
+Buildr::TestFramework.add Buildr::FlexUnit4

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-as3
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Dominic Graefen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - lib/buildr/as3/flexsdk.rb
 - lib/buildr/as3/ide/fdt4.rb
 - lib/buildr/as3/packaging.rb
+- lib/buildr/as3/tests.rb
 - test/helper.rb
 - test/test_buildr_as3.rb
 has_rdoc: true