capistrano-django 3.5.6 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 574735eabefbec52ca2c2b7c31bc1ab180b5c9e2
-  data.tar.gz: 91182ab3b3f1ef15359272c041f22aa6500d7248
+SHA256:
+  metadata.gz: 610ffd7c696759bb05a87214f3c7301c05052ed8d4b2c75951c33fa8eb665b20
+  data.tar.gz: 1435eb798cae51f1d6466cd26e2322df8b85463d1f24bf1fc0df30afc943eb72
 SHA512:
-  metadata.gz: 9647dbaa2817f415f94fdded4645d34db43eec7a6bc6e35896df8de99fa080c1560f43aa22923e61e87e2b2733a18b1c9e14ab965e43b52ffaa6757e752bb779
-  data.tar.gz: '0488f0891ad5a5f9007f1c03a53429d807fb558a4a0951a1bb507e5455d5e0db04bb884f3ce5865d9a9ec13c31cd0694a509db177bb218e592313d69f1fbc057'
+  metadata.gz: 50d988b56eea874fafda32e934724d15bbec8b3c5686bfb9c698b8b691563d7c937f4fa71ba41c50ff1ddea3ad02d45449ddf55cb65ea5834d6a851541cf443e
+  data.tar.gz: 97abe781ea412c749c0c4be94ff54bbfa716406fcd242a1d369295e2711ed4c978aa82291788b4b2752da4ccb91512b4d846f0d9a31dd83520f03ca8861c9366

data/lib/capistrano/django.rb

@@ -222,25 +222,27 @@ namespace :s3 do
   desc 'Clean up old s3 buckets'
   task :cleanup do
     if fetch(:create_s3_bucket)
+      raw_directories = []
       on roles(:web) do
         releases = capture(:ls, '-xtr', releases_path).split
         if releases.count >= fetch(:keep_releases)
-          directories = releases.last(fetch(:keep_releases))
-          require 'fog'
-          storage = Fog::Storage.new({
-            aws_access_key_id: fetch(:aws_access_key),
-            aws_secret_access_key: fetch(:aws_secret_key),
-            provider: "AWS"
-          })
-          buckets = storage.directories.all.select { |b| b.key.start_with? fetch(:s3_bucket_prefix) }
-          buckets = buckets.select { |b| not directories.include?(b.key.split('-').last) }
-          buckets.each do |old_bucket|
-            files = old_bucket.files.map{ |file| file.key }
-            storage.delete_multiple_objects(old_bucket.key, files) unless files.empty?
-            storage.delete_bucket(old_bucket.key)
-          end
+          raw_directories.concat releases.last(fetch(:keep_releases))
         end
       end
+      directories = raw_directories.uniq
+      require 'fog'
+      storage = Fog::Storage.new({
+        aws_access_key_id: fetch(:aws_access_key),
+        aws_secret_access_key: fetch(:aws_secret_key),
+        provider: "AWS"
+      })
+      buckets = storage.directories.all.select { |b| b.key.start_with? fetch(:s3_bucket_prefix) }
+      buckets = buckets.select { |b| not directories.include?(b.key.split('-').last) }
+      buckets.each do |old_bucket|
+        files = old_bucket.files.map{ |file| file.key }
+        storage.delete_multiple_objects(old_bucket.key, files) unless files.empty?
+        storage.delete_bucket(old_bucket.key)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-django
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.6.0
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -50,8 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: capistrano-django - Welcome to easy deployment with Ruby over SSH for Django