jake 1.0.1 → 1.1.0

data/lib/jake/buildable.rb

@@ -1,15 +1,8 @@
 module Jake
-  # A +Buildable+ represents a group of files that may be merged to form a single
-  # build file. There are two subtypes of +Buildable+; a +Package+ takes several
-  # source files and produces a build file, and a +Bundle+ takes several +Package+
-  # build files to produce another build file. This class should be considered
-  # abstract as some of its methods must be filled in by subtypes.
   class Buildable
     
     attr_reader :name
     
-    # Create a new +Buildable+ using a +Build+ container, a name and a configuration
-    # hash, typically a subsection of jake.yml.
     def initialize(build, name, config)
       @build, @name = build, name
       @config = case config
@@ -20,21 +13,17 @@ module Jake
       @code = {}
     end
     
-    # Returns the parent +Buildable+ set using the +extends+ option, or +nil+ if
-    # there is no parent.
     def parent
       return nil unless @config[:extends]
       @parent ||= @build.package(@config[:extends])
     end
     
-    # Returns the source directory for this package.
     def directory
       dir = @config[:directory]
       return parent.directory if parent && !dir
       Jake.path(@build.source_directory, @config[:directory])
     end
     
-    # Returns the path to the output file from this package for the given build name.
     def build_path(build_name)
       suffix = @build.use_suffix?(build_name) ? "-#{ build_name }" : ""
       @build.layout == 'together' ?
@@ -42,42 +31,38 @@ module Jake
           Jake.path(@build.build_directory, build_name, "#{ @name }.js")
     end
     
-    # Returns +true+ if the build file for the given build name is out of date and
-    # should be regenerated.
     def build_needed?(name)
       return true if @build.forced?
       path = build_path(name)
       return true unless File.file?(path)
       build_time = File.mtime(path)
-      files.any? { |path| File.mtime(path) > build_time }
+      
+      input_files = files + @build.config_files
+      input_files.any? { |path| File.mtime(path) > build_time }
     end
     
-    # Returns the header string being used for this package.
     def header
       content = @config[:header] ?
           Jake.read(Jake.path( directory, @config[:header])) :
           (parent ? parent.header : @build.header)
-      Jake.erb(content).result(@build.helper.scope).strip
+      
+      header = Jake.erb(content).result(@build.helper.scope)
+      return nil if header == ''
+      header
     end
     
-    # Returns the PackR settings to use for this package during the given build.
     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
+      return {:minify => false} if global == false or local == false
       {}.merge(global || {}).merge(local || {})
     end
     
-    # Returns a hash containing any metadata attached to the package in the config.
     def meta
       @config[:meta] || {}
     end
     
-    # Generates all the build files for this package by looping over all the
-    # required builds and compressing the source code using each set of minification
-    # options. Files are only generated if they are out of date or the build has
-    # been forced.
     def write!
       @build.each do |name, settings|
         path = build_path(name)
@@ -85,7 +70,15 @@ module Jake
         
         @build.helper.build = name.to_s
         FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, 'wb') { |f| f.write( (header + "\n\n" + code(name)).strip ) }
+        
+        output_code = code(name)
+        source_map = output_code.source_map if output_code.respond_to?(:source_map)
+        
+        File.open(path, 'w') { |f| f.write(output_code) }
+        
+        if source_map and source_map.enabled?
+          File.open(source_map.filename, 'w') { |f| f.write(source_map.to_s) }
+        end
         
         @build.fire(:file_created, self, name, path)
         

data/lib/jake/bundle.rb

@@ -1,25 +1,27 @@
 module Jake
   class Bundle < Buildable
     
-    # Returns a list of paths to all the files used to build this package.
     def files
       base = parent ? parent.files : []
       base + @config[:files].map { |pkg| @build.package(pkg).files }.flatten
     end
     
-    # Returns the full uncompressed source code of this package, before
-    # ERB processing. ERB output will be build-dependent; this method
-    # simply builds the raw template for further processing by other
-    # methods.
     def source
-      @source ||= @config[:files].map { |pkg| @build.package(pkg).source }.join("\n\n\n")
+      @source ||= @config[:files].map { |pkg| @build.package(pkg).source }.join("\n")
     end
     
-    # Returns the result of building the source template and minifying
-    # the output using the given named set of PackR settings.
-    def code(name)
-      joiner = (packer_settings(name) == false) ? "\n\n\n" : "\n"
-      @code[name] ||= @config[:files].map { |pkg| @build.package(pkg).code(name) }.join(joiner)
+    def code(build_name)
+      return @code[build_name] if @code[build_name]
+      
+      packer = packer_settings(build_name)
+      joiner = (packer[:minify] == false) ? "\n" : ""
+      
+      code = @config[:files].map { |pkg| @build.package(pkg).code(build_name, false) }.join(joiner)
+      if head = header
+        code = head + code
+      end
+      
+      @code[build_name] = code
     end
     
   end

data/lib/jake/helper.rb

@@ -1,6 +1,4 @@
 module Jake
-  # The +Helper+ class stores helper methods that can be called from ERB
-  # when generating source code. Use +jake_helper+ to define new helpers.
   class Helper
     attr_accessor :build
     attr_reader :options

data/lib/jake/package.rb

@@ -1,7 +1,6 @@
 module Jake
   class Package < Buildable
     
-    # Returns a list of paths to all the files used to build this package.
     def files
       base = parent ? parent.files : []
       base + @config[:files].map do |path|
@@ -10,21 +9,60 @@ module Jake
       end
     end
     
-    # Returns the full uncompressed source code of this package, before
-    # ERB processing. ERB output will be build-dependent; this method
-    # simply builds the raw template for further processing by other
-    # methods.
     def source
-      @source ||= files.map { |path| Jake.read(path) }.join("\n\n\n")
+      @source ||= files.map { |path| Jake.read(path) }.join("\n")
     end
     
-    # Returns the result of building the source template and minifying
-    # the output using the given named set of PackR settings.
-    def code(name)
-      return @code[name] if @code[name]
-      settings = packer_settings(name)
-      output = Jake.erb(source).result(@build.helper.scope)
-      @code[name] = settings ? Packr.pack(output, settings) : output
+    def code(build_name, with_header = true)
+      if cached = @code[build_name]
+        return with_header ? cached : cached.code
+      end
+      
+      packer = packer_settings(build_name)
+      
+      head = header
+      head = head.strip unless packer[:minify] == false
+      
+      packer = packer.merge(:header => head)
+      code = code_for_packer(packer, build_name)
+      
+      cached = @code[build_name] = code
+      with_header ? code : code.code
+    end
+    
+  private
+    
+    def code_for_packer(packer, build_name)
+      if source_map = packer.delete(:source_map)
+        code = code_for_source_map(packer, build_path(build_name), source_map)
+      else
+        code = compile_erb(source)
+      end
+      Packr.pack(code, packer)
+    end
+    
+    def code_for_source_map(packer, output_path, source_map)
+      packer.update(:output_file => output_path)
+      
+      if source_map == :source
+        code_for_original_map(packer)
+      else
+        source_path = Packr::FileSystem.relative_path(build_path(source_map), output_path)
+        [{:code => code(source_map), :source => source_path}]
+      end  
+    end
+    
+    def code_for_original_map(packer)
+      files.map do |file|
+        {
+          :code   => compile_erb(Jake.read(file)),
+          :source => Packr::FileSystem.relative_path(file, packer[:output_file])
+        }
+      end
+    end
+    
+    def compile_erb(template)
+      Jake.erb(template).result(@build.helper.scope)
     end
     
   end

metadata

@@ -1,130 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jake
-version: !ruby/object:Gem::Version 
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-09-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventful
+  requirement: &10784480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *10784480
+- !ruby/object:Gem::Dependency
   name: packr
+  requirement: &10783700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *10783700
+- !ruby/object:Gem::Dependency
   name: oyster
+  requirement: &10869700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+  prerelease: false
+  version_requirements: *10869700
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &10868800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: ""
-email: 
-- jcoglan@googlemail.com
-executables: 
+  prerelease: false
+  version_requirements: *10868800
+description: 
+email: jcoglan@gmail.com
+executables:
 - jake
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- README.rdoc
+files:
 - History.txt
-- Manifest.txt
-- README.txt
-files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- Rakefile
+- README.rdoc
 - bin/jake
 - lib/jake.rb
+- lib/jake/bundle.rb
 - lib/jake/helper.rb
 - lib/jake/build.rb
-- lib/jake/buildable.rb
 - lib/jake/package.rb
-- lib/jake/bundle.rb
-- test/test_jake.rb
-- test/jake.yml
-- test/Jakefile
-- test/packages.erb
-- test/expected/combo/box.js
-- test/expected/combo/box-min.js
-- test/expected/sub/dir/foo.js
-- test/expected/sub/dir/foo-min.js
-- test/expected/sub/path/bar.js
-- test/expected/sub/path/bar-min.js
-- test/expected/basic.js
-- test/expected/basic-min.js
-- test/expected/ext.js
-- test/expected/ext-min.js
-- test/expected/LISTING
-- test/expected/README
-- test/src/foo/bar.js
-- test/src/foo/foo.js
-- test/src/basic.js
-- test/src/basic-ext.js
-- test/src/head.js
-- test/src/head2.js
-has_rdoc: true
+- lib/jake/buildable.rb
 homepage: http://github.com/jcoglan/jake
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.txt
-require_paths: 
+- README.rdoc
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: jake
-rubygems_version: 1.3.3
+rubyforge_project: 
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- test/test_jake.rb
+summary: Build tools for JavaScript projects
+test_files: []

data/Manifest.txt

@@ -1,33 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/jake
-lib/jake.rb
-lib/jake/helper.rb
-lib/jake/build.rb
-lib/jake/buildable.rb
-lib/jake/package.rb
-lib/jake/bundle.rb
-test/test_jake.rb
-test/jake.yml
-test/Jakefile
-test/packages.erb
-test/expected/combo/box.js
-test/expected/combo/box-min.js
-test/expected/sub/dir/foo.js
-test/expected/sub/dir/foo-min.js
-test/expected/sub/path/bar.js
-test/expected/sub/path/bar-min.js
-test/expected/basic.js
-test/expected/basic-min.js
-test/expected/ext.js
-test/expected/ext-min.js
-test/expected/LISTING
-test/expected/README
-test/src/foo/bar.js
-test/src/foo/foo.js
-test/src/basic.js
-test/src/basic-ext.js
-test/src/head.js
-test/src/head2.js