buildr-as3 0.2.25.pre → 0.2.26.pre

data/VERSION

@@ -1 +1 @@
-0.2.25.pre
+0.2.26.pre

data/buildr-as3.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-as3"
-  s.version = "0.2.25.pre"
+  s.version = "0.2.26.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-31"
+  s.date = "2011-11-02"
   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/test/flexunit4.rb

@@ -105,6 +105,7 @@ module Buildr
                          :localTrusted => options[:localTrusted] || true,
                          :headless => options[:headless] || false,
                          :display => options[:display] || 99,
+                         :port => options[:port] || 1024,
                          :swf => task.project.get_as3_output(true)
 
             ant.taskdef :name=>'junitreport',

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

@@ -23,9 +23,11 @@ module Buildr
   module AS3
     module Toolkits
       class ApparatToolkit < Buildr::AS3::Toolkits::ZipToolkiteBase
+        DEFAULT_SCALA_VERSION = "2.8.0"
+
         attr_reader :home, :asmifier, :concrete, :coverage, :dump,
                     :jitb, :reducer, :stripper, :tdsi, :asm_swc,
-                    :ersatz_swc, :lzma_decoder_swc, :scala_home
+                    :ersatz_swc, :lzma_decoder_swc
 
         def initialize(version)
           @version = version
@@ -41,6 +43,21 @@ module Buildr
           self
         end
 
+        def scala_dependencies
+          Buildr.repositories.remote << 'http://scala-tools.org/repo-releases'
+          version = DEFAULT_SCALA_VERSION
+          Buildr.artifacts('org.scala-lang:scala-library:jar:' + version).
+              map { |a|
+                a.install
+                a.to_s
+              }
+        end
+
+
+        def apparat_dependencies
+          Dir.glob("#{@home}/*.jar")
+        end
+
         private
 
         def generate_url_from_version(version)
@@ -69,43 +86,32 @@ module Buildr
       module ApparatTasks
         include Extension
 
-        first_time do
-          Project.local_task('apparat_tdsi')
-          Project.local_task('apparat_reducer')
-        end
-
-        before_define do |project|
-        end
-
-        after_define do |project|
-        end
-
         def apparat_tdsi(options = {})
           output = project.get_as3_output
-          apparat_tk = compile.options[:apparat].invoke
+          compile.options[:apparat].invoke
           cmd_args = []
-          cmd_args << "#{apparat_tk.tdsi}"
+          cmd_args << "apparat.tools.tdsi.TurboDieselSportInjection"
           cmd_args << "-i #{output}"
           cmd_args << "-o #{output}"
           reserved = []
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key} #{value}"
+            cmd_args << "-#{key}" << "#{value}"
           end
           call_system(cmd_args)
         end
 
         def apparat_reducer(options ={})
           output = project.get_as3_output
-          apparat_tk = compile.options[:apparat].invoke
+          compile.options[:apparat].invoke
           cmd_args = []
-          cmd_args << "#{apparat_tk.reducer}"
+          cmd_args << "apparat.tools.reducer.Reducer"
           cmd_args << "-i #{output}"
           cmd_args << "-o #{output}"
           reserved = []
           options.to_hash.reject { |key, value| reserved.include?(key) }.
               each do |key, value|
-                cmd_args << "-#{key} #{value}"
+            cmd_args << "-#{key}" << "#{value}"
           end
           call_system(cmd_args)
         end
@@ -113,9 +119,9 @@ module Buildr
         private
 
         def call_system(args)
-          trace("Calling APPARAT: " + args.join(" "))
-          unless system(args.join(" "))
-            puts "Failed to execute apparat:\n#{args.join(" ")}"
+          unless Buildr.application.options.dryrun
+            cp = compile.options[:apparat].scala_dependencies + compile.options[:apparat].apparat_dependencies
+            sh (['java', '-classpath', cp.join(":")] + args).join(" ")
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-as3
 version: !ruby/object:Gem::Version
-  version: 0.2.25.pre
+  version: 0.2.26.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157730600 !ruby/object:Gem::Requirement
+  requirement: &2157990540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157730600
+  version_requirements: *2157990540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157729680 !ruby/object:Gem::Requirement
+  requirement: &2157998060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157729680
+  version_requirements: *2157998060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157728540 !ruby/object:Gem::Requirement
+  requirement: &2158001920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2157728540
+  version_requirements: *2158001920
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2157727280 !ruby/object:Gem::Requirement
+  requirement: &2158005380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2157727280
+  version_requirements: *2158005380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157726160 !ruby/object:Gem::Requirement
+  requirement: &2158008820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157726160
+  version_requirements: *2158008820
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2157725120 !ruby/object:Gem::Requirement
+  requirement: &2158029680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157725120
+  version_requirements: *2158029680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157723920 !ruby/object:Gem::Requirement
+  requirement: &2158139360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2157723920
+  version_requirements: *2158139360
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2157723060 !ruby/object:Gem::Requirement
+  requirement: &2158138340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2157723060
+  version_requirements: *2158138340
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2157722060 !ruby/object:Gem::Requirement
+  requirement: &2158137140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157722060
+  version_requirements: *2158137140
 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: 2529146064826319507
+      hash: -2799429616627566509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: