jake 0.9.1 → 0.9.2

data/lib/jake.rb

@@ -1,5 +1,5 @@
 module Jake
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
   
   CONFIG_FILE = 'jake.yml'
   HELPER_FILE = 'Jakefile'
@@ -26,14 +26,15 @@ module Jake
   
   class Helper
     attr_accessor :build
-    def get_binding; binding; end
+    def scope; binding; end
   end
 end
 
-require File.dirname(__FILE__) + '/jake/build'
-require File.dirname(__FILE__) + '/jake/buildable'
-require File.dirname(__FILE__) + '/jake/package'
-require File.dirname(__FILE__) + '/jake/bundle'
+require 'erb'
+
+%w(build buildable package bundle).each do |file|
+  require File.dirname(__FILE__) + '/jake/' + file
+end
 
 def jake(name, &block)
   Jake::Helper.class_eval do

data/lib/jake/build.rb

@@ -14,7 +14,9 @@ module Jake
       @helper = Helper.new
       
       path = "#{dir}/#{CONFIG_FILE}"
-      @config = Jake.symbolize_hash( config || YAML.load(File.read(path)) )
+      yaml = File.read(path)
+      
+      @config = Jake.symbolize_hash( config || YAML.load(ERB.new(yaml).result(@helper.scope)) )
       
       helpers = "#{dir}/#{HELPER_FILE}"
       load helpers if File.file?(helpers)
@@ -45,13 +47,13 @@ module Jake
     end
     
     def package(name)
-      @packages[name.to_sym]
+      @packages[name.to_sym] || @bundles[name.to_sym]
     end
     
     def run!
       @packages.each { |name, pkg| pkg.write! }
       @bundles.each  { |name, pkg| pkg.write! }
-      @helper.after_build(self) if @helper.respond_to? :after_build
+      @helper.after_build(self) if @helper.respond_to?(:after_build)
     end
     
     def build_directory
@@ -69,7 +71,15 @@ module Jake
     end
     
     def packer_settings(build_name)
-      @builds[build_name] || false
+      build = @builds[build_name.to_sym]
+      return false unless build
+      build[:packer].nil? ? build : build[:packer]
+    end
+    
+    def use_suffix?(build_name)
+      build = @builds[build_name.to_sym]
+      return true unless build
+      build[:suffix] != false
     end
     
     def layout

data/lib/jake/buildable.rb

@@ -21,8 +21,9 @@ module Jake
     end
     
     def build_path(build_name)
+      suffix = @build.use_suffix?(build_name) ? "-#{ build_name }" : ""
       @build.layout == 'together' ?
-          "#{ @build.build_directory }/#{ @name }-#{ build_name }.js" :
+          "#{ @build.build_directory }/#{ @name }#{ suffix }.js" :
           "#{ @build.build_directory }/#{ build_name }/#{ @name }.js"
     end
     
@@ -38,7 +39,7 @@ module Jake
       content = @config[:header] ?
           Jake.read("#{ directory }/#{ @config[:header] }") :
           @build.header
-      ERB.new(content).result(@build.helper.get_binding)
+      ERB.new(content).result(@build.helper.scope).strip
     end
     
     def packer_settings(build_name)

data/lib/jake/package.rb

@@ -1,5 +1,3 @@
-require 'erb'
-
 module Jake
   class Package < Buildable
     
@@ -17,7 +15,7 @@ module Jake
     def code(name)
       return @code[name] if @code[name]
       settings = packer_settings(name)
-      output = ERB.new(source).result(@build.helper.get_binding)
+      output = ERB.new(source).result(@build.helper.scope)
       @code[name] = settings ? Packr.pack(output, settings) : output
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jake
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - James Coglan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-11 00:00:00 +01:00
+date: 2008-11-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency