sink3 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f428eb1894d32bca6602df9fc23be208e23cfc86209e2c2c11fcfdea4d552fae
-  data.tar.gz: 62546a114fa3e7bbbe302ff18d14f4000fe0f7ebdd337bd56c782510a7833a88
+  metadata.gz: ff3e1daf52d984a4a933a813cab8eb3062266358b3e11b3eeed34103cc7b80c3
+  data.tar.gz: 3dc130fc49e9020effd4576f77fc979f2759c2d65a87aa44e1a6ba3965a2d123
 SHA512:
-  metadata.gz: a6027774cde9c3748f3238070aefc2192dcd019eef0ae45d262da91f18e01cd2c7b71c6d23b570e775cad6baabfa98cde5137e76247c61579980a5dda5cdf284
-  data.tar.gz: 066d2784ff5fa8f0287f94dd2f9d92fe5528d42c5e4a8f228b6e5f267627dd1a7d056f34657441139b4f7e9640d85e5004d58436af4c6c1b185d8bb27d77b4e8
+  metadata.gz: 33da8314c6d408ae31106123d3a3f3d6d7ce85ac209adf924da94fe06edb4c9e85619992b891bd089ae6f74bda9d54de2ea4b892287f85cd5c5b400ec0a384fe
+  data.tar.gz: 463ec18e4df590604cca9c5bcda43dd32fa1c25e3c14c856a91b6d434ff2dab712eeeeafbf4024ac32fd8005dc0ce8de81440ba33bb0157b00a07585290305ae

data/lib/sink3.rb

@@ -15,6 +15,8 @@ module Sink3
 
   class Configuration 
     attr_accessor :delete_after_upload
+    attr_accessor :skip_overwrite
+    attr_accessor :verbose
 
     def delete_after_upload
       !!@delete_after_upload

data/lib/sink3/main.rb

@@ -9,11 +9,14 @@ require 'sink3/path_crawler'
 
 module Sink3 
   class Main < Thor
-    option :delete, type: :boolean
     #
     # option :path, :required => true
     desc "send", "Send files to S3 in write only mode"
 
+    option :delete, type: :boolean, desc: "delete origin file on succesful send"
+    option :skip_overwrite, type: :boolean, desc: "skip sending file if exists" 
+    option :verbose, type: :boolean, desc: "verbose" 
+
     def send(*paths) 
       configure
       # overwrite hostname if configured
@@ -37,6 +40,8 @@ module Sink3
 
       Sink3.configure do |config| 
         config.delete_after_upload = options[:delete]
+        config.skip_overwrite = options[:skip_overwrite]
+        config.verbose = options[:verbose]
       end
     end
 

data/lib/sink3/path_crawler.rb

@@ -44,10 +44,27 @@ module Sink3
       s3.buckets[ENV['BUCKET']]
     end
 
+    def check_exists remote_file
+      remote_file.exists?
+    rescue AWS::S3::Errors::Forbidden
+      # expect this error to be returned when file exists 
+      # and we don't have access to read the file
+      true 
+    end
+
     def send_to_remote
       remote_path = "#{ENV['HOSTNAME'].strip}/#{formatted_date}#{prefix_and_path}"
       remote_file = bucket.objects[remote_path]
-      remote_file.write(@path)
+      if Sink3.config.skip_overwrite 
+	if ! check_exists(remote_file)
+	  puts "remote file does not exist"  if Sink3.config.verbose
+	  remote_file.write(@path)
+	else
+          puts "skpping overwrite of #{remote_path}"  if Sink3.config.verbose
+        end
+      else
+        remote_file.write(@path)
+      end
 
       if Sink3.config.delete_after_upload? 
         FileUtils.rm @path

data/lib/sink3/version.rb

@@ -1,3 +1,3 @@
 module Sink3
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sink3
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Fabrizio Regini
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: S3 backup designed for servers