asset_sync 2.15.1 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b257792e6446e212ee50bb6913aa3aee7ffad9dec336995580e4f88355386a7
-  data.tar.gz: fbddb3142c4a27aa5f0f8f04f32d3addf1719e7df841a23e85f6765ea252146b
+  metadata.gz: b1cd4cc5ab6aa00a60de8cad39bd290f99e10f9c3884798af6dec1a495b5b722
+  data.tar.gz: 06ca40f184d5d79ebe6aa54437a4e72f0a4e4841d944d58e77b742648d24e748
 SHA512:
-  metadata.gz: f4a78f501ad9a2e219f9992b97a8b4a4130b13bea18fb7068a5fb47018f51b7b74fa3cfea110ef76d2897df5e19716d19cc594edb540fd95ca6f32a30ba07384
-  data.tar.gz: cac00fd92e51292ff02b1428ff81db52350d2cc2cf2101fc08bc1964661a163c7d3f89d240eb0fb6be298b7f8438a18e94f768024699d0146ea54d732c3f8da1
+  metadata.gz: 7740b76eee405aba383ab9c8efdf54491288cd172b6f0d02a996b03b94b8b73685d579402bc8aa2af02993f0048b5aa6680944c1c34a3d9dca80b333af5e4484
+  data.tar.gz: e73762db4dcd2b3b41acac66dcb12f731d578edc269a1ea0e0b8105a432fd9ea9ef487a4a8d755ff25927fd4eee6d056fb4a0693739eb94a9e07b0eb0f974a7c

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,30 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.16.0] - 2022-08-26
+
+### Added
+
+- Add option `remote_file_list_cache_file_path`
+  (https://github.com/AssetSync/asset_sync/pull/428)
+
+
+## [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
@@ -1038,7 +1062,10 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.15.1...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.16.0...HEAD
+[2.16.0]: https://github.com/AssetSync/asset_sync/compare/v2.15.3...v2.16.0
+[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

data/README.md

@@ -1,6 +1,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/asset_sync.svg?style=flat-square)](http://badge.fury.io/rb/asset_sync)
-[![Build Status](https://img.shields.io/travis/AssetSync/asset_sync.svg?style=flat-square)](http://travis-ci.org/AssetSync/asset_sync)
+[![Tests](https://github.com/AssetSync/asset_sync/actions/workflows/tests.yaml/badge.svg)](https://github.com/AssetSync/asset_sync/actions/workflows/tests.yaml)
 [![Coverage Status](http://img.shields.io/coveralls/AssetSync/asset_sync.svg?style=flat-square)](https://coveralls.io/r/AssetSync/asset_sync)
 
 
@@ -275,6 +275,9 @@ AssetSync.configure do |config|
   # Path to cache file to skip scanning remote
   # config.remote_file_list_cache_file_path = './.asset_sync_remote_file_list_cache.json'
   #
+  # Path on remote storage to persist remote file list file
+  # config.remote_file_list_remote_path = '/remote/asset_sync_remote_file.json'
+  #
   # Fail silently.  Useful for environments such as Heroku
   # config.fail_silently = true
   #
@@ -343,6 +346,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/']
@@ -380,6 +387,7 @@ AssetSync.config.gzip_compression == ENV['ASSET_SYNC_GZIP_COMPRESSION']
 * **concurrent_uploads**: (`true, false`) when enabled, will upload the files in different Threads, this greatly improves the upload speed. **default:** `'false'`
 * **concurrent_uploads_max_threads**: when concurrent_uploads is enabled, this determines the number of threads that will be created. **default:** `10`
 * **remote_file_list_cache_file_path**: if present, use this path to cache remote file list to skip scanning remote **default:** `nil`
+* **remote_file_list_remote_path**: if present, use this path to download remote file list file to cache file list in local to skip scanning remote. useful in container environment where you cannot maintain the local file, remote_file_list_cache_file_path also needed to make use of this option **default:** `nil`
 * **enabled**: (`true, false`) when false, will disable asset sync. **default:** `'true'` (enabled)
 * **ignored\_files**: an array of files to ignore e.g. `['ignore_me.js', %r(ignore_some/\d{32}\.css)]` Useful if there are some files that are created dynamically on the server and you don't want to upload on deploy **default**: `[]`
 * **cache\_asset\_regexps**: an array of files to add cache headers e.g. `['cache_me.js', %r(cache_some\.\d{8}\.css)]` Useful if there are some files that are added to sprockets assets list and need to be set as 'Cacheable' on uploaded server.  Only rails compiled regexp is matched internally **default**: `[]`

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/config.rb

@@ -28,6 +28,7 @@ module AssetSync
     attr_accessor :concurrent_uploads
     attr_accessor :concurrent_uploads_max_threads
     attr_accessor :remote_file_list_cache_file_path
+    attr_accessor :remote_file_list_remote_path
 
     # FOG configuration
     attr_accessor :fog_provider          # Currently Supported ['AWS', 'Rackspace']
@@ -107,6 +108,7 @@ module AssetSync
       self.concurrent_uploads = false
       self.concurrent_uploads_max_threads = 10
       self.remote_file_list_cache_file_path = nil
+      self.remote_file_list_remote_path = nil
       @additional_local_file_paths_procs = []
 
       load_yml! if defined?(::Rails) && yml_exists?
@@ -244,6 +246,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")
@@ -253,6 +256,7 @@ module AssetSync
       self.concurrent_uploads     = yml['concurrent_uploads'] if yml.has_key?('concurrent_uploads')
       self.concurrent_uploads_max_threads = yml['concurrent_uploads_max_threads'] if yml.has_key?('concurrent_uploads_max_threads')
       self.remote_file_list_cache_file_path = yml['remote_file_list_cache_file_path'] if yml.has_key?('remote_file_list_cache_file_path')
+      self.remote_file_list_remote_path = yml['remote_file_list_remote_path'] if yml.has_key?('remote_file_list_remote_path')
 
       self.azure_storage_account_name = yml['azure_storage_account_name'] if yml.has_key?("azure_storage_account_name")
       self.azure_storage_access_key   = yml['azure_storage_access_key'] if yml.has_key?("azure_storage_access_key")

data/lib/asset_sync/engine.rb

@@ -44,21 +44,14 @@ 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')
+          config.remote_file_list_remote_path = ENV['ASSET_SYNC_REMOTE_FILE_LIST_REMOTE_PATH'] if ENV.has_key?('ASSET_SYNC_REMOTE_FILE_LIST_REMOTE_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

@@ -47,6 +47,10 @@ module AssetSync
       self.config.remote_file_list_cache_file_path
     end
 
+    def remote_file_list_remote_path
+      self.config.remote_file_list_remote_path
+    end
+
     def ignored_files
       expand_file_names(self.config.ignored_files)
     end
@@ -72,6 +76,16 @@ module AssetSync
       return [] if ignore_existing_remote_files?
       return @remote_files if @remote_files
 
+      if remote_file_list_remote_path && remote_file_list_cache_file_path
+        log "Downloading file list file from remote"
+        remote_cache_file = bucket.files.get(remote_file_list_remote_path)
+        if remote_cache_file
+          File.open(remote_file_list_cache_file_path, 'w') do |local_file|
+            local_file.write(remote_cache_file.body)
+          end
+        end
+      end
+
       if remote_file_list_cache_file_path && File.file?(remote_file_list_cache_file_path)
         begin
           content = File.read(remote_file_list_cache_file_path)
@@ -94,6 +108,18 @@ module AssetSync
       end
     end
 
+    def update_remote_file_list_in_remote
+      return if ignore_existing_remote_files?
+      return unless remote_file_list_remote_path
+      return unless remote_file_list_cache_file_path
+      log "Updating file list file in remote"
+      remote_file = bucket.files.new({
+        :key    => remote_file_list_remote_path,
+        :body   => File.open(remote_file_list_cache_file_path)
+      })
+      remote_file.save
+    end
+
     def always_upload_files
       expand_file_names(self.config.always_upload) + get_manifest_path
     end
@@ -317,6 +343,7 @@ module AssetSync
       end
 
       update_remote_file_list_cache(local_files_to_upload)
+      update_remote_file_list_in_remote
     end
 
     def sync

data/lib/asset_sync/version.rb

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

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

@@ -81,6 +81,9 @@ if defined?(AssetSync)
     # Path to cache file to skip scanning remote
     # config.remote_file_list_cache_file_path = './.asset_sync_remote_file_list_cache.json'
     #
+    # Path on remote storage to persist remote file list file
+    # config.remote_file_list_remote_path = '/remote/asset_sync_remote_file.json'
+    #
     # Fail silently.  Useful for environments such as Heroku
     # config.fail_silently = true
     #

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.

data/spec/unit/asset_sync_spec.rb

@@ -94,6 +94,10 @@ describe AssetSync do
     it "should default asset_regexps to empty array" do
       expect(AssetSync.config.cache_asset_regexps).to eq([])
     end
+
+    it "should default remote_file_list_remote_path to nil" do
+      expect(AssetSync.config.remote_file_list_remote_path).to be_nil
+    end
   end
 
   describe 'from yml' do

metadata

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