defog 0.9.1 → 0.9.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 054ad554825391cd44ebbe930f1a12fd14276503
+  data.tar.gz: 42dc7f447f64000ebb8db63b7ddf0b2226840015
+SHA512:
+  metadata.gz: c4104287d84dfc9df6def6fc0566d2d04516002b564b3e61f1d78a6172ee6f2d67dcc4bec3d3812f4abdc9e8bec38f2c2781704b60374e02c561e9e8eadbab05
+  data.tar.gz: a8fe01d1cad058a1315b8c3151daf9b39c068e3738524a520b231e7721b2e6189293c2001e8cea5eaabe31b96924e854e76e99bdbaea528f2d35b4860da51d8a

data/README.md

@@ -253,7 +253,7 @@ plus appropriate rspec examples.)
 ## History
 
 Release Notes:
-
+* 0.9.2 - Bug fix: don't fail when measuring cache if file gets deleted by another process (more robust)
 * 0.9.1 - Bug fix: don't fail when measuring cache if file gets deleted by another process
 * 0.9.0 - Expose Handle#md5_hash
 * 0.8.0 - Include prefix in proxy_path (thus allowing cache sharing)
@@ -267,3 +267,7 @@ Release Notes:
 ## Copyright
 
 Released under the MIT License.  See LICENSE for details.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ronen/defog/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/defog/proxy.rb

@@ -194,13 +194,7 @@ module Defog
       # find available space (not counting current proxy)
       available = max_cache_size
       proxy_root.find { |path|
-        available -= begin
-                       path.size
-                     rescue Errno::ENOENT
-                       # some other process has snuck in and deleted the
-                       # file since the path.file? check.  has happened...
-                       0
-                     end if path.file? and path != proxy_path
+        available -= pathTry(path, :size) if path.file? and path != proxy_path
       }
       return if available >= want_size
 
@@ -213,7 +207,7 @@ module Defog
 
       # take candidates in LRU order until that would be enough space
       would_free = 0
-      candidates = Set.new(candidates.sort_by(&:atime).take_while{|path| (would_free < space_needed).tap{|condition| would_free += path.size}})
+      candidates = Set.new(candidates.sort_by(&:atime).take_while{|path| (would_free < space_needed).tap{|condition| would_free += pathTry(path, :size)}})
 
       # still not enough...?
       raise Error::CacheFull, "No room in cache for #{proxy_path.relative_path_from(proxy_root)}: size=#{want_size} available=#{available} can_free=#{would_free} (max_cache_size=#{max_cache_size})" if would_free < space_needed
@@ -222,23 +216,29 @@ module Defog
       # chunk.  So take another pass, eliminating files that aren't needed.
       # Do this in reverse size order, since we want to keep big files in
       # the cache if possible since they're most expensive to replace.
-      candidates.sort_by(&:size).reverse.each do |path|
-        if (would_free - path.size) > space_needed
+      size = Hash.new { |h, path| h[path] = pathTry(path, :size) }
+      candidates.sort_by{|path| size[path]}.reverse.each do |path|
+        if (would_free - size[path]) > space_needed
           candidates.delete path
-          would_free -= path.size
+          would_free -= size[path]
         end
       end
 
       # free the remaining candidates
       candidates.each do |candidate|
-        begin
-          candidate.unlink
-        rescue Errno::ENOENT
-          # some other process has deleted the file while we were looking at it.
-          # nothing to do.
-        end
+        pathTry(candidate, :unlink)
       end
+    end
 
+    # try a method on a Pathname without failing if the file doesn't exist
+    # (which could happen if some other process sneaks in and deletes the
+    # file after we found it).
+    def pathTry(path, method)
+      begin
+        path.send method
+      rescue Errno::ENOENT
+        0
+      end
     end
 
   end

data/lib/defog/version.rb

@@ -1,3 +1,3 @@
 module Defog
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/proxy_spec.rb

@@ -167,13 +167,20 @@ shared_examples "a proxy" do |args|
       other_proxy_path("c").should_not be_exist
     end
 
-    it "should not fail size check when proxies get deleted by another process" do
-      create_other_proxy("a", 10)
-      create_other_proxy("b", 30)
-      create_other_proxy("c", 40)
-      create_remote("x" * 80)
-      Pathname.any_instance.should_receive(:size).and_raise Errno::ENOENT
-      expect { @proxy.file(key, "r") do end }.to_not raise_error(Errno::ENOENT)
+    [0, 3, 6].each do |sizect|
+      it "should not fail size check #{sizect} when proxies get deleted by another process" do
+        create_other_proxy("a", 30)
+        create_other_proxy("b", 30)
+        create_other_proxy("c", 30)
+        create_remote("x" * 80)
+        z = 0
+        Pathname.any_instance.stub(:size) { |path|
+          raise Errno::ENOENT if z == sizect
+          z += 1
+          30
+        }
+        expect { @proxy.file(key, "r") do end }.to_not raise_error(Errno::ENOENT)
+      end
     end
 
     it "should not fail unlinking when proxies get deleted by another process" do

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: defog
 version: !ruby/object:Gem::Version
-  version: 0.9.1
-  prerelease: 
+  version: 0.9.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hash_keyword_args
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fastandand
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrapper to fog gem, proxying access to cloud files as local files.
@@ -168,27 +151,26 @@ files:
 - spec/support/helpers.rb
 homepage: http://github.com/ronen/defog
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wrapper to fog gem, proxying access to cloud files as local files.  Access
   can be read-only (local cache), write-only (upload), or read-write (mirror)
 test_files:
@@ -197,4 +179,3 @@ test_files:
 - spec/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-has_rdoc: