asset_sync 2.14.2 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56414f299dce966e768266fd6a06f73896a95fbd7747be08bf94481dcd25f6ce
-  data.tar.gz: 906057c77eca271b2042aa174de7644c235f58cbd36db95dbec6eae17180f3d0
+  metadata.gz: 637e59bd4543dca69ef7f27a5bb8e6759e1ab082d4279ac9fa34c93dfbb249f8
+  data.tar.gz: b6855c7789d2ab8ae49abf0d9606204239ab1949574af540b8e1aec60d79de87
 SHA512:
-  metadata.gz: f45ce18cf34f17ab8fb9fcfffe2ab9746fe8642fe02b779d8ed53b94f8ba884e23fae6c2180ee2b5478d756c5dd3510ae12b4055a4bd8a46e2447fee0f9e6d38
-  data.tar.gz: 37b916a3e8531351719b209c58660a7e26438689ea5bc8c0ca059af83c879b764ec7333c4a9612db629a89ee381796535ee53a71af8dea0c2cbfdaa3c83c77dc
+  metadata.gz: '0947b76c9abcd8aea09106f954f76acabbf3b35a782d6b9af531325590359b66a89d9cf8fdd608a9f763e8c7d63d707780993713f667d9a8be9c144a3e7641f7'
+  data.tar.gz: 50255f748090ce2c2923344b4878bf875e9886d59929dd2888ef91416ec86063988ca3e16ee6f71a94cda540a779e3474a6468a49af8901fbd3b19bc7cdeee24

data/CHANGELOG.md

@@ -18,8 +18,35 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
-=======
-## [2.14.2]
+## [2.15.2] - 2022-06-02
+
+### Fixed
+
+- Fix incorrect commented code in asset_sync.yml
+  (https://github.com/AssetSync/asset_sync/pull/426)
+
+
+## [2.15.1] - 2021-11-22
+
+### Changed
+
+- Update dev dependency `fog-azure-rm` to become `gitlab-fog-azure-rm`
+
+### Fixed
+
+- Fix YAML config file parsing with Psych v4
+  (https://github.com/AssetSync/asset_sync/pull/422)
+
+
+## [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
 
@@ -27,8 +54,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   (https://github.com/AssetSync/asset_sync/pull/419)
 
 
-=======
-## [2.14.1]
+## [2.14.1] - 2021-05-14
 
 ### Added
 
@@ -1020,7 +1046,10 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.14.2...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.15.2...HEAD
+[2.15.2]: https://github.com/AssetSync/asset_sync/compare/v2.15.1...v2.15.2
+[2.15.1]: https://github.com/AssetSync/asset_sync/compare/v2.15.0...v2.15.1
+[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

data/README.md

@@ -35,7 +35,10 @@ Or, to use Azure Blob storage, configure as this.
 
 ``` ruby
 gem "asset_sync"
-gem "fog-azure-rm"
+gem "gitlab-fog-azure-rm"
+
+# This gem seems unmaintianed
+# gem "fog-azure-rm"
 ```
 
 To use Backblaze B2, insert these.
@@ -239,6 +242,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 +317,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 +433,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

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mime-types', ">= 3.0")
 
   s.add_development_dependency "fog-aws"
-  s.add_development_dependency "fog-azure-rm"
+  s.add_development_dependency "gitlab-fog-azure-rm"
   s.add_development_dependency "fog-backblaze"
 
   s.add_development_dependency "uglifier"

data/lib/asset_sync/asset_sync.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module AssetSync
 
   class << self
@@ -60,6 +62,14 @@ module AssetSync
       stdout.puts msg unless config.log_silently?
     end
 
+    def load_yaml(yaml)
+      if YAML.respond_to?(:unsafe_load)
+        YAML.unsafe_load(yaml)
+      else
+        YAML.load(yaml)
+      end
+    end
+
     def enabled?
       config.enabled?
     end

data/lib/asset_sync/config.rb

@@ -2,7 +2,6 @@
 
 require "active_model"
 require "erb"
-require "yaml"
 
 module AssetSync
   class Config
@@ -37,7 +36,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
@@ -176,7 +183,7 @@ module AssetSync
     end
 
     def yml
-      @yml ||= ::YAML.load(::ERB.new(IO.read(yml_path)).result)[::Rails.env] || {}
+      @yml ||= ::AssetSync.load_yaml(::ERB.new(IO.read(yml_path)).result)[::Rails.env] || {}
     end
 
     def yml_path
@@ -221,6 +228,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"]

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

@@ -117,7 +117,7 @@ module AssetSync
           return manifest.assets.values.map { |f| File.join(self.config.assets_prefix, f) }
         elsif File.exist?(self.config.manifest_path)
           log "Using: Manifest #{self.config.manifest_path}"
-          yml = YAML.load(IO.read(self.config.manifest_path))
+          yml = AssetSync.load_yaml(IO.read(self.config.manifest_path))
 
           return yml.map do |original, compiled|
             # Upload font originals and compiled
@@ -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.14.2"
+  VERSION = "2.15.2"
 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,11 +10,16 @@ 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"
   #
   # Change port option in fog (only if you need to)
-  # config.fog_port = "9000"
+  # fog_port: "9000"
   #
   # Use http instead of https. Default should be "https" (at least for fog-aws)
   # fog_scheme: "http"
@@ -48,7 +53,7 @@ defaults: &defaults
   # Set `public` option when uploading file depending on value,
   # Setting to "default" makes asset sync skip setting the option
   # Possible values: true, false, "default" (default: true)
-  # config.fog_public = true
+  # fog_public: "true"
 
   existing_remote_files: keep
   # To delete existing remote files.

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.15.2
 platform: ruby
 authors:
 - Simon Hamilton
 - David Rice
 - Phil McClure
 - Toby Osbourn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog-azure-rm
+  name: gitlab-fog-azure-rm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -272,7 +272,7 @@ homepage: https://github.com/rumblelabs/asset_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -287,8 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
-signing_key:
+rubygems_version: 3.3.15
+signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
   Rackspace Cloudfiles