capistrano-django 3.5.6 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 574735eabefbec52ca2c2b7c31bc1ab180b5c9e2
-  data.tar.gz: 91182ab3b3f1ef15359272c041f22aa6500d7248
+SHA256:
+  metadata.gz: 263c3e3468d70f4c74569b15cfd5bc797628f0c287913a0b976786254a7f9d5d
+  data.tar.gz: 9b40c0639dd80580b057fc09bb0b35b96a6d5f2692715be3fa533c2a3e12fde9
 SHA512:
-  metadata.gz: 9647dbaa2817f415f94fdded4645d34db43eec7a6bc6e35896df8de99fa080c1560f43aa22923e61e87e2b2733a18b1c9e14ab965e43b52ffaa6757e752bb779
-  data.tar.gz: '0488f0891ad5a5f9007f1c03a53429d807fb558a4a0951a1bb507e5455d5e0db04bb884f3ce5865d9a9ec13c31cd0694a509db177bb218e592313d69f1fbc057'
+  metadata.gz: a28521ba208ef3cbf290d6d69d24d934e7af03057fcab1f20efb8c869c3dd1560c24abf7a787f7d9fc41a9e1726287e4ef742f0a85a6da95ec1364e7642aee9a
+  data.tar.gz: 58e63b60f4b6d34b8c3b2d5a8623346c2bc9f8d9f8d8ceba94f9255c1cf97ef68bb2330a8e5b24739bfeed9282f1872114f839652e717e39a8f007c91c1094b9

data/lib/capistrano/django.rb

@@ -180,9 +180,9 @@ namespace :django do
   desc "Run django migrations"
   task :migrate do
     if fetch(:multidb)
-      django("sync_all", '--noinput', run_on=:web)
+      django("sync_all", '--noinput', run_on=:jobs)
     else
-      django("migrate", "--noinput", run_on=:web)
+      django("migrate", "--noinput", run_on=:jobs)
     end
   end
 end
@@ -221,26 +221,30 @@ namespace :s3 do
 
   desc 'Clean up old s3 buckets'
   task :cleanup do
-    if fetch(:create_s3_bucket)
+    if fetch(:create_s3_bucket) and fetch(:delete_old_s3_buckets, true)
+      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))
+        else
+          raw_directories.concat 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: 4.0.2
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2021-05-06 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