Merge pull request #67 from msalzburg/sprockets-task

Refactor rake task to implement #clean and #clobber based on Rake::SprocketsTask

lib/sinatra/asset_pipeline/task.rb

@@ -1,28 +1,58 @@
 require 'rake'
-require 'rake/tasklib'
 require 'rake/sprocketstask'
+require 'sprockets'
 
 module Sinatra
   module AssetPipeline
-    class Task < Rake::TaskLib
-      def initialize(app_klass)
+    class Task < Rake::SprocketsTask
+      attr_accessor :app
+
+      def initialize(app = nil)
+        self.app = app
+        super()
+      end
+
+      def environment
+        app ? app.sprockets : super
+      end
+
+      def assets
+        app ? app.assets_precompile : super
+      end
+
+      def manifest
+        app ? Sprockets::Manifest.new(environment.index, app.assets_public_path) : super
+      end
+
+      def define
         namespace :assets do
-          desc "Precompile assets"
+          %w( precompile clean clobber ).each { |task| Rake::Task[task].clear if Rake::Task.task_defined?(task) }
+
+          desc "Compile all assets"
           task :precompile do
-            environment = app_klass.sprockets
-            manifest = ::Sprockets::Manifest.new(environment.index, app_klass.assets_public_path)
-            manifest.compile(app_klass.assets_precompile)
+            with_logger do
+              manifest.compile(assets)
+            end
+          end
+
+          desc "Remove old compiled assets"
+          task :clean, [:keep] do |t, args|
+            with_logger do
+              manifest.clean(Integer(args.keep || self.keep))
+            end
           end
 
-          desc "Clean assets"
-          task :clean do
-            FileUtils.rm_rf(app_klass.assets_public_path)
+          desc "Remove compiled assets"
+          task :clobber do
+            with_logger do
+              manifest.clobber
+            end
           end
         end
       end
 
-      def self.define!(app_klass)
-        self.new app_klass
+      def self.define!(app)
+        self.new(app)
       end
     end
   end

spec/asset_pipeline/task_spec.rb

@@ -6,20 +6,22 @@
   include_context "assets"
 
   before(:all) { Dir.chdir "spec" }
+
+  let(:json_manifest) do
+    manifest_path = 'public/assets/.sprockets-manifest-*.json'
+    globbed = Dir.glob(manifest_path)
+    JSON.parse File.read(globbed.first)
+  end
 
   describe "assets:precompile" do
-    it "precompiles assets" do
-      Rake::Task['assets:precompile'].invoke
-
-      manifest_path = 'public/assets/.sprockets-manifest-*.json'
-      globbed = Dir.glob(manifest_path)
+    before { Rake::Task['assets:precompile'].invoke }
 
-      expect(globbed).to_not be_empty
-      expect(File.exists?(globbed.first)).to be true
-
-      manifest = JSON.parse File.read(globbed.first)
+    it "generates a manifest" do
+      expect(json_manifest).not_to be_empty
+    end
 
-      manifest["files"].each_key do |file|
+    it "precompiles assets" do
+      json_manifest["files"].each_key do |file|
         expect(File.exists?("public/assets/#{file}")).to be true
         expect(File.read("public/assets/#{file}")).to eq js_content  if file.end_with? '.js'
         expect(File.read("public/assets/#{file}")).to eq css_content if file.end_with? '.css'
@@ -28,9 +30,23 @@
   end
 
   describe "assets:clean" do
-    it "cleans precompiled assets" do
-      Rake::Task['assets:clean'].invoke
+    before { Rake::Task['assets:precompile'].invoke }
+
+    context 'with default keep' do
+      it "removes only outdated compiled assets" do
+        Rake::Task['assets:clean'].invoke
+
+        expect(Dir['public/assets']).not_to be_empty
+      end
+    end
+  end
+
+  describe "assets:clopper" do
+    before { Rake::Task['assets:precompile'].invoke }
 
+    it 'removes all compiled assets' do
+      expect(Dir['public/assets']).not_to be_empty
+      Rake::Task['assets:clobber'].invoke
       expect(Dir['public/assets']).to be_empty
     end
   end