sink3 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e315e3d1e4c3a2244abd5567acd62f367ee165d
-  data.tar.gz: 86b0c67187540a7f6bf97d7896ef79622d9198a6
+SHA256:
+  metadata.gz: c38fc1886885c4b540758bfe360fbb3b104e42a58cf09089665e070aa748c116
+  data.tar.gz: df4199bae369d7186ba4337d0789e33a332c6ac925dcd3ae2d85ae9c4aa5df3c
 SHA512:
-  metadata.gz: b960028f69435bce624b5f046588fcdddd16898002dbc85b024574386c18d3821fb6d55c9f118bf640dbf71c5df763a628080d6a70366d767fd1041d10ebafc5
-  data.tar.gz: 33038b991198e05f23b1340b36899b98cbadf2fb3dc16d5bd4acec9520f919a173fc4e43e2d1dcfa0cb6b994bb79f22d5a8125bbc3375a59a5b8c782938fceaa
+  metadata.gz: 61e0348ecb5cf342f3de7e69ff208fa6dc82f65a62572180cd157bc5a7cf910b9b176b66034e44815c0bc0574e9510484f9bd3a08c070d4fd3fb8f1b9d76c19f
+  data.tar.gz: 435085e039823346909ae1494acc924024a525d4a2a99c3c02f3bb1bd198e75fb90e8128a6a1da4343983eed571adc9f533559623fb2b847037ab9acbcf34f8d

data/lib/sink3.rb

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

data/lib/sink3/main.rb

@@ -1,6 +1,6 @@
 require 'thor' 
 require 'dotenv' 
-require 'aws-sdk' 
+require 'aws-sdk-v1' 
 
 lib = File.expand_path('../..', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -9,22 +9,40 @@ require 'sink3/path_crawler'
 
 module Sink3 
   class Main < Thor
-    option :delete, type: :boolean
-
+    #
     # option :path, :required => true
-    desc "Send file to S3", "Send files to S3 in write only mode"
+    desc "send", "Send files to S3 in write only mode"
 
-    def send(path) 
-      configure
-      path = Pathname.new(path)
-      raise "specified path does not exist" unless path.exist?
+    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" 
+    option :skip_date_partition, type: :boolean, desc: "remove YYYY-MM-DD remote prefix" 
+    option :skip_full_path, type: :boolean, desc: "don't archive file with full path prefix" 
 
+    def send(*paths) 
+      configure
       # overwrite hostname if configured
       Dotenv.overload('~/.sink3cfg')
+
       validate_env
 
-      prefix = path.realdirpath.basename
-      Sink3::PathCrawler.new(path, prefix).start
+      prefix = nil 
+      [paths].flatten.each do |path|
+        path = Pathname.new(path)
+	
+        raise "specified path does not exist" unless path.exist?
+        unless Sink3.config.skip_full_path
+           if (path.file?) 
+             prefix = path.realdirpath.parent 
+             puts "prefix is #{prefix}" if Sink3.config.verbose
+           else 
+             prefix = path.realdirpath.parent.parent 
+             puts "prefix is not set" if Sink3.config.verbose
+           end
+       end
+
+        Sink3::PathCrawler.new(path, prefix).start
+      end
     end
 
     private 
@@ -34,6 +52,10 @@ module Sink3
 
       Sink3.configure do |config| 
         config.delete_after_upload = options[:delete]
+        config.skip_overwrite = options[:skip_overwrite]
+        config.verbose = options[:verbose]
+        config.skip_date_partition = options[:skip_date_partition]
+        config.skip_full_path = options[:skip_full_path]
       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_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 #{remote_path}"  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
@@ -55,7 +72,11 @@ module Sink3
     end
 
     def formatted_date
-      Time.now.strftime "%Y-%m-%d"
+      if !Sink3.config.skip_date_partition
+        return "#{Time.now.strftime "%Y-%m-%d"}/"
+      else
+        return ""
+      end
     end
 
     def prefix_and_path

data/lib/sink3/version.rb

@@ -1,3 +1,3 @@
 module Sink3
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: sink3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Fabrizio Regini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.61.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.61.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Sink3 is an S3 backup designed to work with write-only keys.
@@ -88,8 +88,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,17 +116,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: S3 backup designed for servers