buildr-hx 0.0.5.pre → 0.0.6.pre

data/VERSION

@@ -1 +1 @@
-0.0.5.pre
+0.0.6.pre

data/buildr-hx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-hx"
-  s.version = "0.0.5.pre"
+  s.version = "0.0.6.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]

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/project'
+require File.dirname(__FILE__) + '/../buildr/hx/project'
+require File.dirname(__FILE__) + '/../buildr/hx/packaging'

data/lib/buildr/hx/core/haxe_lib.rb

@@ -50,6 +50,10 @@ class HaxeLib < Rake::FileTask
     "#{id}:#{version}"
   end
 
+  def to_spec_hash
+    {:id => @id, :version => @version}
+  end
+
 end
 
 module Buildr

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

@@ -26,53 +26,59 @@ require "fileutils"
 module Buildr
   module Haxe
     module Packaging
+      include Extension
 
       class HaxelibTask < Buildr::ZipTask
 
-        include Extension
-
-        attr_writer :target_swc, :src_swc
-        attr_reader :target_swc, :src_swc
-
         def initialize(*args) #:nodoc:
           super
           enhance do
-            fail "File not found: #{src_swc}" unless File.exists? src_swc
-            merge src_swc
+            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"
           end
         end
 
-        def needed?
-          return true unless File.exists?(target_swc)
-          File.stat(src_swc).mtime > File.stat(target_swc).mtime
-        end
+        attr_accessor :url, :license, :tags, :user
 
-        first_time do
-          desc 'create swc package task'
-          Project.local_task('package_swc')
+        protected
+
+        def associate(project)
+          @project = project
         end
 
-        before_define do |project|
-          HaxelibTask.define_task('package_swc').tap do |package_swc|
-            package_swc
+        def haxelib_xml
+          buffer =''
+          xml = Builder::XmlMarkup.new(:target=>buffer, :indent => 2)
+          xml.project(:name => @project.name, :url => url, :license => license) do
+            xml.description @project.comment
+            xml.version(@project.version, :name => @project.version)
+            @tags.each { |tag| xml.tag :v => tag }
+            xml.user :name => @user
+            haxelib_dependencies.each{ |dep| xml.depends :name => dep[:id], :version => dep[:version] }
           end
+          buffer
         end
 
-      end
+        def haxelib_dependencies
+          haxelib_deps = []
+          @project.compile.dependencies.each{ |dep| haxelib_deps << dep.to_spec_hash if dep.is_a? HaxeLib }
+          haxelib_deps
+        end
 
-      def package_swc(&block)
-        task("package_haxelib").enhance &block
       end
 
-      protected
-
-      def package_as_swc(file_name)
-        HaxelibTask.define_task(file_name).tap do |swc|
-          swc.src_swc = get_as3_output
-          swc.target_swc = file_name
+      def package_as_haxelib(file_name)
+        HaxelibTask.define_task(file_name).tap do |haxelib|
+          haxelib.send :associate, self
         end
       end
 
+      def package_as_haxelib_spec(spec)
+        spec.merge :type=>:zip
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-hx
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre
+  version: 0.0.6.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: &2156625840 !ruby/object:Gem::Requirement
+  requirement: &2156727960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2156625840
+  version_requirements: *2156727960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156624780 !ruby/object:Gem::Requirement
+  requirement: &2156725000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156624780
+  version_requirements: *2156725000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156623740 !ruby/object:Gem::Requirement
+  requirement: &2156720520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156623740
+  version_requirements: *2156720520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156622640 !ruby/object:Gem::Requirement
+  requirement: &2156718200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2156622640
+  version_requirements: *2156718200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156621380 !ruby/object:Gem::Requirement
+  requirement: &2156713600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156621380
+  version_requirements: *2156713600
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2156619960 !ruby/object:Gem::Requirement
+  requirement: &2156711200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156619960
+  version_requirements: *2156711200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156619080 !ruby/object:Gem::Requirement
+  requirement: &2156709320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2156619080
+  version_requirements: *2156709320
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156617780 !ruby/object:Gem::Requirement
+  requirement: &2156706540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2156617780
+  version_requirements: *2156706540
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2156617200 !ruby/object:Gem::Requirement
+  requirement: &2156702960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156617200
+  version_requirements: *2156702960
 description: Build like you code - now supporting haXe
 email: dominic @nospam@ devboy.org
 executables: []
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3438841382965443593
+      hash: 235205980454742168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: