turbo-sprockets-rails3 0.2.2 → 0.2.3

data/README.md

@@ -42,10 +42,12 @@ Enjoy your lightning fast deploys!
 
 ## Removing Expired Assets
 
-`turbo-sprockets-rails3` can now remove expired assets after each compile. It will run the `assets:clean_expired` task after `assets:precompile`, if the environment variable `CLEAN_EXPIRED_ASSETS` is set to `true`.
-Any assets that are no longer referenced by `manifest.yml`, and are older than 7 days (by default) will be deleted.
+`turbo-sprockets-rails3` can now remove expired assets after each compile. If the environment variable `CLEAN_EXPIRED_ASSETS` is set to `true`, the `assets:clean_expired` task will be run after `assets:precompile`.
+An asset will be deleted if it is no longer referenced by `manifest.yml`, and is more than 7 days (default) older than the **previous** compiled assets.
 
-You can expire old assets after precompile by running `CLEAN_EXPIRED_ASSETS=true rake assets:precompile`.
+Before the `assets:precompile` task runs, it stores the modification time of the current `manifest.yml` in a file called `expire_assets_after.yml`. When the `assets:clean_expired` task runs, it looks up the time in `expire_assets_after.yml`, and won't expire any assets that were created more recently than that time.
+
+To expire old assets after precompile, you should compile assets by running `CLEAN_EXPIRED_ASSETS=true rake assets:precompile`. Alternatively, you can run `rake assets:precompile assets:clean_expired`.
 
 You can configure the expiry time by setting `config.assets.expire_after` in `config/environments/production.rb`.
 An expiry time of 2 weeks could be configured with the following code:
@@ -86,13 +88,25 @@ gem "capistrano", :github => "ndbroadbent/capistrano", :branch => "assets_rollba
 
 ### Heroku
 
-You won't be able to do an 'incremental update' on heroku, since your `public/assets`
-folder will be empty at the start of each push. However, this gem can still cut your
-precompile time in half, since it only needs to compile assets once.
+I've created a Heroku Buildpack for `turbo-sprockets-rails3` that keeps your assets cached between deploys, so you only need to recompile changed assets. It will automatically expire old assets that are no longer referenced by `manifest.yml` after 7 days, so your `public/assets` folder won't grow out of control.
+
+To create a new application on Heroku using this buildpack, you can run:
+
+```bash
+heroku create --buildpack https://github.com/ndbroadbent/heroku-buildpack-turbo-sprockets.git
+```
+
+To add the buildpack to an existing app, you can run:
+
+```bash
+heroku config:add BUILDPACK_URL=https://github.com/ndbroadbent/heroku-buildpack-turbo-sprockets.git
+```
+
+#### Compiling Assets on Your Local Machine
 
-If you want to make the most of `turbo-sprockets-rails3`, you can run `assets:precompile` on your local machine and commit the compiled assets. When you push compiled assets to Heroku, it will automatically skip the `assets:precompile` task.
+You can also compile assets on your local machine, and commit the compiled assets. You might want to do this if your local machine is a lot faster than the Heroku VM, or if you also want to generate other files, such as static pages. When you push compiled assets to Heroku, it will automatically skip the `assets:precompile` task.
 
-I've automated this process in a Rake task for my own projects. My task creates a deployment repo at `tmp/heroku_deploy` so that you can keep working while deploying, and it also rebases and amends the assets commit to keep your repo's history from growing out of control. You can find the deploy task in a gist at https://gist.github.com/3802355. Save this file to `lib/tasks/deploy.rake`, and make sure you have added a `heroku` remote to your repo. You will now be able to run `rake deploy` to deploy your app to Heroku.
+I've automated this process in a Rake task for my own projects. The task creates a deployment repo at `tmp/heroku_deploy` so that you can keep working while deploying, and it also rebases and amends the assets commit to keep your repo's history from growing out of control. You can find the deploy task in a gist at https://gist.github.com/3802355. Save this file to `lib/tasks/deploy.rake`, and make sure you have added a `heroku` remote to your repo. You will now be able to run `rake deploy` to deploy your app to Heroku.
 
 ## Debugging
 

data/lib/turbo-sprockets/tasks/assets.rake

@@ -61,6 +61,18 @@ namespace :assets do
       env    = Rails.application.assets
       target = File.join(::Rails.public_path, config.assets.prefix)
 
+      # Create `public/assets/expire_assets_after.yml`, containing the timestamp of the previous manifest.yml
+      # (Only for first run)
+      if digest.nil?
+        manifest_path = config.assets.manifest || target
+        manifest_file = File.join(manifest_path, 'manifest.yml')
+        if File.exist?(manifest_file)
+          File.open(File.join(target, 'expire_assets_after.yml'), 'w') do |f|
+            f.puts YAML.dump(:expire_assets_after => File.mtime(manifest_file))
+          end
+        end
+      end
+
       # If processing non-digest assets, and compiled digest files are
       # present, then generate non-digest assets from existing assets.
       # It is assumed that `assets:precompile:nondigest` won't be run manually
@@ -108,9 +120,10 @@ namespace :assets do
   end
 
   namespace :clean_expired do
-    task :all do
+    task :all => ["assets:environment"] do
       # Remove assets that aren't referenced by manifest.yml,
-      # and are older than `config.assets.expire_after` (default 7 days).
+      # and are older than `config.assets.expire_after` (default 7 days),
+      # counting from the **previous** compile.
       config = ::Rails.application.config
       expire_after = config.assets.expire_after || 7.days
       public_asset_path = File.join(::Rails.public_path, config.assets.prefix)
@@ -126,8 +139,19 @@ namespace :assets do
         logical_path = asset.sub("#{public_asset_path}/", '')
 
         unless logical_path.in?(known_assets)
+          # If 'expire_assets_after.yml' file exists, use that as the base time for expire_after
+          # Otherwise, use Time.now
+          expire_after_base_time = Time.now
+
+          expire_after_file = File.join(::Rails.public_path, config.assets.prefix, 'expire_assets_after.yml')
+          if File.exist?(expire_after_file)
+            if time = YAML.load_file(expire_after_file)[:expire_assets_after]
+              expire_after_base_time = time
+            end
+          end
+
           # Delete asset if older than expire_after seconds
-          if File.mtime(asset) < (Time.now - expire_after)
+          if File.mtime(asset) < (expire_after_base_time - expire_after)
             ::Rails.logger.debug "Removing expired asset: #{logical_path}"
             FileUtils.rm_f asset
           end

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-sprockets-rails3
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets