capistrano-django 3.5.3 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa26d5c8a63d4407e44d461869cf8361f1f9045e
-  data.tar.gz: 841d129625dde456ade3a86e94271a5bb76c288c
+SHA256:
+  metadata.gz: bce277f4635d0f0e21a79111a2cfeddb9509345b7cc65bf896297a44f4f62f21
+  data.tar.gz: 37e5870ba599f14f09f2303d705b6e792c81032183a778c14848c064169e2e9d
 SHA512:
-  metadata.gz: 373b8167e9ed276c50837c9d0b0fc22fa4efa337371b07b3eb6b97e86aac21793c5df7dbf5ca52c494c794469050b58f478698b388b60723ef7fb5a7d5a3ab56
-  data.tar.gz: 09d56a3d290c15c4df9bc25260c5240e08f0b729b9a7dfa9fb3021bd8636faa3b9a3a93ac3204367a889565df27ec35da4459d8db734c5cea1a587e34b5e26fa
+  metadata.gz: 2e8f1a378ec5b3ff7fd9367d91f9f2e8c53abfd7714120383ee93a60f75e4d3b746c9997b1e806b1f65b33a0bb679e248cd99ada1ab7dc3d1bf68216d0bef2e6
+  data.tar.gz: ec7bf566540459b5acfd7af05c6ae9a574281941309c5cbd00c833cdab756b99e80c24b764f9633c33154e25f7fe313563f1f3a03e7b1f9d22b9b8a89a7ecf6f

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
@@ -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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-django
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.6.1
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 description: capistrano-django provides a solid basis for common django deployment
 email: mattjmorrison@mattjmorrison.com
 executables: []
@@ -41,17 +41,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: capistrano-django - Welcome to easy deployment with Ruby over SSH for Django