capistrano-django 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f8e330e7f6c66882482a7a4c7d69d0a3413c245879a5d19005e6ea38eb20ff4
-  data.tar.gz: '059aaf93cf4dffa0a84ef4f2f0179dc45ee6d18b348adfa6188d0a6dec08394e'
+  metadata.gz: 6291a323fd01c4311d8b4aec554254e6d7f433199713aab639038fbf0e3f4d8d
+  data.tar.gz: 9b43d25d7ad8395c6b0d7bbd8414916e87f1d2959b8f7e7d349cbf7327f758cf
 SHA512:
-  metadata.gz: 5066be80429ad5ee272afcc493ecfd94bcc8d28e76a68e31e28ea730a20beea982c4a15eb28f6d227a42bcfa58f9c7b84041141218bda971ace6239bfcb46367
-  data.tar.gz: 6d49cca1023248912c3310213689a2cea2c9cdf0d23253cf098aa95c99c86c5b5f63d8c69e8719f2a0a9d7d7600cf323c8ecf66496bcebcbacb7c22cfced65db
+  metadata.gz: 496029f01092040ce67640d2e35abe2097ae74fa1f7ebfccadd94f21a2c0b97fb1eac22ba41330d69dab239043afceb19a117daf57ac0d57976c45c090183dab
+  data.tar.gz: defc670f45ee9f054224718a829475bc0cad5c57dbe7215f8f3f15827a78dc1ed54adc0de822ada6d238c43a04869c88f8c9c2ed263de5281322846c62005fd1

data/lib/capistrano/django.rb

@@ -151,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
@@ -227,6 +227,8 @@ namespace :s3 do
         releases = capture(:ls, '-xtr', releases_path).split
         if releases.count >= fetch(:keep_releases)
           raw_directories.concat releases.last(fetch(:keep_releases))
+        else
+          raw_directories.concat releases
         end
       end
       directories = raw_directories.uniq
@@ -261,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: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano