jammit 0.2.6 → 0.2.7

data/jammit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.2.6'         # Keep version in sync with jammit.rb
+  s.version   = '0.2.7'         # Keep version in sync with jammit.rb
   s.date      = '2009-11-19'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"

data/lib/jammit.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 
   ROOT = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -133,7 +133,7 @@ require 'closure-compiler'
 require 'activesupport'
 
 # Load initial configuration before the rest of Jammit.
-Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH)
+Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH) if defined?(RAILS_ENV)
 
 # Jammit Core:
 require 'jammit/compressor'

data/lib/jammit/command_line.rb

@@ -27,6 +27,7 @@ Options:
       parse_options
       ensure_configuration_file
       Jammit.load_configuration(@options[:config_path])
+      Jammit.packager.force = @options[:force]
       Jammit.packager.precache_all(@options[:output_folder], @options[:base_url])
     end
 
@@ -46,9 +47,10 @@ Options:
     # *--base-url*...
     def parse_options
       @options = {
-        :config_path => Jammit::DEFAULT_CONFIG_PATH,
-        :output_folder => nil,
-        :base_url => nil
+        :config_path    => Jammit::DEFAULT_CONFIG_PATH,
+        :output_folder  => nil,
+        :base_url       => nil,
+        :force          => false
       }
       @option_parser = OptionParser.new do |opts|
         opts.on('-o', '--output PATH', 'output folder for packages (default: "public/assets")') do |output_folder|
@@ -60,6 +62,9 @@ Options:
         opts.on('-u', '--base-url URL', 'base URL for MHTML (ex: "http://example.com")') do |base_url|
           @options[:base_url] = base_url
         end
+        opts.on('-f', '--force', 'force a rebuild of all assets') do |force|
+          @options[:force] = force
+        end
         opts.on_tail('-v', '--version', 'display Jammit version') do
           puts "Jammit version #{Jammit::VERSION}"
           exit

data/lib/jammit/packager.rb

@@ -9,11 +9,16 @@ module Jammit
     # In Rails, the difference between a path and an asset URL is "public".
     PATH_TO_URL = /\A#{ASSET_ROOT}(\/public)?/
 
+    # Set force to false to allow packages to only be rebuilt when their source
+    # files have changed since the last time their package was built.
+    attr_accessor :force
+
     # Creating a new Packager will rebuild the list of assets from the
     # Jammit.configuration. When assets.yml is being changed on the fly,
     # create a new Packager.
     def initialize
       @compressor = Compressor.new
+      @force = true
       @config = {
         :css => (Jammit.configuration[:stylesheets] || {}).symbolize_keys,
         :js  => (Jammit.configuration[:javascripts] || {}).symbolize_keys,
@@ -29,11 +34,13 @@ module Jammit
     # Ask the packager to precache all defined assets, along with their gzip'd
     # versions. In order to prebuild the MHTML stylesheets, we need to know the
     # base_url, because IE only supports MHTML with absolute references.
+    # Unless forced, will only rebuild assets whose source files have been
+    # changed since their last package build.
     def precache_all(output_dir=nil, base_url=nil)
       output_dir ||= "#{ASSET_ROOT}/public/#{Jammit.package_path}"
-      @config[:js].keys.each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir) }
-      @config[:jst].keys.each {|p| cache(p, 'jst', pack_templates(p),  output_dir) }
-      @config[:css].keys.each do |p|
+      cacheable(:js, output_dir).each  {|p| cache(p, 'js',  pack_javascripts(p), output_dir) }
+      cacheable(:jst, output_dir).each {|p| cache(p, 'jst', pack_templates(p),  output_dir) }
+      cacheable(:css, output_dir).each do |p|
         cache(p, 'css', pack_stylesheets(p), output_dir)
         if Jammit.embed_images
           cache(p, 'css', pack_stylesheets(p, :datauri), output_dir, :datauri)
@@ -94,6 +101,20 @@ module Jammit
       Dir[absolute ? glob : File.join(ASSET_ROOT, glob)]
     end
 
+    # Return a list of all of the packages that should be cached. If "force" is
+    # true, this is all of them -- otherwise only the packages whose source
+    # files have changed since the last package build.
+    def cacheable(extension, output_dir)
+      names = @packages[extension].keys
+      return names if @force
+      return names.select do |name|
+        pack    = package_for(name, extension)
+        cached  = File.join(output_dir, Jammit.filename(name, extension))
+        since   = File.exists?(cached) && File.mtime(cached)
+        !since || pack[:paths].any? {|src| File.mtime(src) > since }
+      end
+    end
+
     # Compiles the list of assets that goes into each package. Runs an ordered
     # list of Dir.globs, taking the merged unique result.
     def create_packages(config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jeremy Ashkenas