directory-digest 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fba379a6e0a6dc1ee8244f4706327f7c4d52a2fc
-  data.tar.gz: 2d63dd3b5ad5be5ee33fad0fc9b5efa00bc6b427
+  metadata.gz: bab866137fa3d9bef2079f75a248c731bbf3374e
+  data.tar.gz: be7f3c5e0e3f79f5500689299a1eac6ec1907725
 SHA512:
-  metadata.gz: de9514f76d276e2213cb8d6e76b527a49d07a198d652e0f4c45ad1631cf54928e1c16c67f9bbb5f2b198ad7dd8215bb0c82c810ed04e4a997b71e59368a17971
-  data.tar.gz: f3cd4b27d636ebe3ae22cf65a1361962c468e7767faf3dcc852b6611552c86a1e1db9f961d77668ebb3fe80cd0265614f29784136dc260ac1fef35ac5489e6f5
+  metadata.gz: 1359d90362fb8453ab4a84a35a763c41f4f2854135beaf98b488cd39eeb0c65565faa3363199a9f537ce085e45f4692a209b8fefc90d24f63931ed14b5b39827
+  data.tar.gz: 79cdea96956c5732923c8ea67c525128a7cb19642015a443b73eecfd0e6afe949ac9982d5794e74f8ebe19caab0eeff085a0aa04b15555abcb82f456442c0023

data/lib/directory-digest/digest.rb

@@ -8,11 +8,13 @@ module DirectoryDigest
     attr_reader :directory
     attr_reader :directory_digest
     attr_reader :file_digests
+    attr_reader :files_excluded
 
-    def initialize(directory, directory_digest, file_digests)
+    def initialize(directory, directory_digest, file_digests, files_excluded)
       @directory = directory.freeze
       @directory_digest = directory_digest.freeze
       @file_digests = file_digests.freeze
+      @files_excluded = files_excluded.freeze
     end
 
     def self.sha256(directory, glob = '**/*', include = proc { true })
@@ -25,20 +27,25 @@ module DirectoryDigest
       end
       directory_digest = OpenSSL::Digest::SHA256.new
       file_digests = {}
+      files_excluded = []
       Dir["#{directory}/#{glob}"].each do |filename|
+        next unless File.file?(filename)
         path = filename[directory.size..-1]
-        next unless File.file?(filename) && include.call(path)
-        file_digest = OpenSSL::Digest::SHA256.new
-        File.open(filename, 'rb') do |file|
-          until file.eof?
-            chunk = file.read(4096)
-            directory_digest << chunk
-            file_digest << chunk
+        if include.call(path)
+          file_digest = OpenSSL::Digest::SHA256.new
+          File.open(filename, 'rb') do |file|
+            until file.eof?
+              chunk = file.read(4096)
+              directory_digest << chunk
+              file_digest << chunk
+            end
           end
+          file_digests[path] = file_digest.hexdigest
+        else
+          files_excluded << path
         end
-        file_digests[path] = file_digest.hexdigest
       end
-      Digest.new(directory, directory_digest.hexdigest, file_digests)
+      Digest.new(directory, directory_digest.hexdigest, file_digests, files_excluded)
     end
 
     def ==(other)
@@ -54,36 +61,46 @@ module DirectoryDigest
         added: file_digests.select { |path, _| !other.file_digests.key?(path) },
         removed: other.file_digests.select { |path, _| !file_digests.key?(path) },
         changed: other.file_digests.select { |path, digest| file_digests.key?(path) && digest != file_digests[path] },
-        unchanged: other.file_digests.select { |path, digest| file_digests.key?(path) && digest == file_digests[path] }
+        unchanged: other.file_digests.select { |path, digest| file_digests.key?(path) && digest == file_digests[path] },
+        excluded: files_excluded | other.files_excluded
       }
     end
 
     def mirror_from(other, actions = MirrorActions.new)
-      files_copied = 0
-      files_deleted = 0
       changes = changes_relative_to(other)
-      changes[:removed].merge(changes[:changed]).each do |path, _|
+      to_copy = changes[:removed].merge(changes[:changed])
+      to_copy.keys.each do |path|
         source_path = "#{other.directory}#{path}"
         destination_path = "#{directory}#{path}"
         destination_directory = File.dirname(destination_path)
         actions.create_directory(destination_directory) unless Dir.exist?(destination_directory)
         actions.copy_file(source_path, destination_path)
-        files_copied += 1
       end
-      changes[:added].each do |path, _|
+      to_delete = changes[:added]
+      to_delete.keys.each do |path|
         actions.delete_file("#{directory}#{path}")
-        files_deleted += 1
       end
-      { files_copied: files_copied, files_deleted: files_deleted }
+      {
+        copied: to_copy,
+        deleted: to_delete,
+        unchanged: changes[:unchanged],
+        excluded: changes[:excluded]
+      }
     end
 
     def to_json
-      JSON.pretty_generate(directory: directory, directory_digest: directory_digest, file_digests: file_digests)
+      JSON.pretty_generate(directory: directory,
+                           directory_digest: directory_digest,
+                           file_digests: file_digests,
+                           files_excluded: files_excluded)
     end
 
     def self.from_json(json)
       json = JSON.parse(json)
-      Digest.new(json['directory'], json['directory_digest'], json['file_digests'])
+      Digest.new(json['directory'],
+                 json['directory_digest'],
+                 json['file_digests'],
+                 json['files_excluded'])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directory-digest
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Andrew Heald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Creates a SHA256 digest of all of the files in a directory.