fingerjam 0.8.1 → 0.8.2

data/lib/fingerjam/base.rb

@@ -127,26 +127,43 @@ module Fingerjam
 
         def symlink
           cached_paths.each_pair do |relative_path, cached_path|
-            # Strip leading / from relative path to determine absolute path
-            src_u_path = File.join(public_path, relative_path[1..relative_path.length])
-            dst_u_path = File.join(public_path, cached_path[1..cached_path.length])
+            # Create relative symlink from RAILS_ROOT/public/cache/$MD5SUM.$EXT to original file
+            begin
+              # Strip leading / from relative path to determine absolute path
+              src_u_path = File.join(public_path, relative_path[1..relative_path.length])
+              dst_u_path = File.join(public_path, cached_path[1..cached_path.length])
 
-            # Gzip version of asset
-            src_c_path = File.join(public_path, (relative_path[1..relative_path.length] + ".gz"))
-            dst_c_path = File.join(public_path, (cached_path[1..cached_path.length]     + ".gz"))
+              # Create root directory
+              FileUtils.mkdir_p(File.dirname(dst_u_path))
 
-            # Create root directory
-            FileUtils.mkdir_p(File.dirname(dst_u_path))
+              old_path = ".." + relative_path
+              new_path = dst_u_path.to_s
 
-            # Create relative symlink from RAILS_ROOT/public/cache/$MD5SUM.$EXT to original file
-            begin
-              File.symlink(".." + relative_path, dst_u_path.to_s) if !File.exists?(dst_u_path)
-            rescue Errno::EEXIST
+              # puts "symlink #{old_path} to #{new_path}"
+
+              if !File.exists?(new_path) && File.exists?(src_u_path)
+                File.symlink(old_path, new_path)
+              end
+            rescue Errno::EEXIST => error
+              # puts error.message
             end
 
+            # Create relative symlink from RAILS_ROOT/public/cache/$MD5SUM.$EXT.gz to original file
             begin
-              File.symlink(".." + relative_path + ".gz", dst_c_path.to_s) if !File.exists?(dst_c_path) && File.exists?(src_c_path)
-            rescue Errno::EEXIST
+              # Gzip version of asset
+              src_c_path = File.join(public_path, (relative_path[1..relative_path.length] + ".gz"))
+              dst_c_path = File.join(public_path, (cached_path[1..cached_path.length]     + ".gz"))
+
+              old_path = ".." + relative_path + ".gz"
+              new_path = dst_c_path.to_s
+
+              # puts "symlink #{old_path} to #{new_path}"
+
+              if !File.exists?(new_path) && File.exists?(src_c_path)
+                File.symlink(old_path, new_path)
+              end
+            rescue Errno::EEXIST => error
+              # puts error.message
             end
 
             cached_urls[relative_path] = generate_cached_url(relative_path)
@@ -154,7 +171,7 @@ module Fingerjam
         end
 
         def write_lockfile
-          puts "writing lockfile #{lock_yml_path}"
+          # puts "writing lockfile #{lock_yml_path}"
 
           File.open(lock_yml_path, "w") do |lockfile|
             lockfile.puts cached_urls.to_yaml

data/lib/fingerjam/capistrano/strategy.rb

@@ -22,6 +22,8 @@ module Capistrano
             raise Capistrano::Error, "shell command failed with return code #{$?}"
           end
 
+          setup_fingerjam
+
           logger.debug "copying cache to deployment staging area #{destination}"
           Dir.chdir(copy_cache) do
             FileUtils.mkdir_p(destination)
@@ -34,7 +36,12 @@ module Capistrano
               next if copy_exclude.any? { |pattern| File.fnmatch(pattern, item) }
 
               if File.symlink?(item)
-                FileUtils.ln_s(File.readlink(File.join(copy_cache, item)), File.join(destination, item))
+                old_name = File.readlink(File.join(copy_cache, item))
+                new_name = File.join(destination, item)
+
+                if File.exists?(old_name)
+                  FileUtils.ln_s(old_name, new_name)
+                end
               elsif File.directory?(item)
                 queue += Dir.glob("#{item}/*", File::FNM_DOTMATCH)
                 FileUtils.mkdir(File.join(destination, item))
@@ -46,7 +53,7 @@ module Capistrano
 
           File.open(File.join(destination, "REVISION"), "w") { |f| f.puts(revision) }
 
-          fingerjam
+          process_fingerjam
 
           logger.trace "compressing #{destination} to #{filename}"
           Dir.chdir(copy_dir) { system(compress(File.basename(destination), File.basename(filename)).join(" ")) }
@@ -58,14 +65,16 @@ module Capistrano
           FileUtils.rm_rf destination rescue nil
         end
 
-        def fingerjam
-          logger.trace "packaging assets with fingerjam for #{cache_host} to #{destination}"
-
+        def setup_fingerjam
           ::Fingerjam::Base.configure(
             :host      => cache_host,
             :protocol  => cache_protocol,
             :root_path => destination
           )
+        end
+
+        def process_fingerjam
+          logger.trace "packaging assets with fingerjam for #{cache_host} to #{destination}"
 
           ::Fingerjam::Base.package_and_lock!
          end
@@ -73,4 +82,4 @@ module Capistrano
       end
     end
   end
-end
+end

data/lib/fingerjam/version.rb

@@ -1,3 +1,3 @@
 module Fingerjam
-  VERSION = "0.8.1"
-end
+  VERSION = "0.8.2"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fingerjam
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70302259244820 !ruby/object:Gem::Requirement
+  requirement: &70363221433020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302259244820
+  version_requirements: *70363221433020
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70302259244320 !ruby/object:Gem::Requirement
+  requirement: &70363221432500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70302259244320
+  version_requirements: *70363221432500
 - !ruby/object:Gem::Dependency
   name: jammit
-  requirement: &70302243759420 !ruby/object:Gem::Requirement
+  requirement: &70363221432000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70302243759420
+  version_requirements: *70363221432000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70302243758960 !ruby/object:Gem::Requirement
+  requirement: &70363221431420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302243758960
+  version_requirements: *70363221431420
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70302243758500 !ruby/object:Gem::Requirement
+  requirement: &70363221430880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70302243758500
+  version_requirements: *70363221430880
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &70302243758040 !ruby/object:Gem::Requirement
+  requirement: &70363221430160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70302243758040
+  version_requirements: *70363221430160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302243757580 !ruby/object:Gem::Requirement
+  requirement: &70363221429240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70302243757580
+  version_requirements: *70363221429240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70302243757120 !ruby/object:Gem::Requirement
+  requirement: &70363221428780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70302243757120
+  version_requirements: *70363221428780
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70302243756660 !ruby/object:Gem::Requirement
+  requirement: &70363221428260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70302243756660
+  version_requirements: *70363221428260
 description: Fingerjam uploads your Jammit-compressed assets with fingerprinted filenames
   so they can be cached indefinitely
 email: