asset_sync 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b188551b31d31cea82d0a2daa66ea13611526bf
-  data.tar.gz: 8dc71ab706a8da82c83030d1c0bcabe88d44e4d4
+SHA256:
+  metadata.gz: 6da0a6735b574c2e13ef9bb97f00b35f6b28555e81a43aeaa2a4d74ca86cac44
+  data.tar.gz: 11eafe2e4c2297e47a64736d4d6834140271d26c557dcddf2244eabd356cc2b3
 SHA512:
-  metadata.gz: 4666031ff720620d925adbfee0e5213abd28c96e2df89f37af6e88dfd96d76e3b439e4a0e52c373243ea5452078218b07afaacc86f4b35f8fdeed8fa660c37f9
-  data.tar.gz: bef8d1ecde9c3bb946016db35ec7f558b9dea0f51a96bb19a727f03d2560688b48901720a3d2e102cf1aad2e5b3a617021e1cdc2e37bb502912dbbb36c9ef422
+  metadata.gz: 3fb08a40bb3769b7a966483b28c9c7b5b050ff6f2457f066f4c66bd3646f6da11fc99981b62924a884effa8b0662e314f1725b0e92fdfc6166536a42634f42ce
+  data.tar.gz: 6743f47d2400bce60b26291c21743f0a99427ddb108b9d5f5492913d595f5b71dd2824bf48e51e1117a6e6be641afb3dce85e2265f9dd8cf537be30f75f2df5d

data/.editorconfig

@@ -3,5 +3,22 @@
 # top-most EditorConfig file
 root = true
 
+# default configuration
+[*]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+
+# Set default charset
+charset = utf-8
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
 [*.{md,markdown}]
 trim_trailing_whitespace = false

data/CHANGELOG.md

@@ -18,7 +18,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
-## [2.2.0] - 2016-07-12
+## [2.3.0] - 2017-12-05
+
+### Added
+
+- Add options: `aws_signature_version`, `fog_host`, `fog_scheme`
+  (https://github.com/AssetSync/asset_sync/pull/362)
+
+### Changed
+
+- Change initializer template to only run when AssetSync const defined
+
+
+## [2.2.0] - 2017-07-12
 
 ### Added
 
@@ -35,7 +47,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   (https://github.com/AssetSync/asset_sync/pull/351)
 
 
-## [2.1.0] - 2016-05-19
+## [2.1.0] - 2017-05-19
 
 ### Added
 
@@ -830,7 +842,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.3.0...HEAD
+[2.3.0]: https://github.com/AssetSync/asset_sync/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/AssetSync/asset_sync/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/AssetSync/asset_sync/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/AssetSync/asset_sync/compare/v1.3.0...v2.0.0

data/README.md

@@ -183,6 +183,15 @@ AssetSync.configure do |config|
   # Increase upload performance by configuring your region
   # config.fog_region = 'eu-west-1'
   #
+  # Change AWS signature version. Default is 4
+  # config.aws_signature_version = 4
+  #
+  # Change host option in fog (only if you need to)
+  # config.fog_host = 's3.amazonaws.com'
+  #
+  # Use http instead of https.
+  # config.fog_scheme = 'http'
+  #
   # Automatically replace files with their equivalent gzip compressed version
   # config.gzip_compression = true
   #
@@ -220,8 +229,22 @@ defaults: &defaults
   fog_directory: "rails-app-assets"
   aws_access_key_id: "<%= ENV['AWS_ACCESS_KEY_ID'] %>"
   aws_secret_access_key: "<%= ENV['AWS_SECRET_ACCESS_KEY'] %>"
+
+  # To use AWS reduced redundancy storage.
+  # aws_reduced_redundancy: true
+  #
   # You may need to specify what region your storage bucket is in
   # fog_region: "eu-west-1"
+  #
+  # Change AWS signature version. Default is 4
+  # aws_signature_version: 4
+  #
+  # Change host option in fog (only if you need to)
+  # fog_host: "s3.amazonaws.com"
+  #
+  # Use http instead of https. Default should be "https" (at least for fog-aws)
+  # fog_scheme: "http"
+
   existing_remote_files: keep # Existing pre-compiled assets on S3 will be kept
   # To delete existing remote files.
   # existing_remote_files: delete
@@ -282,7 +305,11 @@ AssetSync.configure do |config|
   config.add_local_file_paths do
     # Any code that returns paths of local asset files to be uploaded
     # Like Webpacker
-    Dir[File.join(Webpacker::Configuration.fetch(:public_output_path), '/**/**')]
+    public_root = Rails.root.join("public")
+    Dir.chdir(public_root) do
+      packs_dir = Webpacker.config.public_output_path.relative_path_from(public_root)
+      Dir[File.join(packs_dir, '/**/**')]
+    end
   end
 end
 ```
@@ -342,19 +369,21 @@ production:
 
 ### Amazon (AWS) IAM Users
 
-Amazon has switched to the more secure IAM User security policy model. When generating a user & policy for asset_sync you will need to ensure the policy has the following permissions.
-You __must__ give the user permission to **s3:ListAllMyBuckets** as well as give permission to both the bucket, as well as the bucket's contents (/*). If not given all these permissions you'll see the error ```Expected(200) <=> Actual(403 Forbidden) ```
+Amazon has switched to the more secure IAM User security policy model. When generating a user & policy for asset_sync you **must** ensure the policy has the following permissions, or you'll see the error:
+
+```
+Expected(200) <=> Actual(403 Forbidden)
+```
+
+IAM User Policy Example with minimum require permissions (replace `bucket_name` with your bucket):
 
-IAM User Policy Example (replace "bucket_name" with your bucket):
 ``` json
 {
   "Statement": [
     {
-      "Action": [
-        "s3:ListAllMyBuckets"
-      ],
+      "Action": "s3:ListBucket",
       "Effect": "Allow",
-      "Resource": "arn:aws:s3:::*"
+      "Resource": "arn:aws:s3:::bucket_name"
     },
     {
       "Action": "s3:PutObject*",
@@ -366,6 +395,7 @@ IAM User Policy Example (replace "bucket_name" with your bucket):
 ```
 
 If you want to use IAM roles you must set ```config.aws_iam_roles = true``` in your initializers.
+
 ```
 AssetSync.configure do |config|
   # ...

data/lib/asset_sync/config.rb

@@ -29,10 +29,12 @@ module AssetSync
     attr_accessor :fog_provider          # Currently Supported ['AWS', 'Rackspace']
     attr_accessor :fog_directory         # e.g. 'the-bucket-name'
     attr_accessor :fog_region            # e.g. 'eu-west-1'
-    attr_accessor :fog_path_style        # e.g true
 
     # Amazon AWS
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy, :aws_iam_roles
+    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
+    attr_accessor :fog_host              # e.g. 's3.amazonaws.com'
+    attr_accessor :fog_path_style        # e.g. true
+    attr_accessor :fog_scheme            # e.g. 'http'
 
     # Rackspace
     attr_accessor :rackspace_username, :rackspace_api_key, :rackspace_auth_url
@@ -146,13 +148,16 @@ module AssetSync
     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_directory          = yml["fog_directory"]
       self.fog_region             = yml["fog_region"]
       self.fog_path_style         = yml["fog_path_style"]
+      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_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"]
@@ -199,6 +204,10 @@ module AssetSync
             :aws_secret_access_key => aws_secret_access_key
           })
         end
+        options.merge!({:host => fog_host}) if fog_host
+        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
       elsif rackspace?
         options.merge!({
           :rackspace_username => rackspace_username,
@@ -218,7 +227,6 @@ module AssetSync
       end
 
       options.merge!({:region => fog_region}) if fog_region && !rackspace?
-      options.merge!({:path_style => fog_path_style}) if fog_path_style && aws?
       return options
     end
 

data/lib/asset_sync/engine.rb

@@ -16,9 +16,13 @@ module AssetSync
           config.fog_provider = ENV['FOG_PROVIDER'] if ENV.has_key?('FOG_PROVIDER')
           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_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_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')
 
           config.rackspace_username = ENV['RACKSPACE_USERNAME'] if ENV.has_key?('RACKSPACE_USERNAME')

data/lib/asset_sync/version.rb

@@ -1,3 +1,3 @@
 module AssetSync
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 end

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

@@ -1,50 +1,61 @@
-AssetSync.configure do |config|
-  <%- if aws? -%>
-  config.fog_provider = 'AWS'
-  config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
-  config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-  # To use AWS reduced redundancy storage.
-  # config.aws_reduced_redundancy = true
-  <%- elsif google? -%>
-  config.fog_provider = 'Google'
-  config.google_storage_access_key_id = ENV['GOOGLE_STORAGE_ACCESS_KEY_ID']
-  config.google_storage_secret_access_key = ENV['GOOGLE_STORAGE_SECRET_ACCESS_KEY']
-  <%- elsif rackspace? -%>
-  config.fog_provider = 'Rackspace'
-  config.rackspace_username = ENV['RACKSPACE_USERNAME']
-  config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
+if defined?(AssetSync)
+  AssetSync.configure do |config|
+    <%- if aws? -%>
+    config.fog_provider = 'AWS'
+    config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+    config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+    # To use AWS reduced redundancy storage.
+    # config.aws_reduced_redundancy = true
+    #
+    # Change AWS signature version. Default is 4
+    # config.aws_signature_version = 4
+    #
+    # Change host option in fog (only if you need to)
+    # config.fog_host = "s3.amazonaws.com"
+    #
+    # Use http instead of https. Default should be "https" (at least for fog-aws)
+    # config.fog_scheme = "http"
+    <%- elsif google? -%>
+    config.fog_provider = 'Google'
+    config.google_storage_access_key_id = ENV['GOOGLE_STORAGE_ACCESS_KEY_ID']
+    config.google_storage_secret_access_key = ENV['GOOGLE_STORAGE_SECRET_ACCESS_KEY']
+    <%- elsif rackspace? -%>
+    config.fog_provider = 'Rackspace'
+    config.rackspace_username = ENV['RACKSPACE_USERNAME']
+    config.rackspace_api_key = ENV['RACKSPACE_API_KEY']
 
-  # if you need to change rackspace_auth_url (e.g. if you need to use Rackspace London)
-  # config.rackspace_auth_url = "lon.auth.api.rackspacecloud.com"
-  <%- end -%>
-  config.fog_directory = ENV['FOG_DIRECTORY']
+    # if you need to change rackspace_auth_url (e.g. if you need to use Rackspace London)
+    # config.rackspace_auth_url = "lon.auth.api.rackspacecloud.com"
+    <%- end -%>
+    config.fog_directory = ENV['FOG_DIRECTORY']
 
-  # Invalidate a file on a cdn after uploading files
-  # config.cdn_distribution_id = "12345"
-  # config.invalidate = ['file1.js']
+    # Invalidate a file on a cdn after uploading files
+    # config.cdn_distribution_id = "12345"
+    # config.invalidate = ['file1.js']
 
-  # Increase upload performance by configuring your region
-  # config.fog_region = 'eu-west-1'
-  #
-  # Don't delete files from the store
-  # config.existing_remote_files = "keep"
-  #
-  # Automatically replace files with their equivalent gzip compressed version
-  # config.gzip_compression = true
-  #
-  # Use the Rails generated 'manifest.yml' file to produce the list of files to
-  # upload instead of searching the assets directory.
-  # config.manifest = true
-  #
-  # Fail silently.  Useful for environments such as Heroku
-  # config.fail_silently = true
-  #
-  # Log silently. Default is `true`. But you can set it to false if more logging message are preferred.
-  # Logging messages are sent to `STDOUT` when `log_silently` is falsy
-  # config.log_silently = true
-  #
-  # Allow custom assets to be cacheable. Note: The base filename will be matched
-  # If you have an asset with name `app.0ba4d3.js`, only `app.0ba4d3` will need to be matched
-  # config.cache_asset_regexps = [ /\.[a-f0-9]{8}$/i, /\.[a-f0-9]{20}$/i ]
-  # config.cache_asset_regexp = /\.[a-f0-9]{8}$/i
+    # Increase upload performance by configuring your region
+    # config.fog_region = 'eu-west-1'
+    #
+    # Don't delete files from the store
+    # config.existing_remote_files = "keep"
+    #
+    # Automatically replace files with their equivalent gzip compressed version
+    # config.gzip_compression = true
+    #
+    # Use the Rails generated 'manifest.yml' file to produce the list of files to
+    # upload instead of searching the assets directory.
+    # config.manifest = true
+    #
+    # Fail silently.  Useful for environments such as Heroku
+    # config.fail_silently = true
+    #
+    # Log silently. Default is `true`. But you can set it to false if more logging message are preferred.
+    # Logging messages are sent to `STDOUT` when `log_silently` is falsy
+    # config.log_silently = true
+    #
+    # Allow custom assets to be cacheable. Note: The base filename will be matched
+    # If you have an asset with name `app.0ba4d3.js`, only `app.0ba4d3` will need to be matched
+    # config.cache_asset_regexps = [ /\.[a-f0-9]{8}$/i, /\.[a-f0-9]{20}$/i ]
+    # config.cache_asset_regexp = /\.[a-f0-9]{8}$/i
+  end
 end

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

@@ -5,6 +5,15 @@ defaults: &defaults
   aws_secret_access_key: "<%= aws_secret_access_key %>"
   # To use AWS reduced redundancy storage.
   # aws_reduced_redundancy: true
+  #
+  # Change AWS signature version. Default is 4
+  # aws_signature_version: 4
+  #
+  # Change host option in fog (only if you need to)
+  # fog_host: "s3.amazonaws.com"
+  #
+  # Use http instead of https. Default should be "https" (at least for fog-aws)
+  # fog_scheme: "http"
   <%- elsif google? -%>
   fog_provider: 'Google'
   google_storage_access_key_id: "<%= google_storage_access_key_id %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: asset_sync
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and