asset_sync 2.13.1 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c593c361046c4faf574342749aced526c101c823c60b7ab8be5e39c7d029efe7
-  data.tar.gz: 63d1361cfa79cfea245eb5cc63bf889cefa239fdf7ba863164414d48e861d444
+  metadata.gz: a42f7c7165955b9d333a17c2c734948699b76dfdc1682c37f3188af87896d72d
+  data.tar.gz: 7b0cec36a35ace13ceac1aa6e1681c608b3a4ef688ba8870d1d32e9c7d8160b1
 SHA512:
-  metadata.gz: 4be760845b518f72bdad531311817b2d449bcaaada2b3ea3feb316af17e6c77fe29c1d7c2b72a46c866ba3b3d94fe0c751fa6a8206936c6d19e935bb0cae93a3
-  data.tar.gz: 1a3bb12b3db320cd566d130eb0abce3a4209c7466324c12dc963822bb0edefb9f04926ece5379a6c74b392cfccc751a5097400ccf922f0ec2dcb9e1b620d43d8
+  metadata.gz: 2d6ff1f9c5b9c9fa8dd53ee0000d00d42d9746801e9c5dd10400b8c18ae177c2dfd9f5f749bae52553c79550e71c5940771a069bfbe807af437744a61fc6fe72
+  data.tar.gz: 565480826f1820bbb8b4438886fa92d6f49369209ddbb0981f5cdb948b03d73ee5bbb4803febef56907d279a434cc819f2877804a7e5135ad28beb412c6a91ac

data/.github/workflows/tests.yaml

@@ -6,16 +6,20 @@ on:
       - master
     paths-ignore:
       - 'README.md'
+      - 'CHANGELOG.md'
   push:
     branches:
       - master
     paths-ignore:
       - 'README.md'
+      - 'CHANGELOG.md'
 
 jobs:
   unit_tests:
     name: Unit Tests
-    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    # Homemade support for [ci skip] no longer needed
+    # https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/
+    # if: "contains(github.event.commits[0].message, '[ci skip]') == false"
     strategy:
       fail-fast: false
       matrix:

data/CHANGELOG.md

@@ -18,6 +18,38 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.15.0] - 2021-08-05
+
+### Added
+
+- Add support for option `aws_acl`
+  (https://github.com/AssetSync/asset_sync/pull/420)
+
+
+## [2.14.2] - 2021-05-31
+
+### Added
+
+- Add support for setting option `google_json_key_string` in YML (not new option)
+  (https://github.com/AssetSync/asset_sync/pull/419)
+
+
+## [2.14.1] - 2021-05-14
+
+### Added
+
+- Add support for setting option `log_silently` in YML (not new option)
+  (https://github.com/AssetSync/asset_sync/pull/417)
+
+
+## [2.14.0] - 2021-03-31
+
+### Added
+
+- Add support for fog option `google_json_key_string`
+  (https://github.com/AssetSync/asset_sync/pull/415)
+
+
 ## [2.13.1] - 2021-03-01
 
 ### Fixed
@@ -994,7 +1026,11 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.15.0...HEAD
+[2.15.0]: https://github.com/AssetSync/asset_sync/compare/v2.14.2...v2.15.0
+[2.14.2]: https://github.com/AssetSync/asset_sync/compare/v2.14.1...v2.14.2
+[2.14.1]: https://github.com/AssetSync/asset_sync/compare/v2.14.0...v2.14.1
+[2.14.0]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...v2.14.0
 [2.13.1]: https://github.com/AssetSync/asset_sync/compare/v2.13.0...v2.13.1
 [2.13.0]: https://github.com/AssetSync/asset_sync/compare/v2.12.1...v2.13.0
 [2.12.1]: https://github.com/AssetSync/asset_sync/compare/v2.12.0...v2.12.1

data/README.md

@@ -239,6 +239,11 @@ AssetSync.configure do |config|
   # Change AWS signature version. Default is 4
   # config.aws_signature_version = 4
   #
+  # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+  # Choose from: private | public-read | public-read-write | aws-exec-read |
+  #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+  # config.aws_acl = nil 
+  #
   # Change host option in fog (only if you need to)
   # config.fog_host = 's3.amazonaws.com'
   #
@@ -309,6 +314,11 @@ defaults: &defaults
   # Change AWS signature version. Default is 4
   # aws_signature_version: 4
   #
+  # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+  # Choose from: private | public-read | public-read-write | aws-exec-read |
+  #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+  # aws_acl: null
+  #
   # Change host option in fog (only if you need to)
   # fog_host: "s3.amazonaws.com"
   #
@@ -420,6 +430,7 @@ The blocks are run when local files are being scanned and uploaded
 
 * **aws\_access\_key\_id**: your Amazon S3 access key
 * **aws\_secret\_access\_key**: your Amazon S3 access secret
+* **aws\_acl**: set [canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl) of uploaded object, will override fog_public if set
 
 #### Rackspace
 

data/asset_sync.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "uglifier"
   s.add_development_dependency "appraisal"
 
+  s.add_development_dependency "gem-release"
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/asset_sync/config.rb

@@ -37,7 +37,15 @@ module AssetSync
     attr_reader   :fog_public            # e.g. true, false, "default"
 
     # Amazon AWS
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_session_token, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
+    attr_accessor :aws_access_key_id
+    attr_accessor :aws_secret_access_key
+    attr_accessor :aws_session_token
+    attr_accessor :aws_reduced_redundancy
+    attr_accessor :aws_iam_roles
+    attr_accessor :aws_signature_version
+    attr_accessor :aws_acl
+
+    # Fog
     attr_accessor :fog_host              # e.g. 's3.amazonaws.com'
     attr_accessor :fog_port              # e.g. '9000'
     attr_accessor :fog_path_style        # e.g. true
@@ -49,6 +57,7 @@ module AssetSync
     # Google Storage
     attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id  # when using S3 interop
     attr_accessor :google_json_key_location # when using service accounts
+    attr_accessor :google_json_key_string # when using service accounts
     attr_accessor :google_project # when using service accounts
 
     # Azure Blob with Fog::AzureRM
@@ -71,8 +80,12 @@ module AssetSync
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
     validates :google_storage_secret_access_key,  :presence => true, :if => :google_interop?
     validates :google_storage_access_key_id,      :presence => true, :if => :google_interop?
-    validates :google_json_key_location,          :presence => true, :if => :google_service_account?
     validates :google_project,                    :presence => true, :if => :google_service_account?
+    validate(:if => :google_service_account?) do
+      unless google_json_key_location.present? || google_json_key_string.present?
+        errors.add(:base, 'must provide either google_json_key_location or google_json_key_string if using Google service account')
+      end
+    end
     validates :concurrent_uploads,    :inclusion => { :in => [true, false] }
 
     def initialize
@@ -147,11 +160,11 @@ module AssetSync
     end
 
     def google_interop?
-      google? && google_json_key_location.nil?
+      google? && google_json_key_location.nil? && google_json_key_string.nil?
     end
 
     def google_service_account?
-      google? && google_json_key_location
+      google? && (google_json_key_location || google_json_key_string)
     end
 
     def azure_rm?
@@ -216,6 +229,7 @@ module AssetSync
       self.aws_reduced_redundancy = yml["aws_reduced_redundancy"]
       self.aws_iam_roles          = yml["aws_iam_roles"]
       self.aws_signature_version  = yml["aws_signature_version"]
+      self.aws_acl                = yml["aws_acl"]
       self.rackspace_username     = yml["rackspace_username"]
       self.rackspace_auth_url     = yml["rackspace_auth_url"] if yml.has_key?("rackspace_auth_url")
       self.rackspace_api_key      = yml["rackspace_api_key"]
@@ -223,13 +237,15 @@ module AssetSync
       self.google_project = yml["google_project"] if yml.has_key?("google_project")
       self.google_storage_secret_access_key = yml["google_storage_secret_access_key"] if yml.has_key?("google_storage_secret_access_key")
       self.google_storage_access_key_id     = yml["google_storage_access_key_id"] if yml.has_key?("google_storage_access_key_id")
+      self.google_json_key_string           = yml["google_json_key_string"] if yml.has_key?("google_json_key_string")
       self.existing_remote_files  = yml["existing_remote_files"] if yml.has_key?("existing_remote_files")
       self.gzip_compression       = yml["gzip_compression"] if yml.has_key?("gzip_compression")
       self.manifest               = yml["manifest"] if yml.has_key?("manifest")
       self.fail_silently          = yml["fail_silently"] if yml.has_key?("fail_silently")
+      self.log_silently           = yml["log_silently"] if yml.has_key?("log_silently")
       self.always_upload          = yml["always_upload"] if yml.has_key?("always_upload")
       self.ignored_files          = yml["ignored_files"] if yml.has_key?("ignored_files")
-      self.custom_headers          = yml["custom_headers"] if yml.has_key?("custom_headers")
+      self.custom_headers         = yml["custom_headers"] if yml.has_key?("custom_headers")
       self.run_on_precompile      = yml["run_on_precompile"] if yml.has_key?("run_on_precompile")
       self.invalidate             = yml["invalidate"] if yml.has_key?("invalidate")
       self.cdn_distribution_id    = yml['cdn_distribution_id'] if yml.has_key?("cdn_distribution_id")
@@ -292,6 +308,8 @@ module AssetSync
       elsif google?
         if google_json_key_location
           options.merge!({:google_json_key_location => google_json_key_location, :google_project => google_project})
+        elsif google_json_key_string
+          options.merge!({:google_json_key_string => google_json_key_string, :google_project => google_project})
         else
           options.merge!({
             :google_storage_secret_access_key => google_storage_secret_access_key,

data/lib/asset_sync/engine.rb

@@ -25,6 +25,7 @@ module AssetSync
           config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('AWS_SECRET_ACCESS_KEY')
           config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.has_key?('AWS_SESSION_TOKEN')
           config.aws_signature_version = ENV['AWS_SIGNATURE_VERSION'] if ENV.has_key?('AWS_SIGNATURE_VERSION')
+          config.aws_acl = ENV['AWS_ACL'] if ENV.has_key?('AWS_ACL')
           config.aws_reduced_redundancy = ENV['AWS_REDUCED_REDUNDANCY'] == true  if ENV.has_key?('AWS_REDUCED_REDUNDANCY')
 
           config.rackspace_username = ENV['RACKSPACE_USERNAME'] if ENV.has_key?('RACKSPACE_USERNAME')

data/lib/asset_sync/storage.rb

@@ -195,7 +195,9 @@ module AssetSync
 
       # region fog_public
 
-      if config.fog_public.use_explicit_value?
+      if config.aws? && config.aws_acl
+        file[:acl] = config.aws_acl
+      elsif config.fog_public.use_explicit_value?
         file[:public] = config.fog_public.to_bool
       end
 

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.13.1"
+  VERSION = "2.15.0"
 end

data/lib/generators/asset_sync/templates/asset_sync.rb

@@ -11,6 +11,11 @@ if defined?(AssetSync)
     # Change AWS signature version. Default is 4
     # config.aws_signature_version = 4
     #
+    # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+    # Choose from: private | public-read | public-read-write | aws-exec-read |
+    #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+    # config.aws_acl = nil 
+    #
     # Change host option in fog (only if you need to)
     # config.fog_host = "s3.amazonaws.com"
     #

data/lib/generators/asset_sync/templates/asset_sync.yml

@@ -10,6 +10,11 @@ defaults: &defaults
   # Change AWS signature version. Default is 4
   # aws_signature_version: 4
   #
+  # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+  # Choose from: private | public-read | public-read-write | aws-exec-read |
+  #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+  # aws_acl: null
+  #
   # Change host option in fog (only if you need to)
   # fog_host: "s3.amazonaws.com"
   #

data/spec/unit/google_spec.rb

@@ -99,6 +99,28 @@ describe AssetSync do
       end
     end
 
+    describe "when using service account with JSON key string" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_json_key_string = 'a-google-json-key-string'
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_json_key_string" do
+        expect(AssetSync.config.google_json_key_string).to eq("a-google-json-key-string")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_json_key_string: "a-google-json-key-string",
+                                 google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+      it "should not require that google_storage_secret_access_key or access_key_id be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+    end
   end
 
   describe 'from yml' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.15.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -195,6 +195,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: After you run assets:precompile your compiled assets will be synchronised
   with your S3 bucket.
 email:
@@ -273,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.25
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and