sink3 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ef001742f3059209bd54b3778591bd9a292d443
-  data.tar.gz: e6c713ef21bba1549c35aae6d28c94e819b960ae
+SHA256:
+  metadata.gz: ff3e1daf52d984a4a933a813cab8eb3062266358b3e11b3eeed34103cc7b80c3
+  data.tar.gz: 3dc130fc49e9020effd4576f77fc979f2759c2d65a87aa44e1a6ba3965a2d123
 SHA512:
-  metadata.gz: 47c61011df93d6ab1d7a89ef341d7683d25f07ce446fd1a3fe624b6865f1d448464fc04bf03c3b5f82a3f178d73b58e77a838d46a435d78b736d6594477c8245
-  data.tar.gz: a813ea97a399779eb60cbf0beeba3340c337beb6f3cc939a88d0a3738a00b8d0f4525290badcb35513c6da855cfc8cb4b5292f6a6e9d6b7005af0849fd61878a
+  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

@@ -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,28 @@ 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" 
 
+    def send(*paths) 
+      configure
       # overwrite hostname if configured
       Dotenv.overload('~/.sink3cfg')
+
       validate_env
 
-      prefix = path.realdirpath.basename
-      Sink3::PathCrawler.new(path, prefix).start
+      [paths].flatten.each do |path|
+        path = Pathname.new(path)
+        raise "specified path does not exist" unless path.exist?
+        prefix = path.realdirpath.basename
+
+        Sink3::PathCrawler.new(path, prefix).start
+      end
     end
 
     private 
@@ -34,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_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
@@ -55,7 +72,11 @@ module Sink3
     end
 
     def formatted_date
-      Time.now.strftime "%Y-%m-%d"
+      if !ENV['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.1"
+  VERSION = "0.0.6"
 end

data/sink3.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "aws-sdk", "< 2.0"
-  spec.add_dependency "dotenv"
-  spec.add_dependency "thor"
+  spec.add_dependency "aws-sdk-v1", "~> 1.61.0"
+  spec.add_dependency "dotenv", "~> 0.11.1"
+  spec.add_dependency "thor", "~> 0.19.1"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: sink3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 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
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.61.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.61.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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