asset_sync 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42f7c7165955b9d333a17c2c734948699b76dfdc1682c37f3188af87896d72d
-  data.tar.gz: 7b0cec36a35ace13ceac1aa6e1681c608b3a4ef688ba8870d1d32e9c7d8160b1
+  metadata.gz: 3b257792e6446e212ee50bb6913aa3aee7ffad9dec336995580e4f88355386a7
+  data.tar.gz: fbddb3142c4a27aa5f0f8f04f32d3addf1719e7df841a23e85f6765ea252146b
 SHA512:
-  metadata.gz: 2d6ff1f9c5b9c9fa8dd53ee0000d00d42d9746801e9c5dd10400b8c18ae177c2dfd9f5f749bae52553c79550e71c5940771a069bfbe807af437744a61fc6fe72
-  data.tar.gz: 565480826f1820bbb8b4438886fa92d6f49369209ddbb0981f5cdb948b03d73ee5bbb4803febef56907d279a434cc819f2877804a7e5135ad28beb412c6a91ac
+  metadata.gz: f4a78f501ad9a2e219f9992b97a8b4a4130b13bea18fb7068a5fb47018f51b7b74fa3cfea110ef76d2897df5e19716d19cc594edb540fd95ca6f32a30ba07384
+  data.tar.gz: cac00fd92e51292ff02b1428ff81db52350d2cc2cf2101fc08bc1964661a163c7d3f89d240eb0fb6be298b7f8438a18e94f768024699d0146ea54d732c3f8da1

data/CHANGELOG.md

@@ -18,6 +18,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [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 +1038,8 @@ 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.1...HEAD
+[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.

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
@@ -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

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.1"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Simon Hamilton
 - David Rice
 - Phil McClure
 - Toby Osbourn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-11-22 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.25
-signing_key:
+rubygems_version: 3.2.31
+signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
   Rackspace Cloudfiles