buildr-hx 0.0.12.pre → 0.0.14.pre

data/VERSION

@@ -1 +1 @@
-0.0.12.pre
+0.0.14.pre

data/buildr-hx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-hx"
-  s.version = "0.0.12.pre"
+  s.version = "0.0.14.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
@@ -42,6 +42,9 @@ Gem::Specification.new do |s|
     "lib/buildr/hx/packaging.rb",
     "lib/buildr/hx/packaging/haxelib.rb",
     "lib/buildr/hx/packaging/hxlib.rb",
+    "lib/buildr/hx/test.rb",
+    "lib/buildr/hx/test/base.rb",
+    "lib/buildr/hx/test/munit.rb",
     "rake/jeweler.rb",
     "rake/jeweler_prerelease_tasks.rb",
     "rake/pre_release_gemspec.rb",

data/lib/buildr/hx.rb

@@ -2,4 +2,5 @@ require 'buildr'
 
 require File.dirname(__FILE__) + '/../buildr/hx/core'
 require File.dirname(__FILE__) + '/../buildr/hx/compiler'
-require File.dirname(__FILE__) + '/../buildr/hx/packaging'
+require File.dirname(__FILE__) + '/../buildr/hx/packaging'
+require File.dirname(__FILE__) + '/../buildr/hx/test'

data/lib/buildr/hx/compiler/haxe_compiler_base.rb

@@ -14,16 +14,18 @@ module Buildr
         def compile(sources, target, dependencies)
           check_options options, COMPILE_OPTIONS
           @output = get_output_file(target)
+          is_test = is_test?(sources, target, dependencies)
           args = ["haxe"]
+          sources += @project.compile.sources.map(&:to_s) if is_test
           args += generate_source_args sources
           args += generate_dependency_args dependencies
           args += base_compiler_args
           args += compiler_args if respond_to? :compiler_args
           unless Buildr.application.options.dryrun
-            create_hxml args, is_test(sources,target,dependencies)
+            create_hxml args, is_test
             appwd = Dir.pwd
             Dir.chdir @project.base_dir
-            sh args.join " "
+            fail("Compilation failed!") unless sh args.join " "
             Dir.chdir appwd
           end
         end
@@ -82,17 +84,19 @@ module Buildr
           system "haxelib test #{zip}"
         end
 
-        def is_test(sources, target, dependencies)
+        def is_test?(sources, target, dependencies)
           test_task = @project.test.compile
           sources==test_task.sources && dependencies==test_task.dependencies.collect { |dep| dep.to_s } && target==test_task.target.to_s
         end
 
         def get_output_file target
-          File.join(target.to_s, options["output"] || "#{@project.name.split(":").last}.#{self.class.packaging.to_s}")
+          file = "#{@project.name.split(":").last}.#{self.class.packaging.to_s}"
+          file = options[:output] unless options[:output].nil?
+          File.join(target.to_s, file)
         end
 
-        def create_hxml( args, test )
-          file = File.join(@project.base_dir, options[:hxml] || test ? "test.hxml" : "compile.hxml")
+        def create_hxml( args, is_test )
+          file = File.join(@project.base_dir, options[:hxml] || is_test ? "test.hxml" : "compile.hxml")
           puts "Creating hxml '#{file}'"
           with_path = ["cp", "swf-lib", "swf", "js", "as3", "cpp", "neko", "xml", "swf9", "resource"].map{|p|"-#{p}"}
           File.open(file, 'w') {|f| f.write(

data/lib/buildr/hx/test.rb

@@ -0,0 +1,4 @@
+require File.dirname(__FILE__)+"/test/base"
+require File.dirname(__FILE__)+"/test/munit"
+
+Buildr::TestFramework << Buildr::Haxe::Test::MUnit

data/lib/buildr/hx/test/base.rb

@@ -0,0 +1,25 @@
+require 'buildr'
+
+module Buildr
+  module Haxe
+    module Test
+      class TestFramework::Haxe < TestFramework::Base
+
+        class << self
+
+          def applies_to?(project) #:nodoc:
+            project.test.compile.language == :haxe
+          end
+
+          def dependencies
+            unless @dependencies
+              super
+            end
+            @dependencies
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/buildr/hx/test/munit.rb

@@ -0,0 +1,85 @@
+require 'buildr'
+require 'fileutils'
+require "rexml/document"
+
+module Buildr
+  module Haxe
+    module Test
+
+      class MUnit < TestFramework::Haxe
+
+        DEFAULT_VERSION = "0.9.2.1"
+
+        "src=test
+        bin=bin/test/build
+        report=bin/test/report
+        hxml=test.hxml
+        classPaths=lib"
+
+        def tests(dependencies) #:nodoc:
+          candidates = []
+          task.project.test.compile.sources.each do |source|
+            files = Dir["#{source}/**/*Test.hx"] + Dir["#{source}/**/*Tests.hx"]
+            files.each { |item|
+              if File.dirname(item) == source
+                candidates << File.basename(item, '.*')
+              else
+                candidates << "#{File.dirname(item).gsub!(source+"/", "").gsub!("/", ".")}.#{File.basename(item, '.*')}"
+              end
+            }
+          end
+          candidates
+        end
+
+        def run(tests, dependencies) #:nodoc:
+
+          unless Buildr.application.options.dryrun
+            create_munit_config
+            appwd = Dir.pwd
+            Dir.chdir task.project.base_dir
+
+            cmd = "haxelib run munit test"
+            cmd << " -browser #{options[:browser]}" unless options[:browser].nil?
+            cmd << " -keep-browser-alive" if options[:keepbrowseralive]
+            cmd << " -coverage" if options[:coverage]
+
+            fail "Problems...oh noes!" unless system cmd
+
+            Dir.chdir appwd
+
+            Dir[File.join(task.project.path_to(:reports, :munit),"**/TEST-*.xml")].each do |xml_report|
+              doc = REXML::Document.new File.new(xml_report)
+              name = doc.elements["testsuite"].attributes["name"]
+              failures = Integer(doc.elements["testsuite"].attributes["failures"])
+              errors = Integer(doc.elements["testsuite"].attributes["errors"])
+              tests -= [name] unless failures + errors == 0
+            end
+
+          end
+          tests
+        end
+
+        def create_munit_config
+          file = File.join(task.project.base_dir, ".munit")
+          puts "Creating munit config '#{file}'"
+          File.open(file, 'w') { |f| f.write(
+              "version=#{options[:version].nil? ? DEFAULT_VERSION : options[:version]}
+               src=#{task.project.path_to(:source, :test, :hx)}
+               bin=#{task.project.test.compile.target}
+               report=#{task.project.path_to(:reports, :munit)}
+               hxml=#{get_hxml_file}
+               classPaths=#{task.project.compile.sources.map(&:to_s).join(',')}"
+          ) }
+        end
+
+        def get_hxml_file
+          file = "test.hxml"
+          file = task.project.test.compile.options[:hxml] unless task.project.test.compile.options[:hxml].nil?
+          File.join(task.project.base_dir, file)
+        end
+
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-hx
 version: !ruby/object:Gem::Version
-  version: 0.0.12.pre
+  version: 0.0.14.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2155535100 !ruby/object:Gem::Requirement
+  requirement: &2156831100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2155535100
+  version_requirements: *2156831100
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2155536540 !ruby/object:Gem::Requirement
+  requirement: &2156830600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155536540
+  version_requirements: *2156830600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155537980 !ruby/object:Gem::Requirement
+  requirement: &2156830100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2155537980
+  version_requirements: *2156830100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155539420 !ruby/object:Gem::Requirement
+  requirement: &2156820400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2155539420
+  version_requirements: *2156820400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2155540860 !ruby/object:Gem::Requirement
+  requirement: &2156819920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155540860
+  version_requirements: *2156819920
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2155542300 !ruby/object:Gem::Requirement
+  requirement: &2156819420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155542300
+  version_requirements: *2156819420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155549780 !ruby/object:Gem::Requirement
+  requirement: &2156818920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2155549780
+  version_requirements: *2156818920
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2155661940 !ruby/object:Gem::Requirement
+  requirement: &2156818440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2155661940
+  version_requirements: *2156818440
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2155762360 !ruby/object:Gem::Requirement
+  requirement: &2156817920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2155762360
+  version_requirements: *2156817920
 description: Build like you code - now supporting haXe
 email: dominic @nospam@ devboy.org
 executables: []
@@ -143,6 +143,9 @@ files:
 - lib/buildr/hx/packaging.rb
 - lib/buildr/hx/packaging/haxelib.rb
 - lib/buildr/hx/packaging/hxlib.rb
+- lib/buildr/hx/test.rb
+- lib/buildr/hx/test/base.rb
+- lib/buildr/hx/test/munit.rb
 - rake/jeweler.rb
 - rake/jeweler_prerelease_tasks.rb
 - rake/pre_release_gemspec.rb
@@ -165,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1921785001659672374
+      hash: 800551186459514666
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: