s3sync 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8737f906e6e83042d2edb667c33705fe96f24bbd
-  data.tar.gz: c0d333e0b488014eb6e2273933019ba0ec58c9fb
+  metadata.gz: 8672f843e8dfe49d8332c6ed8212679926efdca1
+  data.tar.gz: 3142cb4b5b510800de393dd1a42033805f251eca
 SHA512:
-  metadata.gz: d94b3ec845ed9e48966045120a8c2292e5df64852c71d50eb3f0dec8d32e46d31082d8fd2380c7225aa856b98673cd20a02e119f2396aeaed5e6b5eb35490196
-  data.tar.gz: 3d22969a836de20ad4326ad5a134b3a221fa26a573ea4e0424186f6effb69ad63c7800f40fb49fecfc6ab616d306de489d54fd9c88b0edaf0c91042e6c413f12
+  metadata.gz: a937fce93d46e724f586fce116a922bf0c6e993a893054b596963f68ac4c8480ecab166097862232c6df771aece1760c9e03dd462fac43bb34d52d953d1b1933
+  data.tar.gz: a17295b31fbc18d2d5e9a5476d0ba1bf3c54509bfd1c4425aea8d910bca15b4c84e2b1fe657d4ee447310750166d6d33d2871d7a24cdd88db1cf157b8271f105

data/lib/s3sync/config.rb

@@ -74,7 +74,7 @@ module S3Sync
 
     def read_from_env
       REQUIRED_VARS.each do |v|
-        self[v] = ENV[v.to_s] unless ENV[v.to_s].nil?
+        self[v.to_s] = ENV[v.to_s] unless ENV[v.to_s].nil?
       end
     end
 

data/lib/s3sync/sync.rb

@@ -71,14 +71,18 @@ module S3Sync
   class Node
     include Comparable
 
+    SMALL_FILE = 50 * 1024 # 50.kilobytes
+
     attr_accessor :base
     attr_accessor :path
     attr_accessor :size
+    attr_accessor :small_comparator
 
-    def initialize base, path, size
+    def initialize base, path, size, small_comparator = nil
       @base = base
       @path = path
       @size = size
+      @small_comparator = small_comparator
     end
 
     def full
@@ -86,20 +90,21 @@ module S3Sync
     end
 
     def == other
-      full == other.full and @size == other.size
-    end
-
-    def <=> other
-      if self.size < other.size
-        -1
-      elsif self.size > other.size
-        1
-      else
-        0
-      end
+      @size == other.size && compare_small_comparators(other)
     end
 
     alias eql? ==
+
+    private
+
+    # If files are small and both nodes have a comparator, we can call an extra
+    # provided block to verify equality. This allows
+    def compare_small_comparators(other)
+      return true if @size > SMALL_FILE || other.size > SMALL_FILE
+      return true if small_comparator.nil? || other.small_comparator.nil?
+
+      small_comparator.call == other.small_comparator.call
+    end
   end
 
   class LocalDirectory
@@ -136,7 +141,8 @@ module S3Sync
 
         # We only need the relative path here
         file_name = file.gsub(/^#{@source}\/?/, '').squeeze('/')
-        node = Node.new(@source.squeeze('/'), file_name, st.size)
+        small_comparator = lambda { Digest::MD5.hexdigest File.read(file) }
+        node = Node.new(@source.squeeze('/'), file_name, st.size, small_comparator)
         nodes[node.path] = node
       end
 
@@ -153,7 +159,7 @@ module S3Sync
         value2 = hash2.delete key
         if value2.nil?
           to_add_to_2 << value
-        elsif value2.size == value.size
+        elsif value2 == value
           same << value
         else
           to_add_to_2 << value
@@ -297,7 +303,9 @@ module S3Sync
 
       nodes = {}
       @args.s3.buckets[location.bucket].objects.with_prefix(dir || "").to_a.collect do |obj|
-        node = Node.new(location.path, obj.key, obj.content_length)
+        # etag comes back with quotes (obj.etag.inspcet # => "\"abc...def\""
+        small_comparator = lambda { obj.etag[/[a-z0-9]+/] }
+        node = Node.new(location.path, obj.key, obj.content_length, small_comparator)
         nodes[node.path] = node
       end
       return nodes

data/lib/s3sync/version.rb

@@ -23,5 +23,5 @@
 # THE SOFTWARE.
 
 module S3Sync
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3sync
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Lincoln de Sousa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk