asset_sync 2.6.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ba6147cc39550e51d1eb1bc98420b53b0ca14fe96d90d34e7de36c8a9511b5
-  data.tar.gz: 701e692e95ed4c8ad41a8a5d14e7356ee8c013221e675d7396a8b07816f7a226
+  metadata.gz: 1fbb82cb5023ce3d6e1f088aa62fa32718f8e743977c31b773e3f2a324a0a397
+  data.tar.gz: 504e104e3dfe839bb19b0794a7af8f4bb932fd7f7500347374c14b8862e5ae43
 SHA512:
-  metadata.gz: f03b66ce2292d21a3e1a514307a3bf737c0ea856b46ee6e36aef40b93a2604b544e708f97f7b1e9fbfa81483545929cfb9e7714c4bf4172e6311e22f4cc7ffe2
-  data.tar.gz: e228c684a414b1a9859ea8df91f76b1b6c5ad4234863b46307dd76b705aa8a71f18cba5ab8c959a33ac089ca9d5c355dc26391bb16441a8c802fc0f44f97c087
+  metadata.gz: 2945ac417bfcc350068b1c9ce3c59781f0cd7bb50bd606919803e55602a81b06d6d6fed24de0c7e62ca695a83901481d296a9ae20031b5ab1e9edfc61a69823a
+  data.tar.gz: b96f8274e66d1d7ec2ab182fdcb3833edd7c24b9dc9d9fd9d038a3db8608dc1102a23b2998ec5c9749e89fe6d12212488dc9733ec927328fcc0f388bf84df357

data/.travis.yml

@@ -5,21 +5,24 @@ language: ruby
 cache:
   bundler: true
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
   - jruby
   - jruby-head
 gemfile:
-  - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 before_install:
-  - gem install bundler
+  # 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
@@ -29,9 +32,13 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: 2.6
     - 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,8 +1,4 @@
 
-appraise "rails_4_2" do
-  gem "rails", "~> 4.2.0"
-end
-
 appraise "rails_5_0" do
   gem "rails", "~> 5.0.0"
 end
@@ -14,3 +10,7 @@ end
 appraise "rails_5_2" do
   gem "rails", "~> 5.2.0"
 end
+
+appraise "rails_6_0" do
+  gem "rails", "~> 6.0.0"
+end

data/CHANGELOG.md

@@ -18,6 +18,96 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
+## [2.12.1] - 2020-06-17
+
+### Fixed
+
+- Fix initializer template in generator
+  (https://github.com/AssetSync/asset_sync/pull/404)
+
+
+## [2.12.0] - 2020-06-11
+
+### Added
+
+- Add option `aws_session_token` to support AWS Temporary Security Credentials
+  (https://github.com/AssetSync/asset_sync/pull/403)
+
+
+## [2.11.0] - 2020-03-13
+
+### Added
+
+- Add option `remote_file_list_cache_file_path` to skip scanning remote
+  (https://github.com/AssetSync/asset_sync/pull/400)
+
+
+## [2.10.0] - 2020-02-26
+
+### Added
+
+- Add option `concurrent_uploads_max_threads` to limit number of threads for uploading files
+  (https://github.com/AssetSync/asset_sync/pull/398)
+
+
+## [2.9.1] - 2020-02-20
+
+### Fixed
+
+- Fix uploading of sprockets manifest file
+  (https://github.com/AssetSync/asset_sync/pull/397)
+
+
+## [2.9.0] - 2020-01-15
+
+### Added
+
+- Add option `concurrent_uploads` to improve speed of uploading
+  (https://github.com/AssetSync/asset_sync/pull/393)
+
+
+## [2.8.2] - 2019-12-27
+
+### Changed
+
+- Use `delete_multiple_objects` when storage is `aws`
+  (https://github.com/AssetSync/asset_sync/pull/392)
+
+
+## [2.8.1] - 2019-07-25
+
+### Changed
+
+- Removed `rubyforge_project` from gemspec
+  (https://github.com/AssetSync/asset_sync/pull/386)
+
+### Fixed
+
+- Fixed when `fog_public` set to `false`, file were still set to be public
+  (https://github.com/AssetSync/asset_sync/pull/387)
+
+
+## [2.8.0] - 2019-06-17
+
+### Added
+
+- Add option `fog_port`
+  (https://github.com/AssetSync/asset_sync/pull/385)
+
+
+## [2.7.0] - 2019-03-15
+
+### Added
+
+- Adds JSON API support when using Google Storage
+  (https://github.com/AssetSync/asset_sync/pull/381)
+
+### Changed
+
+- Update `AssetSync::MultiMime.lookup` to always return strings (kind of internal change)
+  (https://github.com/AssetSync/asset_sync/pull/380)
+
+
 ## [2.6.0] - 2018-12-07
 
 ### Added
@@ -105,7 +195,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Only support mime-type >= 2.99,  
   which is released at the end of 2015  
-- Only support mactivemodel >= 4.1,  
+- Only support activemodel >= 4.1,  
   which is released in 2014  
 
 
@@ -888,7 +978,17 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.6.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.12.1...HEAD
+[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
+[2.11.0]: https://github.com/AssetSync/asset_sync/compare/v2.10.0...v2.11.0
+[2.10.0]: https://github.com/AssetSync/asset_sync/compare/v2.9.1...v2.10.0
+[2.9.1]: https://github.com/AssetSync/asset_sync/compare/v2.9.0...v2.9.1
+[2.9.0]: https://github.com/AssetSync/asset_sync/compare/v2.8.2...v2.9.0
+[2.8.2]: https://github.com/AssetSync/asset_sync/compare/v2.8.1...v2.8.2
+[2.8.1]: https://github.com/AssetSync/asset_sync/compare/v2.8.0...v2.8.1
+[2.8.0]: https://github.com/AssetSync/asset_sync/compare/v2.7.0...v2.8.0
+[2.7.0]: https://github.com/AssetSync/asset_sync/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/AssetSync/asset_sync/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/AssetSync/asset_sync/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/AssetSync/asset_sync/compare/v2.3.0...v2.4.0

data/README.md

@@ -103,10 +103,10 @@ On **non default S3 bucket region**: If your bucket is set to a region that is n
 
 If you wish to have your assets sync to a sub-folder of your bucket instead of into the root add the following to your ``production.rb`` file
 
-```ruby
+``` ruby
   # store assets in a 'folder' instead of bucket root
   config.assets.prefix = "/production/assets"
-````
+```
 
 Also, ensure the following are defined (in production.rb or application.rb)
 
@@ -170,7 +170,17 @@ heroku config:add FOG_DIRECTORY=xxxx
 heroku config:add FOG_PROVIDER=Rackspace
 ```
 
-Google Storage Cloud configuration is supported as well
+Google Storage Cloud configuration is supported as well. The preferred option is using the [GCS JSON API](https://github.com/fog/fog-google#storage) which requires that you create an appropriate service account, generate the signatures and make them accessible to asset sync at the prescribed location 
+
+```bash
+heroku config:add FOG_PROVIDER=Google
+heroku config:add GOOGLE_PROJECT=xxxx
+heroku config:add GOOGLE_JSON_KEY_LOCATION=xxxx
+heroku config:add FOG_DIRECTORY=xxxx
+```
+
+If using the S3 API the following config is required
+
 ``` bash
 heroku config:add FOG_PROVIDER=Google
 heroku config:add GOOGLE_STORAGE_ACCESS_KEY_ID=xxxx
@@ -198,6 +208,7 @@ AssetSync.configure do |config|
   config.fog_directory = ENV['FOG_DIRECTORY']
   config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
   config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+  config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.key?('AWS_SESSION_TOKEN')
 
   # Don't delete files from the store
   # config.existing_remote_files = 'keep'
@@ -216,6 +227,9 @@ AssetSync.configure do |config|
   # Change host option in fog (only if you need to)
   # config.fog_host = 's3.amazonaws.com'
   #
+  # Change port option in fog (only if you need to)
+  # config.fog_port = "9000"
+  #
   # Use http instead of https.
   # config.fog_scheme = 'http'
   #
@@ -229,6 +243,15 @@ AssetSync.configure do |config|
   # Upload the manifest file also.
   # config.include_manifest = false
   #
+  # Upload files concurrently
+  # config.concurrent_uploads = false
+  # 
+  # Number of threads when concurrent_uploads is enabled
+  # config.concurrent_uploads_max_threads = 10
+  #
+  # Path to cache file to skip scanning remote
+  # config.remote_file_list_cache_file_path = './.asset_sync_remote_file_list_cache.json'
+  #
   # Fail silently.  Useful for environments such as Heroku
   # config.fail_silently = true
   #
@@ -325,6 +348,9 @@ AssetSync.config.gzip_compression == ENV['ASSET_SYNC_GZIP_COMPRESSION']
 * **gzip\_compression**: (`true, false`) when enabled, will automatically replace files that have a gzip compressed equivalent with the compressed version. **default:** `'false'`
 * **manifest**: (`true, false`) when enabled, will use the `manifest.yml` generated by Rails to get the list of local files to upload. **experimental**. **default:** `'false'`
 * **include_manifest**: (`true, false`) when enabled, will upload the `manifest.yml` generated by Rails. **default:** `'false'`
+* **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`
 * **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**: `[]`
@@ -385,6 +411,14 @@ The blocks are run when local files are being scanned and uploaded
 * **rackspace\_api\_key**: your Rackspace API Key.
 
 #### Google Storage
+
+When using the JSON API
+
+- **google\_project**: your Google Cloud Project name where the Google Cloud Storage bucket resides
+- **google\_json\_key\_location**: path to the location of the service account key.  The service account key must be a JSON type key
+
+When using the S3 API
+
 * **google\_storage\_access\_key\_id**: your Google Storage access key
 * **google\_storage\_secret\_access\_key**: your Google Storage access secret
 
@@ -515,6 +549,10 @@ AssetSync.configure do |config|
   config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
   config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
   config.prefix = 'assets'
+  # Can be a `Pathname` or `String`
+  # Will be converted into an `Pathname`
+  # If relative, will be converted into an absolute path 
+  # via `::Rails.root` or `::Dir.pwd`
   config.public_path = Pathname('./public')
 end
 ```
@@ -584,7 +622,7 @@ Make sure you have a .env file with these details:-
     AWS_SECRET_ACCESS_KEY=<yoursecretkey>
     FOG_DIRECTORY=<yourbucket>
     FOG_REGION=<youbucketregion>
-
+    
     # for AzureRM provider
     AZURE_STORAGE_ACCOUNT_NAME=<youraccountname>
     AZURE_STORAGE_ACCESS_KEY=<youraccesskey>

data/asset_sync.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.rubyforge_project = "asset_sync"
-
   s.add_dependency("fog-core")
   s.add_dependency('unf')
   s.add_dependency('activemodel', ">= 4.1.0")

data/gemfiles/{rails_4_2.gemfile → rails_6_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", "~> 4.2.0"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/asset_sync/config.rb

@@ -26,7 +26,9 @@ module AssetSync
     attr_accessor :cdn_distribution_id
     attr_accessor :cache_asset_regexps
     attr_accessor :include_manifest
-    attr_writer :public_path
+    attr_accessor :concurrent_uploads
+    attr_accessor :concurrent_uploads_max_threads
+    attr_accessor :remote_file_list_cache_file_path
 
     # FOG configuration
     attr_accessor :fog_provider          # Currently Supported ['AWS', 'Rackspace']
@@ -35,8 +37,9 @@ module AssetSync
     attr_reader   :fog_public            # e.g. true, false, "default"
 
     # Amazon AWS
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
+    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_session_token, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
     attr_accessor :fog_host              # e.g. 's3.amazonaws.com'
+    attr_accessor :fog_port              # e.g. '9000'
     attr_accessor :fog_path_style        # e.g. true
     attr_accessor :fog_scheme            # e.g. 'http'
 
@@ -44,7 +47,9 @@ module AssetSync
     attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
 
     # Google Storage
-    attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id
+    attr_accessor :google_storage_secret_access_key, :google_storage_access_key_id  # when using S3 interop
+    attr_accessor :google_json_key_location # when using service accounts
+    attr_accessor :google_project # when using service accounts
 
     # Azure Blob with Fog::AzureRM
     attr_accessor :azure_storage_account_name
@@ -59,8 +64,11 @@ module AssetSync
     validates :aws_secret_access_key, :presence => true, :if => proc {aws? && !aws_iam?}
     validates :rackspace_username,    :presence => true, :if => :rackspace?
     validates :rackspace_api_key,     :presence => true, :if => :rackspace?
-    validates :google_storage_secret_access_key,  :presence => true, :if => :google?
-    validates :google_storage_access_key_id,      :presence => true, :if => :google?
+    validates :google_storage_secret_access_key,  :presence => true, :if => :google_interop?
+    validates :google_storage_access_key_id,      :presence => true, :if => :google_interop?
+    validates :google_json_key_location,          :presence => true, :if => :google_service_account?
+    validates :google_project,                    :presence => true, :if => :google_service_account?
+    validates :concurrent_uploads,    :inclusion => { :in => [true, false] }
 
     def initialize
       self.fog_region = nil
@@ -79,6 +87,9 @@ module AssetSync
       self.invalidate = []
       self.cache_asset_regexps = []
       self.include_manifest = false
+      self.concurrent_uploads = false
+      self.concurrent_uploads_max_threads = 10
+      self.remote_file_list_cache_file_path = nil
       @additional_local_file_paths_procs = []
 
       load_yml! if defined?(::Rails) && yml_exists?
@@ -130,6 +141,14 @@ module AssetSync
       fog_provider =~ /google/i
     end
 
+    def google_interop?
+      google? && google_json_key_location.nil?
+    end
+
+    def google_service_account?
+      google? && google_json_key_location
+    end
+
     def azure_rm?
       fog_provider =~ /azurerm/i
     end
@@ -159,10 +178,24 @@ module AssetSync
       @public_path || ::Rails.public_path
     end
 
+    def public_path=(path)
+      # Generate absolute path even when relative path passed in
+      # Required for generating relative sprockets manifest path
+      pathname = Pathname(path)
+      @public_path = if pathname.absolute?
+        pathname
+      elsif defined?(::Rails.root)
+        ::Rails.root.join(pathname)
+      else
+        Pathname(::Dir.pwd).join(pathname)
+      end
+    end
+
     def load_yml!
       self.enabled                = yml["enabled"] if yml.has_key?('enabled')
       self.fog_provider           = yml["fog_provider"]
       self.fog_host               = yml["fog_host"]
+      self.fog_port               = yml["fog_port"]
       self.fog_directory          = yml["fog_directory"]
       self.fog_region             = yml["fog_region"]
       self.fog_public             = yml["fog_public"] if yml.has_key?("fog_public")
@@ -170,14 +203,17 @@ module AssetSync
       self.fog_scheme             = yml["fog_scheme"]
       self.aws_access_key_id      = yml["aws_access_key_id"]
       self.aws_secret_access_key  = yml["aws_secret_access_key"]
+      self.aws_session_token      = yml["aws_session_token"] if yml.has_key?("aws_session_token")
       self.aws_reduced_redundancy = yml["aws_reduced_redundancy"]
       self.aws_iam_roles          = yml["aws_iam_roles"]
       self.aws_signature_version  = yml["aws_signature_version"]
       self.rackspace_username     = yml["rackspace_username"]
       self.rackspace_auth_url     = yml["rackspace_auth_url"] if yml.has_key?("rackspace_auth_url")
       self.rackspace_api_key      = yml["rackspace_api_key"]
-      self.google_storage_secret_access_key = yml["google_storage_secret_access_key"]
-      self.google_storage_access_key_id     = yml["google_storage_access_key_id"]
+      self.google_json_key_location = yml["google_json_key_location"] if yml.has_key?("google_json_key_location")
+      self.google_project = yml["google_project"] if yml.has_key?("google_project")
+      self.google_storage_secret_access_key = yml["google_storage_secret_access_key"] if yml.has_key?("google_storage_secret_access_key")
+      self.google_storage_access_key_id     = yml["google_storage_access_key_id"] if yml.has_key?("google_storage_access_key_id")
       self.existing_remote_files  = yml["existing_remote_files"] if yml.has_key?("existing_remote_files")
       self.gzip_compression       = yml["gzip_compression"] if yml.has_key?("gzip_compression")
       self.manifest               = yml["manifest"] if yml.has_key?("manifest")
@@ -190,6 +226,9 @@ module AssetSync
       self.cdn_distribution_id    = yml['cdn_distribution_id'] if yml.has_key?("cdn_distribution_id")
       self.cache_asset_regexps    = yml['cache_asset_regexps'] if yml.has_key?("cache_asset_regexps")
       self.include_manifest       = yml['include_manifest'] if yml.has_key?("include_manifest")
+      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.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")
@@ -222,8 +261,10 @@ module AssetSync
             :aws_access_key_id => aws_access_key_id,
             :aws_secret_access_key => aws_secret_access_key
           })
+          options.merge!({:aws_session_token => aws_session_token}) if aws_session_token
         end
         options.merge!({:host => fog_host}) if fog_host
+        options.merge!({:port => fog_port}) if fog_port
         options.merge!({:scheme => fog_scheme}) if fog_scheme
         options.merge!({:aws_signature_version => aws_signature_version}) if aws_signature_version
         options.merge!({:path_style => fog_path_style}) if fog_path_style
@@ -236,10 +277,14 @@ module AssetSync
         options.merge!({ :rackspace_region => fog_region }) if fog_region
         options.merge!({ :rackspace_auth_url => rackspace_auth_url }) if rackspace_auth_url
       elsif google?
-        options.merge!({
-          :google_storage_secret_access_key => google_storage_secret_access_key,
-          :google_storage_access_key_id => google_storage_access_key_id
-        })
+        if google_json_key_location
+          options.merge!({:google_json_key_location => google_json_key_location, :google_project => google_project})
+        else
+          options.merge!({
+            :google_storage_secret_access_key => google_storage_secret_access_key,
+            :google_storage_access_key_id => google_storage_access_key_id
+          })
+        end
         options.merge!({:region => fog_region}) if fog_region
       elsif azure_rm?
         require 'fog/azurerm'
@@ -340,7 +385,7 @@ module AssetSync
       end
 
       def to_bool
-        !@value.nil?
+        !!@value
       end
     end
   end

data/lib/asset_sync/engine.rb

@@ -17,11 +17,13 @@ module AssetSync
           config.fog_directory = ENV['FOG_DIRECTORY'] if ENV.has_key?('FOG_DIRECTORY')
           config.fog_region = ENV['FOG_REGION'] if ENV.has_key?('FOG_REGION')
           config.fog_host = ENV['FOG_HOST'] if ENV.has_key?('FOG_HOST')
+          config.fog_port = ENV['FOG_PORT'] if ENV.has_key?('FOG_PORT')
           config.fog_scheme = ENV['FOG_SCHEMA'] if ENV.has_key?('FOG_SCHEMA')
           config.fog_path_style = ENV['FOG_PATH_STYLE'] if ENV.has_key?('FOG_PATH_STYLE')
 
           config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID'] if ENV.has_key?('AWS_ACCESS_KEY_ID')
           config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('AWS_SECRET_ACCESS_KEY')
+          config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.has_key?('AWS_SESSION_TOKEN')
           config.aws_signature_version = ENV['AWS_SIGNATURE_VERSION'] if ENV.has_key?('AWS_SIGNATURE_VERSION')
           config.aws_reduced_redundancy = ENV['AWS_REDUCED_REDUNDANCY'] == true  if ENV.has_key?('AWS_REDUCED_REDUNDANCY')
 
@@ -41,6 +43,8 @@ module AssetSync
           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.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')

data/lib/asset_sync/multi_mime.rb

@@ -11,9 +11,9 @@ module AssetSync
       end
 
       if defined?(::MIME::Types)
-        ::MIME::Types.type_for(ext).first
+        ::MIME::Types.type_for(ext).first.to_s
       elsif defined?(::Mime::Type)
-        ::Mime::Type.lookup_by_extension(ext)
+        ::Mime::Type.lookup_by_extension(ext).to_s
       elsif defined?(::Rack::Mime)
         ext_with_dot = ".#{ext}"
         ::Rack::Mime.mime_type(ext_with_dot)

data/lib/asset_sync/storage.rb

@@ -37,6 +37,10 @@ module AssetSync
       self.config.public_path
     end
 
+    def remote_file_list_cache_file_path
+      self.config.remote_file_list_cache_file_path
+    end
+
     def ignored_files
       expand_file_names(self.config.ignored_files)
     end
@@ -58,6 +62,32 @@ module AssetSync
         (get_local_files + config.additional_local_file_paths).uniq
     end
 
+    def remote_files
+      return [] if ignore_existing_remote_files?
+      return @remote_files if @remote_files
+
+      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)
+          return @remote_files = JSON.parse(content)
+        rescue JSON::ParserError
+          warn "Failed to parse #{remote_file_list_cache_file_path} as json"
+        end
+      end
+
+      @remote_files = get_remote_files
+    end
+
+    def update_remote_file_list_cache(local_files_to_upload)
+      return unless remote_file_list_cache_file_path
+      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
+        file.write(uploaded.to_json)
+      end
+    end
+
     def always_upload_files
       expand_file_names(self.config.always_upload) + get_manifest_path
     end
@@ -132,9 +162,15 @@ module AssetSync
       from_remote_files_to_delete = remote_files - local_files - ignored_files - always_upload_files
 
       log "Flagging #{from_remote_files_to_delete.size} file(s) for deletion"
-      # Delete unneeded remote files
-      bucket.files.each do |f|
-        delete_file(f, from_remote_files_to_delete)
+      # Delete unneeded remote files, if we are on aws delete in bulk else use sequential delete
+      if self.config.aws? && connection.respond_to?(:delete_multiple_objects)
+        from_remote_files_to_delete.each_slice(500) do |slice|
+          connection.delete_multiple_objects(config.fog_directory, slice)
+        end
+      else
+        bucket.files.each do |f|
+          delete_file(f, from_remote_files_to_delete)
+        end
       end
     end
 
@@ -231,28 +267,38 @@ module AssetSync
         })
       end
 
-      if config.azure_rm?
-        # converts content_type from MIME::Type to String.
-        # because Azure::Storage (called from Fog::AzureRM) expects content_type as a String like "application/json; charset=utf-8"
-        file[:content_type] = file[:content_type].content_type if file[:content_type].is_a?(::MIME::Type)
-      end
-
       bucket.files.create( file ) unless ignore
       file_handle.close
       gzip_file_handle.close if gzip_file_handle
     end
 
     def upload_files
-      # get a fresh list of remote files
-      remote_files = ignore_existing_remote_files? ? [] : get_remote_files
       # fixes: https://github.com/rumblelabs/asset_sync/issues/19
       local_files_to_upload = local_files - ignored_files - remote_files + always_upload_files
       local_files_to_upload = (local_files_to_upload + get_non_fingerprinted(local_files_to_upload)).uniq
-
-      # Upload new files
-      local_files_to_upload.each do |f|
-        next unless File.file? "#{path}/#{f}" # Only files.
-        upload_file f
+      # Only files.
+      local_files_to_upload = local_files_to_upload.select { |f| File.file? "#{path}/#{f}" }
+
+      if self.config.concurrent_uploads
+        jobs = Queue.new
+        local_files_to_upload.each { |f| jobs.push(f) }
+        jobs.close
+
+        num_threads = [self.config.concurrent_uploads_max_threads, local_files_to_upload.length].min
+        # Upload new files
+        workers = Array.new(num_threads) do
+          Thread.new do
+            while f = jobs.pop
+              upload_file(f)
+            end
+          end
+        end
+        workers.map(&:join)
+      else
+        # Upload new files
+        local_files_to_upload.each do |f|
+          upload_file f
+        end
       end
 
       if self.config.cdn_distribution_id && files_to_invalidate.any?
@@ -261,6 +307,8 @@ module AssetSync
         data = cdn.post_invalidation(self.config.cdn_distribution_id, files_to_invalidate)
         log "Invalidation id: #{data.body["Id"]}"
       end
+
+      update_remote_file_list_cache(local_files_to_upload)
     end
 
     def sync

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.6.0".freeze
+  VERSION = "2.12.1"
 end

data/lib/generators/asset_sync/install_generator.rb

@@ -35,6 +35,10 @@ module AssetSync
       "<%= ENV['AWS_SECRET_ACCESS_KEY'] %>"
     end
 
+    def aws_session_token
+      "<%= ENV['AWS_SESSION_TOKEN'] %>"
+    end
+
     def google_storage_access_key_id
       "<%= ENV['GOOGLE_STORAGE_ACCESS_KEY_ID'] %>"
     end

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

@@ -4,6 +4,7 @@ if defined?(AssetSync)
     config.fog_provider = 'AWS'
     config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
     config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+    config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.key?('AWS_SESSION_TOKEN')
     # To use AWS reduced redundancy storage.
     # config.aws_reduced_redundancy = true
     #
@@ -13,6 +14,9 @@ if defined?(AssetSync)
     # Change host option in fog (only if you need to)
     # config.fog_host = "s3.amazonaws.com"
     #
+    # Change port option in fog (only if you need to)
+    # config.fog_port = "9000"
+    #
     # Use http instead of https. Default should be "https" (at least for fog-aws)
     # config.fog_scheme = "http"
     <%- elsif google? -%>
@@ -60,6 +64,12 @@ if defined?(AssetSync)
     # Upload the manifest file also.
     # config.include_manifest = false
     #
+    # Upload files concurrently
+    # config.concurrent_uploads = false
+    #
+    # Path to cache file to skip scanning remote
+    # config.remote_file_list_cache_file_path = './.asset_sync_remote_file_list_cache.json'
+    #
     # Fail silently.  Useful for environments such as Heroku
     # config.fail_silently = true
     #

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

@@ -13,6 +13,9 @@ defaults: &defaults
   # Change host option in fog (only if you need to)
   # fog_host: "s3.amazonaws.com"
   #
+  # Change port option in fog (only if you need to)
+  # config.fog_port = "9000"
+  #
   # Use http instead of https. Default should be "https" (at least for fog-aws)
   # fog_scheme: "http"
   <%- elsif google? -%>

data/spec/fixtures/google_with_service_account_yml/config/asset_sync.yml

@@ -0,0 +1,19 @@
+defaults: &defaults
+  fog_provider: "Google"
+  google_json_key_location: 'gcs.json'
+  google_project: 'some-project'
+
+development:
+  <<: *defaults
+  fog_directory: "rails_app_development"
+  existing_remote_files: keep
+
+test:
+  <<: *defaults
+  fog_directory: "rails_app_test"
+  existing_remote_files: keep
+
+production:
+  <<: *defaults
+  fog_directory: "rails_app_production"
+  existing_remote_files: delete

data/spec/unit/asset_sync_spec.rb

@@ -145,7 +145,7 @@ describe AssetSync do
 
     it "should default asset_regexps to match regexps" do
       expect(AssetSync.config.cache_asset_regexps).to eq(['cache_me.js', /cache_some\.\d{8}\.css/])
-    end    
+    end
   end
 
   describe 'from yml, exporting to a mobile hybrid development directory' do
@@ -255,12 +255,12 @@ describe AssetSync do
       expect(AssetSync.config.manifest_path).to match(/public\/custom_assets\/manifest.yml/)
     end
   end
-  
+
   describe 'with cache_asset_regexps' do
     before(:each) do
       AssetSync.config = AssetSync::Config.new
     end
-    
+
     it "config.cache_asset_regexp should set cache_asset_regexps" do
       AssetSync.config.cache_asset_regexp = /\.[a-f0-9]{8}/i
       expect(AssetSync.config.cache_asset_regexps.size).to eq(1)
@@ -283,4 +283,36 @@ describe AssetSync do
       expect{ AssetSync::Config.new }.to raise_error(Psych::SyntaxError)
     end
   end
+
+  describe 'FogPublicValue' do
+    describe "#to_bool" do
+      it "true should be converted to true" do
+        expect(AssetSync::Config::FogPublicValue.new(true).to_bool).to be_truthy
+      end
+      it "false should be converted to false" do
+        expect(AssetSync::Config::FogPublicValue.new(false).to_bool).to be_falsey
+      end
+      it "nil should be converted to false" do
+        expect(AssetSync::Config::FogPublicValue.new(nil).to_bool).to be_falsey
+      end
+      it "'default' should be converted to false" do
+        expect(AssetSync::Config::FogPublicValue.new("default").to_bool).to be_truthy
+      end
+    end
+
+    describe "#use_explicit_value?" do
+      it "true should be converted to true" do
+        expect(AssetSync::Config::FogPublicValue.new(true).use_explicit_value?).to be_truthy
+      end
+      it "false should be converted to true" do
+        expect(AssetSync::Config::FogPublicValue.new(false).use_explicit_value?).to be_truthy
+      end
+      it "nil should be converted to true" do
+        expect(AssetSync::Config::FogPublicValue.new(nil).use_explicit_value?).to be_truthy
+      end
+      it "'default' should be converted to false" do
+        expect(AssetSync::Config::FogPublicValue.new("default").use_explicit_value?).to be_falsey
+      end
+    end
+  end
 end

data/spec/unit/google_spec.rb

@@ -8,8 +8,6 @@ describe AssetSync do
       AssetSync.config = AssetSync::Config.new
       AssetSync.configure do |config|
         config.fog_provider = 'Google'
-        config.google_storage_access_key_id = 'aaaa'
-        config.google_storage_secret_access_key = 'bbbb'
         config.fog_directory = 'mybucket'
         config.existing_remote_files = "keep"
       end
@@ -24,14 +22,6 @@ describe AssetSync do
       expect(AssetSync.config.existing_remote_files?).to eq(true)
     end
 
-    it "should configure google_storage_access_key_id" do
-      expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
-    end
-
-    it "should configure google_storage_secret_access_key" do
-      expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
-    end
-
     it "should configure fog_directory" do
       expect(AssetSync.config.fog_directory).to eq("mybucket")
     end
@@ -47,36 +37,119 @@ describe AssetSync do
     it "should default manifest to false" do
       expect(AssetSync.config.manifest).to be_falsey
     end
-  end
 
-  describe 'from yml' do
-    before(:each) do
-      set_rails_root('google_with_yml')
-      AssetSync.config = AssetSync::Config.new
-    end
+    describe "when using S3 interop API" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_storage_access_key_id = 'aaaa'
+          config.google_storage_secret_access_key = 'bbbb'
+        end
+      end
 
-    it "should configure google_storage_access_key_id" do
-      expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
-    end
+      it "should configure google_storage_access_key_id" do
+        expect(AssetSync.config.google_storage_access_key_id).to eq("aaaa")
+      end
 
-    it "should configure google_storage_secret_access_key" do
-      expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
-    end
+      it "should configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq("bbbb")
+      end
 
-    it "should configure google_storage_access_key" do
-      expect(AssetSync.config.fog_directory).to eq("rails_app_test")
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_storage_access_key_id: "aaaa",
+                                google_storage_secret_access_key: "bbbb",
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+
+      it "should not require that google_json_key_location be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
+
+      it "should require that google_storage_secret_access_key or access_key_id be set" do
+
+        AssetSync.configure do |config|
+          config.google_storage_access_key_id = nil
+          config.google_storage_secret_access_key = nil
+        end
+
+        expect(AssetSync.config.valid?).to eq(false)
+      end
     end
 
-    it "should configure google_storage_access_key" do
-      expect(AssetSync.config.existing_remote_files).to eq("keep")
+    describe "when using service account" do
+      before(:each) do
+        AssetSync.configure do |config|
+          config.google_json_key_location = '/path/to.json'
+          config.google_project = 'a-google-project-name'
+        end
+      end
+
+      it "should configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq("/path/to.json")
+      end
+
+      it "should return the correct fog_options" do
+        expected_fog_options = { google_json_key_location: "/path/to.json",
+                                 google_project: 'a-google-project-name',
+                                provider: "Google"}
+        expect(AssetSync.config.fog_options).to eq(expected_fog_options)
+      end
+      it "should not require that google_storage_secret_access_key or access_key_id be set" do
+        expect(AssetSync.config.valid?).to eq(true)
+      end
     end
 
-    it "should default gzip_compression to false" do
-      expect(AssetSync.config.gzip_compression).to be_falsey
+  end
+
+  describe 'from yml' do
+    describe 'when using S3 interop API' do
+      before(:each) do
+        set_rails_root('google_with_yml')
+        AssetSync.config = AssetSync::Config.new
+      end
+
+      it "should configure google_storage_access_key_id" do
+        expect(AssetSync.config.google_storage_access_key_id).to eq("xxxx")
+      end
+
+      it "should configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq("zzzz")
+      end
+
+      it "should not configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq(nil)
+      end
+
+      it "should configure fog_directory" do
+        expect(AssetSync.config.fog_directory).to eq("rails_app_test")
+      end
+
+      it "should configure existing_remote_files" do
+        expect(AssetSync.config.existing_remote_files).to eq("keep")
+      end
+
+      it "should default gzip_compression to false" do
+        expect(AssetSync.config.gzip_compression).to be_falsey
+      end
+
+      it "should default manifest to false" do
+        expect(AssetSync.config.manifest).to be_falsey
+      end
     end
 
-    it "should default manifest to false" do
-      expect(AssetSync.config.manifest).to be_falsey
+    describe 'when using service account API' do
+      before(:each) do
+        set_rails_root('google_with_service_account_yml')
+        AssetSync.config = AssetSync::Config.new
+      end
+
+      it "should configure google_json_key_location" do
+        expect(AssetSync.config.google_json_key_location).to eq("gcs.json")
+      end
+
+      it "should not configure google_storage_secret_access_key" do
+        expect(AssetSync.config.google_storage_secret_access_key).to eq(nil)
+      end
     end
   end
 

data/spec/unit/railsless_spec.rb

@@ -14,7 +14,7 @@ describe AssetSync do
         config.fog_region = 'eu-west-1'
         config.existing_remote_files = "keep"
         config.prefix = "assets"
-        config.public_path = Pathname("./public")
+        config.public_path = "./public"
       end
     end
 
@@ -22,8 +22,9 @@ describe AssetSync do
       expect(AssetSync.config.prefix).to eq("assets")
     end
 
-    it "should have prefix of assets" do
-      expect(AssetSync.config.public_path.to_s).to eq("./public")
+    it "should have public_path" do
+      expect(AssetSync.config.public_path.to_s).to be_end_with("/public")
+      expect(AssetSync.config.public_path).to be_absolute
     end
 
     it "should default AssetSync to enabled" do

data/spec/unit/storage_spec.rb

@@ -54,6 +54,87 @@ describe AssetSync::Storage do
       storage.upload_files
     end
 
+    it 'should upload files concurrently if enabled' do
+      @config.concurrent_uploads = true
+      storage = AssetSync::Storage.new(@config)
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      expect(Thread).to receive(:new).exactly(3).times.and_call_original
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      storage.upload_files
+    end
+
+    it 'should allow custom number of threads' do
+      @config.concurrent_uploads = true
+      @config.concurrent_uploads_max_threads = 2
+      storage = AssetSync::Storage.new(@config)
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      expect(Thread).to receive(:new).exactly(2).times.and_call_original
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      storage.upload_files
+    end
+
+    it 'should allow remote_file_list_cache_file_path configuration' do
+      file_path = './foo.json'
+      @config.remote_file_list_cache_file_path = file_path
+      storage = AssetSync::Storage.new(@config)
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      File.write(file_path, @remote_files.to_json)
+      expect(storage).not_to receive(:get_remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      expect(storage).not_to receive(:warn)
+      storage.upload_files
+
+      # update remote_file_list_cache corretly
+      updated = JSON.parse(File.read(file_path))
+      expect(updated.sort.uniq).to eq (@remote_files + @local_files + storage.always_upload_files).sort.uniq
+
+      File.delete(file_path)
+    end
+
+    it 'should work with broken cache' do
+      file_path = './foo.json'
+      @config.remote_file_list_cache_file_path = file_path
+
+      storage = AssetSync::Storage.new(@config)
+
+      File.write(file_path, 'some non-json text file content')
+
+      allow(storage).to receive(:get_local_files).and_return(@local_files)
+      allow(storage).to receive(:get_remote_files).and_return(@remote_files)
+      allow(File).to receive(:file?).and_return(true) # Pretend they all exist
+
+      (@local_files - @remote_files + storage.always_upload_files).each do |file|
+        expect(storage).to receive(:upload_file).with(file)
+      end
+
+      # when broken, warning message should be prompted
+      expect(storage).to receive(:warn)
+
+      storage.upload_files
+
+      File.delete(file_path)
+    end
+
     it 'should upload updated non-fingerprinted files' do
       @local_files = [
         'public/image.png',
@@ -125,7 +206,7 @@ describe AssetSync::Storage do
       end
     end
 
-    it 'should upload additonal  files' do
+    it 'should upload additonal files' do
       @local_files = [
         'public/image.png',
         'public/image-82389298328.png',
@@ -307,4 +388,59 @@ describe AssetSync::Storage do
       storage.upload_file('assets/some_longer_path/local_image2.jpg')
     end
   end
+
+  describe '#delete_extra_remote_files' do
+    it 'should delete the files in bulk' do
+      remote_files = ['public/image.png']
+      connection = double
+      config = double
+
+      storage = AssetSync::Storage.new(@config)
+
+      [:local_files, :ignored_files, :always_upload_files].each do |method|
+        expect(storage).to receive(method).and_return([])
+      end
+
+      allow(storage).to receive(:get_remote_files).and_return(remote_files)
+      allow(storage).to receive(:connection).and_return(connection).twice
+      allow(storage).to receive(:config).and_return(config).twice
+      allow(config).to receive(:aws?).and_return(true)
+      allow(config).to receive(:fog_directory).and_return('foo')
+      expect(connection).to receive(:delete_multiple_objects).with('foo', remote_files)
+
+      storage.delete_extra_remote_files
+    end
+
+    context 'when not aws' do
+      it 'deletes files sequentially' do
+        remote_files = ['public/image.png']
+        connection = double
+        config = double
+        directories = double
+        directory = double
+        file = double
+
+        storage = AssetSync::Storage.new(@config)
+
+        [:local_files, :ignored_files, :always_upload_files].each do |method|
+          expect(storage).to receive(method).and_return([])
+        end
+
+        allow(storage).to receive(:get_remote_files).and_return(remote_files)
+        allow(storage).to receive(:connection).and_return(connection).twice
+        allow(storage).to receive(:config).and_return(config)
+        allow(config).to receive(:aws?).and_return(false)
+        allow(config).to receive(:fog_directory).and_return('foo')
+        allow(config).to receive(:assets_prefix).and_return('foo')
+        allow(directories).to receive(:get).and_return(directory)
+        allow(directory).to receive(:files).and_return([file])
+        allow(file).to receive(:key).and_return('public/image.png')
+        allow(connection).to receive(:directories).and_return(directories)
+        expect(connection).not_to receive(:delete_multiple_objects)
+        expect(file).to receive(:destroy)
+
+        storage.delete_extra_remote_files
+      end
+    end
+  end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Simon Hamilton
 - David Rice
 - Phil McClure
 - Toby Osbourn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -203,10 +203,10 @@ files:
 - UPGRADING.md
 - asset_sync.gemspec
 - docs/heroku.md
-- gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/asset_sync.rb
 - lib/asset_sync/asset_sync.rb
 - lib/asset_sync/config.rb
@@ -223,6 +223,7 @@ files:
 - spec/dummy_app/app/assets/javascripts/application.js
 - spec/fixtures/aws_with_yml/config/asset_sync.yml
 - spec/fixtures/azure_rm_with_yml/config/asset_sync.yml
+- spec/fixtures/google_with_service_account_yml/config/asset_sync.yml
 - spec/fixtures/google_with_yml/config/asset_sync.yml
 - spec/fixtures/rackspace_with_yml/config/asset_sync.yml
 - spec/fixtures/with_invalid_yml/config/asset_sync.yml
@@ -240,7 +241,7 @@ homepage: https://github.com/rumblelabs/asset_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -255,9 +256,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: asset_sync
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and
   Rackspace Cloudfiles
@@ -266,6 +266,7 @@ test_files:
 - spec/dummy_app/app/assets/javascripts/application.js
 - spec/fixtures/aws_with_yml/config/asset_sync.yml
 - spec/fixtures/azure_rm_with_yml/config/asset_sync.yml
+- spec/fixtures/google_with_service_account_yml/config/asset_sync.yml
 - spec/fixtures/google_with_yml/config/asset_sync.yml
 - spec/fixtures/rackspace_with_yml/config/asset_sync.yml
 - spec/fixtures/with_invalid_yml/config/asset_sync.yml