calevipoeg-zeus 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff33fd8321399b29bb46764cf8e2d84f8d5b0a0b7e2d592589718a22ccece13
-  data.tar.gz: 9c29313d35752a2b1423bc0aee046a0a952a18b2b5ef3d1e0af7d250aaf8e7d2
+  metadata.gz: 48770f6ed5824ba412873a19fe7aaab01da99ab985b033c52ff019aa2b08473b
+  data.tar.gz: f09f8ee47247f313ea441dfcd3107c5a21ba6a675d345f4a4c858288b02f0142
 SHA512:
-  metadata.gz: 54c626d6fbfbc1986f47eee974872976b8a89c5962d78818f199333cb081460dfefc56c217456f58d04313e778c4222f583e35841854c404119136f614ddf59d
-  data.tar.gz: d48d3bdcdf7d9d77489290a649cad4f113d5dd9c29b8c7c995b9b35891b222ef7c725dda8e48d9c7cca9ac288d2329d4c56af6d1011ce7b7305ec8076a2d1b36
+  metadata.gz: 6936b0661f6e8d5a062f6101ec0ed1191b655760914e61dc28952780bcaedcc9af3819645f6e436123779384216d5e1df37c8de215aac77f912e9183bc8ac71d
+  data.tar.gz: 7014adc858cb7553098733ebe610deb73b8e3fde92d57aa472273bc80b8feb057393b37141567752c6821a3199c2324a0522f65b044dd9b99db395e0fc109335

data/README.md

@@ -94,5 +94,5 @@ set :s3_bucket, -> do
 end
 
 invoke :'s3:upload', ["public/static"], "cdn/production/static"
-invoke :'s3:clean', "cdn/production/static"
+invoke :'s3:clean', 'cdn/production/static', 14.days.ago
 ```

data/lib/zeus/mina/s3.rb

@@ -3,37 +3,28 @@ require 'aws-sdk-s3'
 set :s3_client, -> { raise }
 set :s3_bucket, -> { raise }
 
-namespace :aws do
-  namespace :s3 do
-    task :upload, %i[dirs destination] do |_t, argv|
-      Array(argv.dirs).each do |dir|
-        Dir.glob(Pathname.new(dir).join('**/**')).each do |file|
-          next if File.directory?(file)
+namespace :s3 do
+  task :upload, %i[dirs destination] do |_t, argv|
+    Array(argv.dirs).each do |dir|
+      Dir.glob(Pathname.new(dir).join('**/**')).each do |file|
+        next if File.directory?(file)
 
-          path = Pathname.new(file).relative_path_from(dir)
-          key = Pathname.new(argv.destination).join(path)
+        path = Pathname.new(file).relative_path_from(dir)
+        key = Pathname.new(argv.destination).join(path)
 
-          io = Zeus::S3Io.new(File.open(file))
-          io.upload(fetch(:s3_client), bucket: fetch(:s3_bucket), key: key) do |progress|
-            puts "[#{progress}%] Uploading #{file} -> #{key}"
-          end
+        io = Zeus::S3Io.new(File.open(file))
+        io.upload(fetch(:s3_client), bucket: fetch(:s3_bucket), key: key) do |progress|
+          puts "[#{progress}%] Uploading #{file} -> #{key}"
         end
       end
     end
+  end
+
+  task :clean, %i[prefix last_mod] => :client do |_t, argv|
+    Zeus::S3Iterate.new(fetch(:s3_client)).delete_if(bucket: fetch(:s3_bucket), prefix: argv.prefix) do |file|
+      break(false) unless argv.last_mod >= file.last_modified
 
-    # task :clean, %i[destination] => :client do |_t, argv|
-    #   files = @s3.list_objects_v2(bucket: fetch(:s3_bucket_name), prefix: argv.destination).each_with_object([]) do |list, object|
-    #     list.contents.each do |file|
-    #       next if file.last_modified > fetch(:s3_clean_after)
-    #
-    #       object << file
-    #     end
-    #   end
-    #
-    #   files.each do |file|
-    #     puts "[-] removing (last mod #{file.last_modified}) #{file.key}"
-    #     @s3.delete_object(bucket: fetch(:s3_bucket_name), key: file.key)
-    #   end
-    # end
+      puts "[-] removing (last mod #{file.last_modified}) #{file.key}"
+    end
   end
 end

data/lib/zeus/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Zeus
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calevipoeg-zeus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Aliaksandr Shylau