capistrano-django 3.5.5 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89fc9f826c07b7aa1411e29a26472eb757631566
-  data.tar.gz: 705084c3c6da8720c85609af1d3901f9c60e3586
+SHA256:
+  metadata.gz: 6291a323fd01c4311d8b4aec554254e6d7f433199713aab639038fbf0e3f4d8d
+  data.tar.gz: 9b43d25d7ad8395c6b0d7bbd8414916e87f1d2959b8f7e7d349cbf7327f758cf
 SHA512:
-  metadata.gz: 4aa928f2d47eab89046cc137899bb9bcac08de6fb87abd214e07197a37d75a242143e4380b2f57f27a9104a9787fc4192c0ee2e955098848315fa2d0ecab2958
-  data.tar.gz: e1287696540ad3f9d7adb03e31511430c02df1b2971ad4ea659ef5837e0b1d13c0c1fd8f1b0a6536d6ae0c2d8b1ff3b9a139a1c162a67e5fb12922394e1fdd28
+  metadata.gz: 496029f01092040ce67640d2e35abe2097ae74fa1f7ebfccadd94f21a2c0b97fb1eac22ba41330d69dab239043afceb19a117daf57ac0d57976c45c090183dab
+  data.tar.gz: defc670f45ee9f054224718a829475bc0cad5c57dbe7215f8f3f15827a78dc1ed54adc0de822ada6d238c43a04869c88f8c9c2ed263de5281322846c62005fd1

data/lib/capistrano/django.rb

@@ -1,5 +1,4 @@
 after 'deploy:updating', 'python:create_virtualenv'
-after 'python:create_virtualenv', 'python:post_virtualenv'
 
 namespace :deploy do
 
@@ -61,6 +60,8 @@ namespace :python do
 
 end
 
+after 'python:create_virtualenv', 'python:post_virtualenv'
+
 namespace :flask do
 
   task :setup do
@@ -150,7 +151,7 @@ namespace :django do
   task :collectstatic do
     if fetch(:create_s3_bucket)
       invoke 's3:create_bucket'
-      on roles(:web) do
+      on roles(:weblead) do
         django("collectstatic", "-i *.coffee -i *.less -i node_modules/* -i bower_components/* --noinput --clear")
       end
     else
@@ -179,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
@@ -220,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
 
@@ -258,30 +263,32 @@ namespace :s3 do
       execute %Q|echo 'STATICFILES_STORAGE = "storages.backends.s3boto.S3BotoStorage"' >> #{settings_path}/#{fetch(:django_settings)}.py|
     end
 
-    require 'fog'
-    storage = Fog::Storage.new({
-      aws_access_key_id: fetch(:aws_access_key),
-      aws_secret_access_key: fetch(:aws_secret_key),
-      provider: "AWS"
-    })
-    storage.put_bucket(bucket_name)
-    storage.put_bucket_policy(bucket_name, {
-      'Statement' => [{
-      'Sid' => 'AddPerm',
-      'Effect' => 'Allow',
-      'Principal' => '*',
-      'Action' => ['s3:GetObject'],
-      'Resource' => ["arn:aws:s3:::#{bucket_name}/*"]
-      }]
-    })
-    storage.put_bucket_cors(bucket_name, {
-      "CORSConfiguration" => [{
-        "AllowedOrigin" => ["*"],
-        "AllowedHeader" => ["*"],
-        "AllowedMethod" => ["GET"],
-        "MaxAgeSeconds" => 3000
-      }]
-    })
+    on roles(:weblead) do
+      require 'fog'
+      storage = Fog::Storage.new({
+        aws_access_key_id: fetch(:aws_access_key),
+        aws_secret_access_key: fetch(:aws_secret_key),
+        provider: "AWS"
+      })
+      storage.put_bucket(bucket_name)
+      storage.put_bucket_policy(bucket_name, {
+        'Statement' => [{
+        'Sid' => 'AddPerm',
+        'Effect' => 'Allow',
+        'Principal' => '*',
+        'Action' => ['s3:GetObject'],
+        'Resource' => ["arn:aws:s3:::#{bucket_name}/*"]
+        }]
+      })
+      storage.put_bucket_cors(bucket_name, {
+        "CORSConfiguration" => [{
+          "AllowedOrigin" => ["*"],
+          "AllowedHeader" => ["*"],
+          "AllowedMethod" => ["GET"],
+          "MaxAgeSeconds" => 3000
+        }]
+      })
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-django
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 4.0.1
 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