capistrano-django 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7ae2989435d16c2a7750e9d87a7faa14de838bed3cf9f3ebba7ec8827817b6
-  data.tar.gz: 3a448518567e049e5bf8523d11fd0c615bf023ff3e8636e67eb65f0989c875ad
+  metadata.gz: e2aab2fc51e449ab64cb345965acfd8a5ee566602c5405fc77d97bfb44ed7835
+  data.tar.gz: 0c95ca2a0283920a83fd743955a219f9902ac78f55b535b16128a8cff79bf333
 SHA512:
-  metadata.gz: 9685f7b08ad7d85777522b81d9ae62e6cd3217d3fbe05bfb6c3f48e1e41c17c5bff84e677d459b9c4d6d1c1fc03167df2f0c95ec2c6858714fcb8178ed87a00f
-  data.tar.gz: 7fec74e3583e8d659f427f9bf826b7302f587187824ba133c663c3e15f0c1c5fe089dba57568bf16ff24576e5ba745387918d8b00bbe4461c81d48e32e1dace2
+  metadata.gz: 1c7919a496382b64eba4bfa8f6bfe22a28009f9d02c3a3ab2a8685a5a7ac76ecfa03ee839130644bca27352a474afdb8f8c63f6ded6a69c1460b828088c931e8
+  data.tar.gz: 78df10b2d463fb671b75b56c316cd88b2aa22def5abadfae144d0cab8ce8b1f8c08fdb5dfb9c6382967c1ff0bf107a1c15fb6e5c3ecb208acbec6ad60b30e976

data/lib/capistrano/django.rb

@@ -264,31 +264,54 @@ 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"
+    require 'aws-sdk-s3'
+    require 'aws-sdk-core'
+    require 'json'
+
+    s3 = Aws::S3::Client.new :credentials => Aws::Credentials.new fetch(:aws_access_key), fetch(:aws_secret_key)
+    s3.create_bucket({:bucket => bucket_name})
+    s3.put_bucket_ownership_controls({
+      :bucket => bucket_name,
+      :ownership_controls => {
+        :rules => [{
+          :object_ownership => :BucketOwnerPreferred
+        }]
+      }
     })
-    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}/*"]
-      }]
+
+    s3.put_public_access_block({
+      :bucket => bucket_name,
+      :public_access_block_configuration => {
+        :ignore_public_acls => false,
+        :block_public_acls => false,
+        :block_public_policy => false,
+        :restrict_public_buckets => false
+      }
     })
-    storage.put_bucket_cors(bucket_name, {
-      "CORSConfiguration" => [{
-        "AllowedOrigin" => ["*"],
-        "AllowedHeader" => ["*"],
-        "AllowedMethod" => ["GET"],
-        "MaxAgeSeconds" => 3000
-      }]
+
+    s3.put_bucket_policy({
+      :bucket => bucket_name,
+      :policy => {
+        :Statement => [{
+          :Effect => "Allow",
+          :Action => ["s3:GetObject"],
+          :Principal => "*",
+          :Resource => ["arn:aws:s3:::#{bucket_name}/*"
+        ]}
+      ]}.to_json
     })
 
+    s3.put_bucket_cors({
+      :bucket => bucket_name,
+      :cors_configuration => {
+        :cors_rules => [{
+          :allowed_origins => ['*'],
+          :allowed_methods => ['GET'],
+          :allowed_headers => ['*'],
+          :max_age_seconds => 3000
+        }]
+      }
+    })
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-django
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Matthew J. Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: capistrano-django - Welcome to easy deployment with Ruby over SSH for Django