jake 0.9.2 → 0.9.3

data/bin/jake

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 require 'rubygems'
 require 'oyster'
-require 'jake'
+require File.dirname(__FILE__) + '/../lib/jake'
 
 spec = Oyster.spec do
   name    'jake -- automated build tool for JavaScript projects'
@@ -27,5 +27,5 @@ begin; opts = spec.parse
 rescue Oyster::HelpRendered; exit
 end
 
-Jake.build(File.expand_path(opts[:unclaimed].first || '.'), opts[:force])
+Jake.build(File.expand_path(opts[:unclaimed].first || '.'), opts)
 

data/lib/jake.rb

@@ -1,12 +1,12 @@
 module Jake
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
   
   CONFIG_FILE = 'jake.yml'
   HELPER_FILE = 'Jakefile'
   
-  def self.build(path, force = false)
-    build = Build.new(path)
-    build.force! if force
+  def self.build(path, options = {})
+    build = Build.new(path, nil, options)
+    build.force! if options[:force]
     build.run!
   end
   
@@ -26,6 +26,12 @@ module Jake
   
   class Helper
     attr_accessor :build
+    attr_reader :options
+    
+    def initialize(options = {})
+      @options = options
+    end
+    
     def scope; binding; end
   end
 end

data/lib/jake/build.rb

@@ -9,9 +9,9 @@ module Jake
     include Enumerable
     attr_reader :helper
     
-    def initialize(dir, config = nil)
+    def initialize(dir, config = nil, options = {})
       @dir = File.expand_path(dir)
-      @helper = Helper.new
+      @helper = Helper.new(options)
       
       path = "#{dir}/#{CONFIG_FILE}"
       yaml = File.read(path)

data/lib/jake/buildable.rb

@@ -16,7 +16,14 @@ module Jake
       @code = {}
     end
     
+    def parent
+      return nil unless @config[:extends]
+      @parent ||= @build.package(@config[:extends])
+    end
+    
     def directory
+      dir = @config[:directory]
+      return parent.directory if parent && !dir
       "#{ @build.source_directory }/#{ @config[:directory] }"
     end
     
@@ -38,13 +45,14 @@ module Jake
     def header
       content = @config[:header] ?
           Jake.read("#{ directory }/#{ @config[:header] }") :
-          @build.header
+          (parent ? parent.header : @build.header)
       ERB.new(content).result(@build.helper.scope).strip
     end
     
     def packer_settings(build_name)
       global = @build.packer_settings(build_name)
       local  = @config[:packer]
+      return parent.packer_settings(build_name) if parent && !local
       return false if global == false or local == false
       {}.merge(global || {}).merge(local || {})
     end

data/lib/jake/bundle.rb

@@ -2,7 +2,8 @@ module Jake
   class Bundle < Buildable
     
     def files
-      @config[:files].map { |pkg| @build.package(pkg).files }.flatten
+      base = parent ? parent.files : []
+      base + @config[:files].map { |pkg| @build.package(pkg).files }.flatten
     end
     
     def source

data/lib/jake/package.rb

@@ -2,7 +2,8 @@ module Jake
   class Package < Buildable
     
     def files
-      @config[:files].map do |path|
+      base = parent ? parent.files : []
+      base + @config[:files].map do |path|
         path = "#{ directory }/#{ path }"
         File.file?(path) ? path : "#{ path }.js"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jake
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - James Coglan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-14 00:00:00 +00:00
+date: 2009-05-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.12.1
     version: 
 description: Jake is a tool for building JavaScript library packages from source code. It allows builds to be specified using simple YAML files, and provides a command-line tool for generating package files. It also allows ERB to be embedded in JavaScript source code so that build data or new code can be generated during the build process.
 email: 
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jake
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Jake is a tool for building JavaScript library packages from source code