sink3 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff3e1daf52d984a4a933a813cab8eb3062266358b3e11b3eeed34103cc7b80c3
-  data.tar.gz: 3dc130fc49e9020effd4576f77fc979f2759c2d65a87aa44e1a6ba3965a2d123
+  metadata.gz: c38fc1886885c4b540758bfe360fbb3b104e42a58cf09089665e070aa748c116
+  data.tar.gz: df4199bae369d7186ba4337d0789e33a332c6ac925dcd3ae2d85ae9c4aa5df3c
 SHA512:
-  metadata.gz: 33da8314c6d408ae31106123d3a3f3d6d7ce85ac209adf924da94fe06edb4c9e85619992b891bd089ae6f74bda9d54de2ea4b892287f85cd5c5b400ec0a384fe
-  data.tar.gz: 463ec18e4df590604cca9c5bcda43dd32fa1c25e3c14c856a91b6d434ff2dab712eeeeafbf4024ac32fd8005dc0ce8de81440ba33bb0157b00a07585290305ae
+  metadata.gz: 61e0348ecb5cf342f3de7e69ff208fa6dc82f65a62572180cd157bc5a7cf910b9b176b66034e44815c0bc0574e9510484f9bd3a08c070d4fd3fb8f1b9d76c19f
+  data.tar.gz: 435085e039823346909ae1494acc924024a525d4a2a99c3c02f3bb1bd198e75fb90e8128a6a1da4343983eed571adc9f533559623fb2b847037ab9acbcf34f8d

data/lib/sink3.rb

@@ -16,7 +16,9 @@ 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

@@ -16,6 +16,8 @@ module Sink3
     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
@@ -24,10 +26,20 @@ module Sink3
 
       validate_env
 
+      prefix = nil 
       [paths].flatten.each do |path|
         path = Pathname.new(path)
+	
         raise "specified path does not exist" unless path.exist?
-        prefix = path.realdirpath.basename
+        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
@@ -42,6 +54,8 @@ module Sink3
         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

@@ -57,7 +57,7 @@ module Sink3
       remote_file = bucket.objects[remote_path]
       if Sink3.config.skip_overwrite 
 	if ! check_exists(remote_file)
-	  puts "remote file does not exist"  if Sink3.config.verbose
+	  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
@@ -72,7 +72,7 @@ module Sink3
     end
 
     def formatted_date
-      if !ENV['SKIP_DATE_PARTITION']
+      if !Sink3.config.skip_date_partition
         return "#{Time.now.strftime "%Y-%m-%d"}/"
       else
         return ""

data/lib/sink3/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sink3
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Fabrizio Regini