buildr-hx 0.0.6.pre → 0.0.7.pre

data/VERSION

@@ -1 +1 @@
-0.0.6.pre
+0.0.7.pre

data/buildr-hx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-hx"
-  s.version = "0.0.6.pre"
+  s.version = "0.0.7.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/buildr/hx/compiler/hxas3.rb",
     "lib/buildr/hx/compiler/hxcpp.rb",
     "lib/buildr/hx/compiler/hxjs.rb",
+    "lib/buildr/hx/compiler/hxlib.rb",
     "lib/buildr/hx/compiler/hxneko.rb",
     "lib/buildr/hx/compiler/hxphp.rb",
     "lib/buildr/hx/compiler/hxswf.rb",

data/lib/buildr/hx/compiler.rb

@@ -28,6 +28,7 @@ require File.dirname(__FILE__) + '/compiler/hxphp'
 require File.dirname(__FILE__) + '/compiler/hxxml'
 require File.dirname(__FILE__) + '/compiler/hxas3'
 require File.dirname(__FILE__) + '/compiler/hxcpp'
+require File.dirname(__FILE__) + '/compiler/hxlib'
 
 Buildr::Compiler << Buildr::Haxe::Compiler::HXSWF
 Buildr::Compiler << Buildr::Haxe::Compiler::HXJS
@@ -35,4 +36,5 @@ Buildr::Compiler << Buildr::Haxe::Compiler::HXNeko
 Buildr::Compiler << Buildr::Haxe::Compiler::HXPHP
 Buildr::Compiler << Buildr::Haxe::Compiler::HXXML
 Buildr::Compiler << Buildr::Haxe::Compiler::HXAS3
-Buildr::Compiler << Buildr::Haxe::Compiler::HXCPP
+Buildr::Compiler << Buildr::Haxe::Compiler::HXCPP
+Buildr::Compiler << Buildr::Haxe::Compiler::HXLib

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

@@ -48,10 +48,28 @@ module Buildr
         end
 
         def generate_dependency_args dependencies
+          args = []
           dependencies.collect { |dep|
             spec = HaxeLib.path_to_spec(dep)
-            spec ? "-lib #{spec[:id]}:#{spec[:version]}" : "-cp #{dep}"
+            if spec
+              args << "-lib #{spec[:id]}:#{spec[:version]}"
+            elsif File.extname(dep) == ".zip" && Buildr.zip(dep).contain?("haxelib.xml")
+              xml = Zip::ZipFile.open(dep) { |zip| zip.file.read("haxelib.xml") }
+              require 'rexml/document'
+              doc = REXML::Document.new(xml)
+              id = doc.root.attribute("name")
+              version = doc.root.elements['version'].attribute("name")
+              fail "Could not install #{id}:#{version}." unless install_haxelib_zip dep
+              args << "-lib #{id}:#{version}"
+            else
+              args << "-cp #{dep}"
+            end
           }
+          args
+        end
+
+        def install_haxelib_zip zip
+          system "haxelib test #{zip}"
         end
 
         def is_test( sources, target, dependencies )

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

@@ -0,0 +1,19 @@
+module Buildr
+  module Haxe
+    module Compiler
+      class HXLib < Buildr::Compiler::Base
+
+        specify :language => :haxe,
+                :sources => :hx, :source_ext => :hx
+
+        def compile(sources, target, dependencies)
+        end
+
+        def needed?(sources, target, dependencies)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/buildr/hx/packaging/haxelib.rb

@@ -36,7 +36,7 @@ module Buildr
             include *@project.compile.sources.collect { |src| File.join(src, "**", "*") }
             xml = @project._("haxelib.xml")
             File.open(xml, 'w') {|f| f.write(haxelib_xml) }
-            include xml, :as => "haxelib.xml"
+            include xml
           end
         end
 
@@ -51,7 +51,7 @@ module Buildr
         def haxelib_xml
           buffer =''
           xml = Builder::XmlMarkup.new(:target=>buffer, :indent => 2)
-          xml.project(:name => @project.name, :url => url, :license => license) do
+          xml.project(:name => @project.name.gsub(":","-"), :url => url, :license => license) do
             xml.description @project.comment
             xml.version(@project.version, :name => @project.version)
             @tags.each { |tag| xml.tag :v => tag }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-hx
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre
+  version: 0.0.7.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2156727960 !ruby/object:Gem::Requirement
+  requirement: &2156909160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2156727960
+  version_requirements: *2156909160
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156725000 !ruby/object:Gem::Requirement
+  requirement: &2156907680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156725000
+  version_requirements: *2156907680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156720520 !ruby/object:Gem::Requirement
+  requirement: &2156894500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156720520
+  version_requirements: *2156894500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156718200 !ruby/object:Gem::Requirement
+  requirement: &2156891980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2156718200
+  version_requirements: *2156891980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156713600 !ruby/object:Gem::Requirement
+  requirement: &2156889740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156713600
+  version_requirements: *2156889740
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2156711200 !ruby/object:Gem::Requirement
+  requirement: &2156888200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156711200
+  version_requirements: *2156888200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156709320 !ruby/object:Gem::Requirement
+  requirement: &2156883040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156709320
+  version_requirements: *2156883040
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156706540 !ruby/object:Gem::Requirement
+  requirement: &2156882000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2156706540
+  version_requirements: *2156882000
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2156702960 !ruby/object:Gem::Requirement
+  requirement: &2156880660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156702960
+  version_requirements: *2156880660
 description: Build like you code - now supporting haXe
 email: dominic @nospam@ devboy.org
 executables: []
@@ -133,6 +133,7 @@ files:
 - lib/buildr/hx/compiler/hxas3.rb
 - lib/buildr/hx/compiler/hxcpp.rb
 - lib/buildr/hx/compiler/hxjs.rb
+- lib/buildr/hx/compiler/hxlib.rb
 - lib/buildr/hx/compiler/hxneko.rb
 - lib/buildr/hx/compiler/hxphp.rb
 - lib/buildr/hx/compiler/hxswf.rb
@@ -164,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 235205980454742168
+      hash: 4583123637746809088
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: