capistrano-local-precompile 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a436fa1a9cfd2227b84d1f2c21058b61e0a3fed
-  data.tar.gz: 85a2e546921e79e2679e7715a1d366a474eb8548
+  metadata.gz: 644ce2bff333643050f8d23e36e3a4b997beebfb
+  data.tar.gz: 90e77669bed672c85d0d85a18b1cefd36ac748c2
 SHA512:
-  metadata.gz: 88141a695286cf2cd90b06de926384c16dc47b08906ae70051a4a578495987777ba740f0c4e7b485576c4b0c9f8f24331de0cec4e9b67ab576f6850aa0a0bc73
-  data.tar.gz: 7f35e6060e38f1b14a4248fecdba06c55cc6243b6556e0de021d3fd86ad40714f01d11a23f3b4d824d0ab578eaf76194a27b8c24e42ec8c4c285699982c63c22
+  metadata.gz: 327e6ba7b98758a78fa4f32e55d8692477560d66f402848e092c036554eaee345e6659c99ca87982fde7995a1977f802c1f8c1ec082103a4bc9b0da76ef2be3b
+  data.tar.gz: e245dd1789bff46cbe55f6b46798652157d87d5e4302407068ba49e279cf6312f9e8578988b16531f0ca26728a652df51413b47eeb4c8ff4e798d6170602d79a

data/lib/capistrano-local-precompile/version.rb

@@ -1,3 +1,3 @@
 module CapistranoLocalPrecompile
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/capistrano/local_precompile.rb

@@ -6,34 +6,30 @@ module Capistrano
     def self.load_into(configuration)
       configuration.load do
 
-        set(:precompile_cmd)   { "RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} #{rake} assets:precompile" }
+        set(:precompile_env)   { rails_env }
+        set(:precompile_cmd)   { "RAILS_ENV=#{precompile_env.to_s.shellescape} #{asset_env} #{rake} assets:precompile" }
         set(:cleanexpired_cmd) { "RAILS_ENV=#{rails_env.to_s.shellescape} #{asset_env} #{rake} assets:clean_expired" }
         set(:assets_dir)       { "public/assets" }
-
-        set(:turbosprockets_enabled)    { false }
-        set(:turbosprockets_backup_dir) { "public/.assets" }
-        set(:rsync_cmd)                 { "rsync -av" }
+        set(:rsync_cmd)        { "rsync -av" }
 
         before "deploy:assets:precompile", "deploy:assets:prepare"
+        before "deploy:assets:symlink", "deploy:assets:remove_manifest"
+
         after "deploy:assets:precompile", "deploy:assets:cleanup"
 
         namespace :deploy do
           namespace :assets do
 
+            desc "remove manifest file from remote server"
+            task :remove_manifest do
+              run "rm -f #{fetch(:assets_dir)}/manifest*.json"
+            end
+
             task :cleanup, :on_no_matching_servers => :continue  do
-              if fetch(:turbosprockets_enabled)
-                run_locally "mv #{fetch(:assets_dir)} #{fetch(:turbosprockets_backup_dir)}"
-              else
-                run_locally "rm -rf #{fetch(:assets_dir)}"
-              end
+              run_locally "rm -rf #{fetch(:assets_dir)}"
             end
 
             task :prepare, :on_no_matching_servers => :continue  do
-              if fetch(:turbosprockets_enabled)
-                run_locally "mkdir -p #{fetch(:turbosprockets_backup_dir)}"
-                run_locally "mv #{fetch(:turbosprockets_backup_dir)} #{fetch(:assets_dir)}"
-                run_locally "#{fetch(:cleanexpired_cmd)}"
-              end
               run_locally "#{fetch(:precompile_cmd)}"
             end
 

data/spec/configuration_spec.rb

@@ -11,6 +11,10 @@ describe Capistrano::LocalPrecompile, "configuration" do
     Capistrano::LocalPrecompile.load_into(@configuration)
   end
 
+  it "defines precompile_env" do
+    expect(@configuration.fetch(:precompile_env)).to eq('production')
+  end
+
   it "defines precompile_cmd" do
     cmd = 'RAILS_ENV=production RAILS_GROUPS=assets rake assets:precompile'
     expect(@configuration.fetch(:precompile_cmd)).to eq(cmd)
@@ -25,15 +29,6 @@ describe Capistrano::LocalPrecompile, "configuration" do
     expect(@configuration.fetch(:assets_dir)).to eq('public/assets')
   end
 
-  it "defines turbosprockets_enabled" do
-    expect(@configuration.fetch(:turbosprockets_enabled)).to be_false
-  end
-
-  it "defines turbosprockets_backup_dir" do
-    dir = 'public/.assets'
-    expect(@configuration.fetch(:turbosprockets_backup_dir)).to eq(dir)
-  end
-
   it "defines rsync_cmd" do
     expect(@configuration.fetch(:rsync_cmd)).to eq('rsync -av')
   end
@@ -43,6 +38,11 @@ describe Capistrano::LocalPrecompile, "configuration" do
       before('deploy:assets:precompile')
   end
 
+  it "performs deploy:assets:remove before deploy:assets:precompile" do
+    expect(@configuration).to callback('deploy:assets:remove').
+                                  before('deploy:assets:symlink')
+  end
+
   it "performs deploy:assets:cleanup after deploy:assets:precompile" do
     expect(@configuration).to callback('deploy:assets:cleanup').
       after('deploy:assets:precompile')

data/spec/integration_spec.rb

@@ -29,6 +29,15 @@ describe Capistrano::LocalPrecompile, "integration" do
     end
   end
 
+  describe 'remove manifest task' do
+    it 'invokes the precompile command' do
+      expect(@configuration).to receive(:run).
+        with('rm -f public/assets/manifest*.json').once
+
+      @configuration.find_and_execute_task('deploy:assets:remove_manifest')
+    end
+  end
+
   describe 'precompile task' do
     let(:servers) { %w(10.0.1.1 10.0.1.2) }
 
@@ -53,34 +62,4 @@ describe Capistrano::LocalPrecompile, "integration" do
       @configuration.find_and_execute_task('deploy:assets:precompile')
     end
   end
-
-  context 'with turbosprockets enabled' do
-    before do
-      @configuration.set :turbosprockets_enabled, true
-    end
-
-    describe 'cleanup task' do
-      it 'moves assets to the configured turbosprockets backup dir' do
-        expect(@configuration).to receive(:run_locally).
-          with('mv public/assets public/.assets')
-
-        @configuration.find_and_execute_task('deploy:assets:cleanup')
-      end
-    end
-
-    describe 'prepare task' do
-      it 'invokes the precompile command' do
-        expect(@configuration).to receive(:run_locally).
-          with('mkdir -p public/.assets').once
-        expect(@configuration).to receive(:run_locally).
-          with('mv public/.assets public/assets').once
-        expect(@configuration).to receive(:run_locally).
-          with('RAILS_ENV=production RAILS_GROUPS=assets rake assets:clean_expired').once
-        expect(@configuration).to receive(:run_locally).
-          with('RAILS_ENV=production RAILS_GROUPS=assets rake assets:precompile').once
-
-        @configuration.find_and_execute_task('deploy:assets:prepare')
-      end
-    end
-  end
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-local-precompile
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Steve Agalloco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 description: Local asset-pipeline precompilation for Capstrano
@@ -36,14 +36,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - LICENSE.md
 - README.md
 - Rakefile
 - capistrano-local-precompile.gemspec
-- lib/capistrano/local_precompile.rb
-- lib/capistrano-local-precompile/version.rb
 - lib/capistrano-local-precompile.rb
+- lib/capistrano-local-precompile/version.rb
+- lib/capistrano/local_precompile.rb
 - spec/configuration_spec.rb
 - spec/integration_spec.rb
 - spec/spec_helper.rb
@@ -57,17 +57,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Local asset-pipeline precompilation for Capstrano