asset_sync 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d768c5e2075b08498c16af32ad4fb3f1006d4c68bd88846a60c843309a8ef3
-  data.tar.gz: 87a0b335fd8fc8903f30ce171d78d7beff4a87cb7fe0962bdf0c68dcf537c277
+  metadata.gz: c593c361046c4faf574342749aced526c101c823c60b7ab8be5e39c7d029efe7
+  data.tar.gz: 63d1361cfa79cfea245eb5cc63bf889cefa239fdf7ba863164414d48e861d444
 SHA512:
-  metadata.gz: 24dba26c0c958ce65353daccf498fba8b5689a778d9e091325eeb323677f8057ade739e37c60a7c1e8d66d3bae36d87601da6d2bd569bf06559df89cdfca24f9
-  data.tar.gz: eca6579e50a37d8ce887cb5a44c068db42a387d04b58badb9b371d77944fd7f1a95c57132a0af4863f63efe62a7403f68b74d512145da78ca4aeee060344e17c
+  metadata.gz: 4be760845b518f72bdad531311817b2d449bcaaada2b3ea3feb316af17e6c77fe29c1d7c2b72a46c866ba3b3d94fe0c751fa6a8206936c6d19e935bb0cae93a3
+  data.tar.gz: 1a3bb12b3db320cd566d130eb0abce3a4209c7466324c12dc963822bb0edefb9f04926ece5379a6c74b392cfccc751a5097400ccf922f0ec2dcb9e1b620d43d8

data/.github/workflows/tests.yaml

@@ -0,0 +1,64 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'README.md'
+
+jobs:
+  unit_tests:
+    name: Unit Tests
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+          - jruby
+        gemfile:
+          - gemfiles/rails_5_2.gemfile
+          - gemfiles/rails_6_0.gemfile
+          - gemfiles/rails_6_1.gemfile
+        allow_failures:
+          - false
+        include:
+          - os: ubuntu
+            ruby: ruby-head
+            gemfile: gemfiles/rails_6_1.gemfile
+            allow_failures: true
+          - os: ubuntu
+            ruby: jruby-head
+            gemfile: gemfiles/rails_6_1.gemfile
+            allow_failures: true
+        exclude:
+          - os: ubuntu
+            ruby: 3.0
+            gemfile: gemfiles/rails_5_2.gemfile
+            allow_failures: false
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+      ALLOW_FAILURES: "${{ matrix.allow_failures }}"
+    runs-on: ${{ matrix.os }}-latest
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake spec:unit || $ALLOW_FAILURES

data/.travis.yml

@@ -2,14 +2,12 @@
 # http://docs.travis-ci.com/user/workers/container-based-infrastructure/
 sudo: false
 language: ruby
-arch: 
+arch:
   - amd64
   - ppc64le
 cache:
   bundler: true
 rvm:
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
   - 2.7
@@ -17,10 +15,9 @@ rvm:
   - jruby
   - jruby-head
 gemfile:
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.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
@@ -37,11 +34,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-  exclude:
-    - rvm: 2.3
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6_0.gemfile
 notifications:
   webhooks:
     urls:

data/Appraisals

@@ -1,12 +1,4 @@
 
-appraise "rails_5_0" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails_5_1" do
-  gem "rails", "~> 5.1.0"
-end
-
 appraise "rails_5_2" do
   gem "rails", "~> 5.2.0"
 end
@@ -14,3 +6,7 @@ end
 appraise "rails_6_0" do
   gem "rails", "~> 6.0.0"
 end
+
+appraise "rails_6_1" do
+  gem "rails", "~> 6.1.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.13.1] - 2021-03-01
+
+### Fixed
+
+- Fix "files to be uploaded list" generation for file names with dashes
+  (https://github.com/AssetSync/asset_sync/pull/414)
+
+
 ## [2.13.0] - 2020-12-14
 
 ### Added
@@ -986,7 +994,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.13.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...HEAD
+[2.13.1]: https://github.com/AssetSync/asset_sync/compare/v2.13.0...v2.13.1
 [2.13.0]: https://github.com/AssetSync/asset_sync/compare/v2.12.1...v2.13.0
 [2.12.1]: https://github.com/AssetSync/asset_sync/compare/v2.12.0...v2.12.1
 [2.12.0]: https://github.com/AssetSync/asset_sync/compare/v2.11.0...v2.12.0

data/gemfiles/{rails_5_0.gemfile → rails_6_1.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.0.0"
+gem "rails", "~> 6.1.0"
 
 gemspec path: "../"

data/lib/asset_sync/storage.rb

@@ -4,7 +4,7 @@ require "asset_sync/multi_mime"
 
 module AssetSync
   class Storage
-    REGEXP_FINGERPRINTED_FILES = /^(.*)\/([^-]+)-[^\.]+\.([^\.]+)$/
+    REGEXP_FINGERPRINTED_FILES = /\A(.*)\/(.+)-[^\.]+\.([^\.]+)\z/m
     REGEXP_ASSETS_TO_CACHE_CONTROL = /-[0-9a-fA-F]{32,}$/
 
     class BucketNotFound < StandardError;

data/lib/asset_sync/version.rb

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

data/spec/unit/storage_spec.rb

@@ -137,17 +137,22 @@ describe AssetSync::Storage do
 
     it 'should upload updated non-fingerprinted files' do
       @local_files = [
-        'public/image.png',
-        'public/image-82389298328.png',
-        'public/image-a8389f9h324.png',
+        'public/great-image.png',
+        'public/great-image-82389298328.png',
+        'public/great-image-a8389f9h324.png',
+        "public/new\nline.js",
+        "public/new\nline-aaaaaaaaaaa.js",
+        "public/new\nline-bbbbbbbbbbb.js",
         'public/application.js',
         'public/application-b3389d983k1.js',
         'public/application-ac387d53f31.js',
         'public',
       ]
       @remote_files = [
-        'public/image.png',
-        'public/image-a8389f9h324.png',
+        'public/great-image.png',
+        'public/great-image-a8389f9h324.png',
+        "public/new\nline.js",
+        "public/new\nline-aaaaaaaaaaa.js",
         'public/application.js',
         'public/application-b3389d983k1.js',
       ]
@@ -158,7 +163,8 @@ describe AssetSync::Storage do
       allow(File).to receive(:file?).and_return(true) # Pretend they all exist
 
       updated_nonfingerprinted_files = [
-        'public/image.png',
+        'public/great-image.png',
+        "public/new\nline.js",
         'public/application.js',
       ]
       (@local_files - @remote_files + updated_nonfingerprinted_files).each do |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -207,6 +207,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/tests.yaml"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -217,10 +218,9 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and

data/gemfiles/rails_5_1.gemfile

@@ -1,10 +0,0 @@
-# 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", platform: :jruby
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"