buildr-hx 0.0.4.pre → 0.0.5.pre

data/VERSION

@@ -1 +1 @@
-0.0.4.pre
+0.0.5.pre

data/buildr-hx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "buildr-hx"
-  s.version = "0.0.4.pre"
+  s.version = "0.0.5.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dominic Graefen"]
@@ -38,6 +38,8 @@ Gem::Specification.new do |s|
     "lib/buildr/hx/compiler/hxxml.rb",
     "lib/buildr/hx/core.rb",
     "lib/buildr/hx/core/haxe_lib.rb",
+    "lib/buildr/hx/packaging.rb",
+    "lib/buildr/hx/packaging/haxelib.rb",
     "lib/buildr/hx/project.rb",
     "rake/jeweler.rb",
     "rake/jeweler_prerelease_tasks.rb",

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

@@ -15,6 +15,7 @@ module Buildr
           check_options options, COMPILE_OPTIONS
           args = ["haxe"]
           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
@@ -23,7 +24,6 @@ module Buildr
         end
 
         def needed?(sources, target, dependencies)
-          puts "deps:", dependencies
           return true unless File.exist?(@project.get_hx_output(is_test(sources,target,dependencies)))
           source_files = Dir.glob(sources.collect{ |source| "#{source}/**/*"})
           dep_files = dependencies.collect{ |dep|
@@ -47,6 +47,13 @@ module Buildr
           sources.collect { |source| "-cp #{source}"}
         end
 
+        def generate_dependency_args dependencies
+          dependencies.collect { |dep|
+            spec = HaxeLib.path_to_spec(dep)
+            spec ? "-lib #{spec[:id]}:#{spec[:version]}" : "-cp #{dep}"
+          }
+        end
+
         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

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

@@ -9,6 +9,12 @@ class HaxeLib < Rake::FileTask
       File.join( home, id, version.gsub(".",",") )
     end
 
+    def path_to_spec path
+      id, version = path.gsub(home,"").split(File::SEPARATOR)
+      return nil unless id && version && path.include?(home)
+      {:id => id, :version => version.gsub(",",".")}
+    end
+
     def lookup spec
       id, version = spec.split(":")
       task = HaxeLib.define_task( spec_to_path spec )
@@ -49,7 +55,7 @@ end
 module Buildr
   def haxelib spec
     haxelib = HaxeLib.lookup(spec)
-    haxelib.invoke
+    #haxelib.invoke
     haxelib
   end
 end

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

@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2011 by Dominic Graefen / http://devboy.org
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+require 'buildr'
+require "fileutils"
+
+module Buildr
+  module Haxe
+    module Packaging
+
+      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
+          end
+        end
+
+        def needed?
+          return true unless File.exists?(target_swc)
+          File.stat(src_swc).mtime > File.stat(target_swc).mtime
+        end
+
+        first_time do
+          desc 'create swc package task'
+          Project.local_task('package_swc')
+        end
+
+        before_define do |project|
+          HaxelibTask.define_task('package_swc').tap do |package_swc|
+            package_swc
+          end
+        end
+
+      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
+        end
+      end
+
+    end
+  end
+end

data/lib/buildr/hx/packaging.rb

@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2011 by Dominic Graefen / http://devboy.org
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+require File.dirname(__FILE__)+"/packaging/haxelib"
+
+class Buildr::Project
+  include Buildr::Haxe::Packaging
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildr-hx
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
+  version: 0.0.5.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: &2153597100 !ruby/object:Gem::Requirement
+  requirement: &2156625840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2153597100
+  version_requirements: *2156625840
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2153595980 !ruby/object:Gem::Requirement
+  requirement: &2156624780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153595980
+  version_requirements: *2156624780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153594080 !ruby/object:Gem::Requirement
+  requirement: &2156623740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153594080
+  version_requirements: *2156623740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153592680 !ruby/object:Gem::Requirement
+  requirement: &2156622640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2153592680
+  version_requirements: *2156622640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153590620 !ruby/object:Gem::Requirement
+  requirement: &2156621380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153590620
+  version_requirements: *2156621380
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2153589900 !ruby/object:Gem::Requirement
+  requirement: &2156619960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153589900
+  version_requirements: *2156619960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153587800 !ruby/object:Gem::Requirement
+  requirement: &2156619080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153587800
+  version_requirements: *2156619080
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2153586700 !ruby/object:Gem::Requirement
+  requirement: &2156617780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *2153586700
+  version_requirements: *2156617780
 - !ruby/object:Gem::Dependency
   name: buildr
-  requirement: &2153585680 !ruby/object:Gem::Requirement
+  requirement: &2156617200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153585680
+  version_requirements: *2156617200
 description: Build like you code - now supporting haXe
 email: dominic @nospam@ devboy.org
 executables: []
@@ -139,6 +139,8 @@ files:
 - lib/buildr/hx/compiler/hxxml.rb
 - lib/buildr/hx/core.rb
 - lib/buildr/hx/core/haxe_lib.rb
+- lib/buildr/hx/packaging.rb
+- lib/buildr/hx/packaging/haxelib.rb
 - lib/buildr/hx/project.rb
 - rake/jeweler.rb
 - rake/jeweler_prerelease_tasks.rb
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -556094840901275259
+      hash: -3438841382965443593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: