asset_sync 2.19.1 → 2.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3cff5bf62d9a38dccdb2cc331751542d095f116f65d57adb724ff73c9ee5c7a
-  data.tar.gz: e7ae0540fae435e27746843d3f6f252df988d48dfe38f5df0ee33935b6dabc57
+  metadata.gz: 6e1f29929c13838cda7e4b0b9cb0726b3861377a4a8007b000783450d9469f66
+  data.tar.gz: 6d6d866d7c36fc919d7290ff4e0e6755c5307468331c79d797ffc026033603de
 SHA512:
-  metadata.gz: bae0a6a3491aa7b5f9e5f45aba77509a0d77511fbe03fe2f293660a58ddd59dfdfbce74f9d4c253350180b40ea623a78871472d135ce8961fb893d820b6991fc
-  data.tar.gz: 1294404e59e81c7557c312c2af66892d5c78c80ceeae4f2d38550389fccea111e5f40b711135ed896d90e83036baf709ba7cdab86ffccd867d414f2af643d741
+  metadata.gz: f46e711a3f5d6fef73c14c88c72a26fbf76409d183f25d2d752d7bca5de6de59b51e68696d0fc6883e84d1ad3b15cf236f431802ec1be6df50825378cebbf432
+  data.tar.gz: a30af16fec62e8dd38887fa7bcda4e176d557925db0fdd88ea4a99f0d43bd2a90f996afe9e13a653d944a12ce2524196044ad60dd438e1f25a1fb4ca766eb41a

data/.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: monthly
+      time: "06:00"
+      timezone: Asia/Hong_Kong
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: monthly
+      time: "06:00"
+      timezone: Asia/Hong_Kong
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"

data/.github/workflows/codeql.yml

@@ -26,18 +26,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
         with:
           category: "/language:${{ matrix.language }}"

data/.github/workflows/tests.yaml

@@ -26,33 +26,53 @@ jobs:
         os:
           - ubuntu
         ruby:
-          - 2.7
-          - 3.0
-          - 3.1
-          - 3.2
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
+          - "3.4"
+          - "4.0"
           - jruby
         gemfile:
-          - gemfiles/rails_6_0.gemfile
           - gemfiles/rails_6_1.gemfile
           - gemfiles/rails_7_0.gemfile
+          - gemfiles/rails_7_1.gemfile
+          - gemfiles/rails_7_2.gemfile
+          - gemfiles/rails_8_0.gemfile
+          - gemfiles/rails_8_1.gemfile
         allow_failures:
           - false
+        exclude:
+          - os: ubuntu
+            ruby: "3.0"
+            gemfile: gemfiles/rails_7_2.gemfile
+          - os: ubuntu
+            ruby: "3.0"
+            gemfile: gemfiles/rails_8_0.gemfile
+          - os: ubuntu
+            ruby: "3.1"
+            gemfile: gemfiles/rails_8_0.gemfile
+          - os: ubuntu
+            ruby: jruby
+            gemfile: gemfiles/rails_8_0.gemfile
+          - os: ubuntu
+            ruby: "3.0"
+            gemfile: gemfiles/rails_8_1.gemfile
+          - os: ubuntu
+            ruby: "3.1"
+            gemfile: gemfiles/rails_8_1.gemfile
+          - os: ubuntu
+            ruby: jruby
+            gemfile: gemfiles/rails_8_1.gemfile
         include:
           - os: ubuntu
             ruby: ruby-head
-            gemfile: gemfiles/rails_7_0.gemfile
+            gemfile: gemfiles/rails_8_1.gemfile
             allow_failures: true
           - os: ubuntu
             ruby: jruby-head
-            gemfile: gemfiles/rails_7_0.gemfile
+            gemfile: gemfiles/rails_7_2.gemfile
             allow_failures: true
-        exclude:
-          - os: ubuntu
-            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 }}"
       ALLOW_FAILURES: "${{ matrix.allow_failures }}"
@@ -60,9 +80,9 @@ jobs:
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@d5f787ce339eb0767271bc01d922e85644c2c8ab # v1.280.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/Appraisals

@@ -1,12 +1,30 @@
 
-appraise "rails_6_0" do
-  gem "rails", "~> 6.0.0"
-end
-
 appraise "rails_6_1" do
   gem "rails", "~> 6.1.0"
+  # For Ruby 3.4 compatibility until this commit of httpclient is released https://github.com/nahi/httpclient/commit/552a56770689e800ad11a21cd06075064736569f
+  gem "mutex_m"
+  gem "logger"
 end
 
 appraise "rails_7_0" do
   gem "rails", "~> 7.0.0"
+  # For Ruby 3.4 compatibility until this commit of httpclient is released https://github.com/nahi/httpclient/commit/552a56770689e800ad11a21cd06075064736569f
+  gem "mutex_m"
+  gem "logger"
+end
+
+appraise "rails_7_1" do
+  gem "rails", "~> 7.1.0"
+end
+
+appraise "rails_7_2" do
+  gem "rails", "~> 7.2.0"
+end
+
+appraise "rails_8_0" do
+  gem "rails", "~> 8.0.0"
+end
+
+appraise "rails_8_1" do
+  gem "rails", "~> 8.1.0"
 end

data/CHANGELOG.md

@@ -18,6 +18,32 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.19.3] - 2026-01-10
+
+### Changed
+
+- Improvement: Ensure "Uploading" logs are output when compression is enabled
+  (https://github.com/AssetSync/asset_sync/pull/452)
+
+### Fixed
+- Fix compatibility with ruby 4.0+ due to `CGI library is removed from the default gems`
+  (https://bugs.ruby-lang.org/issues/21258)
+
+[2.19.3]: https://github.com/AssetSync/asset_sync/compare/v2.19.2...v2.19.3
+
+
+## [2.19.2] - 2024-08-29
+
+### Fixed
+
+- Avoid duplicate files in remote files list cache
+  (https://github.com/AssetSync/asset_sync/pull/439)
+- Drop trailing slash of prefix in #get_local_files
+  (https://github.com/AssetSync/asset_sync/pull/425)
+
+[2.19.2]: https://github.com/AssetSync/asset_sync/compare/v2.19.1...v2.19.2
+
+
 ## [2.19.1] - 2023-08-17
 
 ### Fixed

data/Gemfile

@@ -2,5 +2,7 @@ source 'https://rubygems.org'
 gemspec
 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 'jruby-openssl', :platforms => :jruby
+# https://github.com/jruby/jruby/issues/7262
+gem "jar-dependencies", "0.4.1", :platforms => :jruby
 gem 'rails'

data/asset_sync.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Simon Hamilton", "David Rice", "Phil McClure", "Toby Osbourn"]
   s.email       = ["shamilton@rumblelabs.com", "me@davidjrice.co.uk", "pmcclure@rumblelabs.com", "tosbourn@rumblelabs.com"]
-  s.homepage    = "https://github.com/rumblelabs/asset_sync"
+  s.homepage    = "https://github.com/AssetSync/asset_sync"
   s.summary     = %q{Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and Rackspace Cloudfiles}
   s.description = %q{After you run assets:precompile your compiled assets will be synchronised with your S3 bucket.}
 
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency('unf')
   s.add_dependency('activemodel', ">= 4.1.0")
   s.add_dependency('mime-types', ">= 2.99")
+  s.add_dependency("cgi")
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "bundler"
@@ -39,4 +40,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.metadata = {
+    "bug_tracker_uri"   => "#{s.homepage}/issues",
+    "changelog_uri"     => "#{s.homepage}/blob/master/CHANGELOG.md",
+    "source_code_uri"   => s.homepage,
+  }
 end

data/gemfiles/rails_6_1.gemfile

@@ -4,7 +4,10 @@ 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 "jruby-openssl", platforms: :jruby
+gem "jar-dependencies", "0.4.1", platforms: :jruby
 gem "rails", "~> 6.1.0"
+gem "mutex_m"
+gem "logger"
 
 gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -4,7 +4,10 @@ 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 "jruby-openssl", platforms: :jruby
+gem "jar-dependencies", "0.4.1", platforms: :jruby
 gem "rails", "~> 7.0.0"
+gem "mutex_m"
+gem "logger"
 
 gemspec path: "../"

data/gemfiles/{rails_6_0.gemfile → rails_7_1.gemfile}

@@ -4,7 +4,8 @@ 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", "~> 6.0.0"
+gem "jruby-openssl", platforms: :jruby
+gem "jar-dependencies", "0.4.1", platforms: :jruby
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/rails_7_2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+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", platforms: :jruby
+gem "jar-dependencies", "0.4.1", platforms: :jruby
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_8_0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+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", platforms: :jruby
+gem "jar-dependencies", "0.4.1", platforms: :jruby
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_8_1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+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", platforms: :jruby
+gem "jar-dependencies", "0.4.1", platforms: :jruby
+gem "rails", "~> 8.1.0"
+
+gemspec path: "../"

data/lib/asset_sync/storage.rb

@@ -1,3 +1,4 @@
+require "cgi"
 require "fog/core"
 
 require "asset_sync/multi_mime"
@@ -108,7 +109,7 @@ module AssetSync
       return if ignore_existing_remote_files?
 
       File.open(self.remote_file_list_cache_file_path, 'w') do |file|
-        uploaded = local_files_to_upload + remote_files
+        uploaded = (local_files_to_upload + remote_files).uniq.sort
         file.write(uploaded.to_json)
       end
     end
@@ -171,7 +172,7 @@ module AssetSync
 
       log "Using: Directory Search of #{path}/#{self.config.assets_prefix}"
       Dir.chdir(path) do
-        to_load = self.config.assets_prefix.present? ? "#{self.config.assets_prefix}/**/**" : '**/**'
+        to_load = self.config.assets_prefix.present? ? File.join(self.config.assets_prefix, '/**/**') : '**/**'
         Dir[to_load]
       end
     end
@@ -287,6 +288,8 @@ module AssetSync
             percentage = ((original_size.to_f/compressed_size.to_f)*100).round(2)
             log "Uploading: #{f} instead of #{compressed_name} (compression increases this file by #{percentage}%)"
           end
+        else
+          log "Uploading: #{f}"
         end
       else
         compressed_encoding = CONTENT_ENCODING[File.extname(f).delete('.')]

data/lib/asset_sync/version.rb

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

data/spec/spec_helper.rb

@@ -24,6 +24,9 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+# Workaround for uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger
+require "logger"
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'asset_sync'

data/spec/unit/storage_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require 'fileutils'
 
 describe AssetSync::Storage do
   include_context "mock Rails without_yml"
@@ -490,4 +491,52 @@ describe AssetSync::Storage do
       end
     end
   end
+
+  describe '#get_local_files' do
+    around(:each) do |example|
+      Dir.mktmpdir do |public_path|
+        @public_path = public_path
+        example.call
+      end
+    end
+
+    before(:each) do
+      @config = AssetSync::Config.new
+      @config.public_path = @public_path
+      @config.prefix = 'assets'
+      @storage = AssetSync::Storage.new(@config)
+
+      Dir.mkdir("#{@public_path}/assets")
+    end
+
+    context 'with empty directory' do
+      it 'has no files' do
+        expect(@storage.get_local_files).to eq([])
+      end
+    end
+
+    context 'with non-empty directory' do
+      before(:each) do
+        FileUtils.touch("#{@public_path}/assets/application.js")
+      end
+
+      it 'lists available files' do
+        expect(@storage.get_local_files).to eq([
+          'assets/application.js'
+        ])
+      end
+
+      context 'with trailing slash on asset prefix' do
+        before(:each) do
+          @config.prefix = 'assets/'
+        end
+
+        it 'lists available files with single slashes' do
+          expect(@storage.get_local_files).to eq([
+            'assets/application.js'
+          ])
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.19.3
 platform: ruby
 authors:
 - Simon Hamilton
 - David Rice
 - Phil McClure
 - Toby Osbourn
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -69,6 +68,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -221,10 +234,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/dependabot.yml"
 - ".github/workflows/codeql.yml"
 - ".github/workflows/tests.yaml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -233,9 +246,12 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
+- gemfiles/rails_8_0.gemfile
+- gemfiles/rails_8_1.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -269,11 +285,13 @@ files:
 - spec/unit/rackspace_spec.rb
 - spec/unit/railsless_spec.rb
 - spec/unit/storage_spec.rb
-homepage: https://github.com/rumblelabs/asset_sync
+homepage: https://github.com/AssetSync/asset_sync
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  bug_tracker_uri: https://github.com/AssetSync/asset_sync/issues
+  changelog_uri: https://github.com/AssetSync/asset_sync/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/AssetSync/asset_sync
 rdoc_options: []
 require_paths:
 - lib
@@ -288,8 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
   Rackspace Cloudfiles

data/.travis.yml

@@ -1,41 +0,0 @@
-# Send builds to container-based infrastructure
-# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: false
-language: ruby
-arch:
-  - amd64
-  - ppc64le
-cache:
-  bundler: true
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - ruby-head
-  - jruby
-  - jruby-head
-gemfile:
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6_0.gemfile
-  - gemfiles/rails_6_1.gemfile
-before_install:
-  # Cannot use bundler 2.x due to dependency (mainly rails 4.2)
-  # Solution from https://github.com/rails/rails/blob/4-2-stable/.travis.yml
-  - "travis_retry gem update --system --no-doc || travis_retry gem update --system --no-rdoc --no-ri"
-  - "travis_retry gem install bundler -v '<2'"
-env:
-  global:
-    - FOG_DIRECTORY=asset-sync-travis
-    - FOG_PROVIDER=AWS
-    - secure: "dy8Fqlg3b1ZMK1BY5z6NMQLbzAVd7GWVYY0MeCQALz76zRac0z8MyU8hkv6h\nozFry7DSdbGehGT9foOnkWTwzGzf1rzdd5cmWrUPk1wDTRgMM9SrwodPj1TU\nzsq2EFx0a79vADQN8JXkpLC1YD6kEb9aWkTxrIT9KBgw+J5H32o="
-    - secure: "Hmx7D7/p2LlA2ya/xBIz21s/8MLIQCjvfYB7RWBNlWk1PfqRLAz8wX6TUVWy\nfAFktMjLnpRLRYO7AgQS4jcfQ/k0HYK9IXzqXzeI00TNm0Vwp0TCXhawiOFT\nSvUMhs2/1vRfjN0HOJ75XlWRhJzV/G5rOMiafAZLsVzN/0iiB8g="
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-notifications:
-  webhooks:
-    urls:
-      - https://www.travisbuddy.com/
-    on_success: never