s3diff 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9214fc3b3d1057f64f54293b48168c5df0edf2c5
-  data.tar.gz: 0464c764900078951eca13de55458dc636bc7bc7
+  metadata.gz: 2e40ffd6ec8145f05a3ded8e43eb042381898f81
+  data.tar.gz: e95b2172ceca0bc40cd249f02787e74a074ebcad
 SHA512:
-  metadata.gz: d9c6e195752d3e88af9b7d63c939a7f21c5254021f7da052af69e1ba1a7a3d1edcad16488e89fd2c9051019d6e1ca22ca9a06640ccb3728b692b25e4ac2943f0
-  data.tar.gz: 7136697d46c01d2796333d70b5019ca2565476095d50494345b9bdf2173d8505e4ffd53a565394e16d8102faf61af57cafd2d262c5672c84d94af0425c846032
+  metadata.gz: dab1c303df16276ad546c60cb6f55af8343d341ac167e61e7d7688185aafad3b84e26c60275191cf81572d5020c09be58847867a4e74ed62db22346b2ae4e483
+  data.tar.gz: fb4bb3c096a6961e167debd1f24ced1905d2dbf91c09ba16170f2022ab002c5c23de1a05023e1228a5685e635f0119a3dab38a11ed565664ee3adfcabb8f1caf

data/lib/s3diff/comparator.rb

@@ -8,8 +8,16 @@ module S3diff
       @file2 = file_object(file2)
     end
 
+    def both_exist?
+      @both_exist ||= begin
+        puts "#{@file1.original_path} is not exist." unless @file1.exist?
+        puts "#{@file2.original_path} is not exist." unless @file2.exist?
+        @file1.exist? && @file2.exist?
+      end
+    end
+
     def same_etag?
-      @file1.etag == @file2.etag
+      both_exist? && @file1.etag == @file2.etag
     end
 
     def same?

data/lib/s3diff/local_file.rb

@@ -7,15 +7,35 @@ module S3diff
     end
 
     def etag
-      Digest::MD5.file(@file_path).to_s
+      Digest::MD5.file(@file_path).to_s if exist?
     end
 
     def size
-      File.size(@file_path)
+      File.size(@file_path) if exist?
     end
 
     def path
+      if exist?
+        original_path
+      else
+        cache_file.path
+      end
+    end
+
+    def original_path
       @file_path
     end
+
+    def exist?
+      File.exist?(@file_path)
+    end
+
+    private
+
+    def cache_file
+      @cache_file ||= begin
+        Tempfile.new("")
+      end
+    end
   end
 end

data/lib/s3diff/s3_file.rb

@@ -1,4 +1,5 @@
 require "tempfile"
+require "ostruct"
 
 module S3diff
   class S3File
@@ -8,27 +9,39 @@ module S3diff
     end
 
     def etag
-      head.etag.delete(%("))
+      head.etag.delete(%(")) if exist?
     end
 
     def size
-      head.content_length
+      head.content_length if exist?
     end
 
     def path
       cache_file.path
     end
 
+    def original_path
+      @uri
+    end
+
+    def exist?
+      !head.nil?
+    end
+
     private
 
     def head
-      @head ||= @s3c.head_object(@uri)
+      @head ||= begin
+        @s3c.head_object(@uri)
+      rescue Aws::S3::Errors::NotFound
+        nil
+      end
     end
 
     def cache_file
       @cache_file ||= begin
         f = Tempfile.new("")
-        @s3c.get_object(@uri, f)
+        @s3c.get_object(@uri, f) if exist?
         f.flush
         f
       end

data/lib/s3diff/version.rb

@@ -1,3 +1,3 @@
 module S3diff
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3diff
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - masa21kik