asset_sync 2.15.0 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42f7c7165955b9d333a17c2c734948699b76dfdc1682c37f3188af87896d72d
-  data.tar.gz: 7b0cec36a35ace13ceac1aa6e1681c608b3a4ef688ba8870d1d32e9c7d8160b1
+  metadata.gz: bd0deada18130ef42d80d6f05d5ff0611a7587dd33d177bbc38641e6b6cad3a9
+  data.tar.gz: cd514b4901f6a3859a00b80282139d9d712db8414ed03ab115de2c7a3dfd3c78
 SHA512:
-  metadata.gz: 2d6ff1f9c5b9c9fa8dd53ee0000d00d42d9746801e9c5dd10400b8c18ae177c2dfd9f5f749bae52553c79550e71c5940771a069bfbe807af437744a61fc6fe72
-  data.tar.gz: 565480826f1820bbb8b4438886fa92d6f49369209ddbb0981f5cdb948b03d73ee5bbb4803febef56907d279a434cc819f2877804a7e5135ad28beb412c6a91ac
+  metadata.gz: eb9cabad00c3dfd61c1ca47c3ba9d6a768375d3dcd6a6798e97a55cc91ee1dd5a030ebd85eeab1f2018dbcc6e6ea18f43591f09bc02f2cd0558a361a13efafb9
+  data.tar.gz: 0c13d03567e9773383179cdfda43699e70352a0ec20c7a7c980017f32b6164eb89e4a4957e6480f1ee1a6a5cc41e270f75bcc0d5fa0dd92363129e0f227c76c7

data/.github/workflows/tests.yaml

@@ -26,30 +26,31 @@ jobs:
         os:
           - ubuntu
         ruby:
-          - 2.5
-          - 2.6
           - 2.7
           - 3.0
+          - 3.1
           - jruby
         gemfile:
-          - gemfiles/rails_5_2.gemfile
           - gemfiles/rails_6_0.gemfile
           - gemfiles/rails_6_1.gemfile
+          - gemfiles/rails_7_0.gemfile
         allow_failures:
           - false
         include:
           - os: ubuntu
             ruby: ruby-head
-            gemfile: gemfiles/rails_6_1.gemfile
+            gemfile: gemfiles/rails_7_0.gemfile
             allow_failures: true
           - os: ubuntu
             ruby: jruby-head
-            gemfile: gemfiles/rails_6_1.gemfile
+            gemfile: gemfiles/rails_7_0.gemfile
             allow_failures: true
         exclude:
           - os: ubuntu
-            ruby: 3.0
-            gemfile: gemfiles/rails_5_2.gemfile
+            ruby: jruby
+            # Rails 7 requires Ruby 2.7
+            # `jruby-9.3.7.0` only supports 2.6.x
+            gemfile: gemfiles/rails_7_0.gemfile
             allow_failures: false
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
@@ -58,7 +59,7 @@ jobs:
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:

data/Appraisals

@@ -1,8 +1,4 @@
 
-appraise "rails_5_2" do
-  gem "rails", "~> 5.2.0"
-end
-
 appraise "rails_6_0" do
   gem "rails", "~> 6.0.0"
 end
@@ -10,3 +6,7 @@ end
 appraise "rails_6_1" do
   gem "rails", "~> 6.1.0"
 end
+
+appraise "rails_7_0" do
+  gem "rails", "~> 7.0.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,34 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.15.3] - 2022-08-25
+
+### Fixed
+
+- Fix config `prefix` about env var & YAML support
+  (https://github.com/AssetSync/asset_sync/pull/427)
+
+
+## [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
@@ -1026,7 +1054,10 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.15.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.15.3...HEAD
+[2.15.3]: https://github.com/AssetSync/asset_sync/compare/v2.15.2...v2.15.3
+[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

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.
@@ -340,6 +343,10 @@ defaults: &defaults
   # always_upload: ['application.js', 'application.css', !ruby/regexp '/application-/\d{32}\.css/']
   # Ignored files. Useful if there are some files that are created dynamically on the server and you don't want to upload on deploy.
   # ignored_files: ['ignore_me.js', !ruby/regexp '/ignore_some/\d{32}\.css/']
+  # Public path. To change the public directory.
+  # public_path: 'public'
+  # Prefix. To change the directory to sync relative to public_path.
+  # prefix: 'assets'
   # Allow custom assets to be cacheable. Note: The base filename will be matched
   # If you have an asset with name "app.0b1a4cd3.js", only "app.0b1a4cd3" will need to be matched
   # cache_asset_regexps: ['cache_me.js', !ruby/regexp '/cache_some\.\d{8}\.css/']

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/gemfiles/{rails_5_2.gemfile → rails_7_0.gemfile}

@@ -5,6 +5,6 @@ source "https://rubygems.org"
 gem "rcov", platforms: :mri_18, group: [:development, :test]
 gem "simplecov", platforms: [:jruby, :mri_19, :ruby_19, :mri_20, :rbx], group: [:development, :test], require: false
 gem "jruby-openssl", platform: :jruby
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 7.0.0"
 
 gemspec path: "../"

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
@@ -184,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
@@ -245,6 +244,7 @@ module AssetSync
       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.prefix                 = yml["prefix"] if yml.has_key?("prefix")
       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")

data/lib/asset_sync/engine.rb

@@ -44,21 +44,13 @@ module AssetSync
           config.enabled = (ENV['ASSET_SYNC_ENABLED'] == 'true') if ENV.has_key?('ASSET_SYNC_ENABLED')
 
           config.existing_remote_files = ENV['ASSET_SYNC_EXISTING_REMOTE_FILES'] || "keep"
-
           config.gzip_compression = (ENV['ASSET_SYNC_GZIP_COMPRESSION'] == 'true') if ENV.has_key?('ASSET_SYNC_GZIP_COMPRESSION')
           config.manifest = (ENV['ASSET_SYNC_MANIFEST'] == 'true') if ENV.has_key?('ASSET_SYNC_MANIFEST')
+          config.prefix = ENV['ASSET_SYNC_PREFIX'] if ENV.has_key?('ASSET_SYNC_PREFIX')
           config.include_manifest = (ENV['ASSET_SYNC_INCLUDE_MANIFEST'] == 'true') if ENV.has_key?('ASSET_SYNC_INCLUDE_MANIFEST')
           config.concurrent_uploads = (ENV['ASSET_SYNC_CONCURRENT_UPLOADS'] == 'true') if ENV.has_key?('ASSET_SYNC_CONCURRENT_UPLOADS')
           config.remote_file_list_cache_file_path = ENV['ASSET_SYNC_REMOTE_FILE_LIST_CACHE_FILE_PATH'] if ENV.has_key?('ASSET_SYNC_REMOTE_FILE_LIST_CACHE_FILE_PATH')
         end
-
-        config.prefix = ENV['ASSET_SYNC_PREFIX'] if ENV.has_key?('ASSET_SYNC_PREFIX')
-
-        config.existing_remote_files = ENV['ASSET_SYNC_EXISTING_REMOTE_FILES'] || "keep"
-
-        config.gzip_compression = (ENV['ASSET_SYNC_GZIP_COMPRESSION'] == 'true') if ENV.has_key?('ASSET_SYNC_GZIP_COMPRESSION')
-        config.manifest = (ENV['ASSET_SYNC_MANIFEST'] == 'true') if ENV.has_key?('ASSET_SYNC_MANIFEST')
-
       end
 
       if File.exist?( app_yaml )

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

data/lib/asset_sync/version.rb

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

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

@@ -19,7 +19,7 @@ defaults: &defaults
   # 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"
@@ -53,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.3
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2022-08-25 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:
     - - ">="
@@ -232,9 +232,9 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and