capistrano-django 3.5.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 310bd55b29bf71e071ea89ea967211d22f12af6f
-  data.tar.gz: 653f79204ca0090191adedf97465c134e57f6eb9
+SHA256:
+  metadata.gz: 8f8e330e7f6c66882482a7a4c7d69d0a3413c245879a5d19005e6ea38eb20ff4
+  data.tar.gz: '059aaf93cf4dffa0a84ef4f2f0179dc45ee6d18b348adfa6188d0a6dec08394e'
 SHA512:
-  metadata.gz: cc45ae17c4ff5ba08a433e6d84867bc82f6cb7f0cbed08a82f7d7ef666deb8c89b720b54ed657ac017ae670996c1358a1e6bc3544b8f4352d57025730de291e5
-  data.tar.gz: 795d904350c550120570ac16d23a604603db330e8093637a41b2f1a4d287596fc2addf0a4a43ea2a6d0576e3e2b13967d77efd5493be81d86f76573dea4b0e2e
+  metadata.gz: 5066be80429ad5ee272afcc493ecfd94bcc8d28e76a68e31e28ea730a20beea982c4a15eb28f6d227a42bcfa58f9c7b84041141218bda971ace6239bfcb46367
+  data.tar.gz: 6d49cca1023248912c3310213689a2cea2c9cdf0d23253cf098aa95c99c86c5b5f63d8c69e8719f2a0a9d7d7600cf323c8ecf66496bcebcbacb7c22cfced65db

data/lib/capistrano/django.rb

@@ -44,7 +44,10 @@ namespace :python do
         execute :ln, "-s", virtualenv_path, File.join(release_path, 'virtualenv')
       end
     end
+  end
 
+  desc "Set things up after the virtualenv is ready"
+  task :post_virtualenv do
     if fetch(:npm_tasks)
       invoke 'nodejs:npm'
     end
@@ -57,6 +60,8 @@ namespace :python do
 
 end
 
+after 'python:create_virtualenv', 'python:post_virtualenv'
+
 namespace :flask do
 
   task :setup do
@@ -175,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
@@ -216,26 +221,28 @@ 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))
         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.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2021-05-03 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