capistrano-rails 1.2.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 93ee128ca34535796679242e1deb36e7161866c7
-  data.tar.gz: aa19837eb01747fa078d1e3ad97ea03e3f20ef36
+SHA256:
+  metadata.gz: bf5fe872b93d5cc6d75a75eb8073a25641b7d7bbb634eddb0feb535f35f4920f
+  data.tar.gz: f830510ee60ff110c8f388a00c5274976feb9cafc29cbcce2f2bafd5dbcce88f
 SHA512:
-  metadata.gz: e6b3dfed673f8f95cad698f01fef2616dd94c78bf28171cd1ca63cb702b5821dbb5cad30e861866999c6f20e3c5de1ea9aa7db4616971931060649235ed0ed32
-  data.tar.gz: 937c98a295cf5da311dc8cde4b7a6b248f255dc41e6803f3adb5cbe6924e35b18da51f3c02ee4232b9b4f9ac10fa1e4e70c29f03adb30843712552abfe6fa2b8
+  metadata.gz: 9112045c5ed9155ea46d66bf90abc8b88b28d8673b9a13af088e84335f0fe6cfc17e85f37d2969ab0453500dc76825bb22e6243c7401eeebf628e9501bd1b81c
+  data.tar.gz: cefd7a9cb603abccf1fad9c52d7cc2e09440770b888b8d9f2bafb2a83df55fff7257e1bed28c82fca33532a09b6bd57903e3668289a6d51b17345c961659627c

data/.github/issue_template.md

@@ -0,0 +1,19 @@
+**Important:** GitHub issues are for feature requests or bug reports. The Capistrano team recommends you use [Stack Overflow](http://stackoverflow.com/questions/tagged/capistrano) for general questions. For more details, please see our [contribution policy](https://github.com/capistrano/capistrano/blob/master/CONTRIBUTING.md).
+
+---
+
+### Steps to reproduce
+If reasonable, you can help by creating a Capistrano skeleton example project which reproduces the issue you are seeing. You can then upload the individual files to a GitHub Gist or a GitHub project. Others can simply modify the configuration to point at a test server/repository of their own. Often times, an issue is resolved simply by making this test case.
+
+An example test case is here: https://gist.github.com/will-in-wi/527327e31af30b3eae2068e2965be05b
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### System configuration
+Please link to the output of `cap <stage> doctor` in a GitHub Gist.
+
+Thanks for helping improve Capistrano!

data/.github/pull_request_template.md

@@ -0,0 +1,23 @@
+### Summary
+
+(Guidelines for creating a bug report are available
+here: https://github.com/capistrano/capistrano/blob/master/DEVELOPMENT.md)
+
+Provide a general description of the code changes in your pull
+request... were there any bugs you had fixed? If so, mention them. If
+these bugs have open GitHub issues, be sure to tag them here as well,
+to keep the conversation linked together.
+
+### Short checklist
+
+- [ ] If you are fixing a bug or introducing a new feature, did you add a CHANGELOG entry?
+
+### Other Information
+
+If there's anything else that's important and relevant to your pull
+request, mention that information here.
+
+If you are updating any of the CHANGELOG files or are asked to update the
+CHANGELOG files by reviewers, please add the CHANGELOG entry at the top of the file where indicated.
+
+Thanks for helping improve Capistrano!

data/.github/release-drafter.yml

@@ -0,0 +1,17 @@
+name-template: "$NEXT_PATCH_VERSION"
+tag-template: "v$NEXT_PATCH_VERSION"
+categories:
+  - title: "⚠️ Breaking Changes"
+    label: "⚠️ Breaking"
+  - title: "✨ New Features"
+    label: "✨ Feature"
+  - title: "🐛 Bug Fixes"
+    label: "🐛 Bug Fix"
+  - title: "📚 Documentation"
+    label: "📚 Docs"
+  - title: "🏠 Housekeeping"
+    label: "🏠 Housekeeping"
+change-template: "- $TITLE (#$NUMBER) @$AUTHOR"
+no-changes-template: "- No changes"
+template: |
+  $CHANGES

data/.github/workflows/push.yml

@@ -0,0 +1,14 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,80 +1 @@
-# [master][]
-
-* Your contribution here!
-
-# [1.2.3][] (Mar 4 2017)
-
-* [#200](https://github.com/capistrano/rails/pull/200): Don't link public/assets if public is already linked - [@mattbrictson](https://github.com/mattbrictson)
-
-# [1.2.2][] (Jan 10 2017)
-
-* Restored compatibility with older versions of Rake (< 11.0.0), introduced in previous change. (@toupeira)
-
-# [1.2.1][] (Dec 23 2016)
-
-* Diff db directory recursively
-* Avoid warning while running migrations on multiple servers (#189)
-
-# [1.2.0][] (Oct 25 2016)
-
-* Diff entire db directory when determining if migrations are needed
-
-# 1.1.8 (Sep 13 2016)
-
-* Handle arrays passed into `normalize_asset_timestamps` correctly (#184)
-
-# 1.1.7 (Jun 10 2016)
-
-* call `Array#uniq` in `deploy:set_linked_dirs` task to remove duplicated :linked_dirs
-* Add `migration_servers` configuration (#168)
-
-# 1.1.6 (Jan 19 2016)
-
-* Add `rake assets:clobber` task from Rails (#149)
-* Make `assets:clean` capable with zsh (#150)
-* Split `deploy:migrate` to allow for finer hook-control (#148)
-* Fix for parsing ls output in detect_manifest_path (#133)
-
-# 1.1.5 (Oct 15 2015)
-
-* Disable `deploy:cleanup_assets` by default due to undesirable behavior in Rails 3. Use `set :keep_assets, 2` to explicitly enable this feature for Rails 4.
-
-# 1.1.4 (Oct 10 2015)
-
-* Fixing bug with normalize_assets typo #138
-* Cleanup assets after:updated (#136)
-* Fixed linked_dirs containing default value of assets_prefix (#125)
-
-# 1.1.3 (Apr 18 2015)
-
-* Fixed no_release behaviour (https://github.com/capistrano/rails/pull/95)
-* Allow assets manifest backup with folder "manifests" (https://github.com/capistrano/rails/pull/92)
-* Handle Sprocket 3 manifest filename
-
-# 1.1.2 (Sep 1 2014)
-
-* rails_env is set before deploy (https://github.com/capistrano/rails/pull/66)
-* with `conditionally_migrate` option enabled you can skip `db:migrate` if there were no new migrations (https://github.com/capistrano/rails/pull/71)
-* Allow early overriding of assets_* parameters (https://github.com/capistrano/rails/pull/73)
-
-# 1.1.1
-
-* New `asset_roles` options: https://github.com/capistrano/rails/pull/30
-* normalized task spelling: 'deploy:normalise_assets' is now 'deploy:normalize_assets'
-* depend on capistrano 3.1 to support multiple role arguments
-
-# 1.1.0
-
-* set rails_env even if capistrano-rails was required partly
-* depend on capistrano-bundler
-* require bundler with capistrano-rails/all
-
-# 1.0.0
-
-Initial release
-
-[master]: https://github.com/capistrano/rails/compare/v1.2.3...HEAD
-[1.2.3]: https://github.com/capistrano/rails/compare/v1.2.2...v1.2.3
-[1.2.2]: https://github.com/capistrano/rails/compare/v1.2.1...v1.2.2
-[1.2.1]: https://github.com/capistrano/rails/compare/v1.2.0...v1.2.1
-[1.2.0]: https://github.com/capistrano/rails/compare/v1.1.8...v1.2.0
+Release notes for this project are kept here: https://github.com/capistrano/rails/releases

data/Dangerfile

@@ -1,43 +1 @@
-# Adapted from https://github.com/ruby-grape/danger/blob/master/Dangerfile
-# Q: What is a Dangerfile, anyway? A: See http://danger.systems/
-
-# ------------------------------------------------------------------------------
-# Additional pull request data
-# ------------------------------------------------------------------------------
-project_name = github.pr_json["base"]["repo"]["name"]
-pr_number = github.pr_json["number"]
-pr_url = github.pr_json["_links"]["html"]["href"]
-
-# ------------------------------------------------------------------------------
-# What changed?
-# ------------------------------------------------------------------------------
-has_lib_changes = !git.modified_files.grep(/^lib/).empty?
-has_changelog_changes = git.modified_files.include?("CHANGELOG.md")
-
-# ------------------------------------------------------------------------------
-# Have you updated CHANGELOG.md?
-# ------------------------------------------------------------------------------
-if !has_changelog_changes && has_lib_changes
-  markdown <<-MARKDOWN
-Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
-
-```markdown
-* [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
-```
-MARKDOWN
-  warn("Please update CHANGELOG.md with a description of your changes. "\
-       "If this PR is not a user-facing change (e.g. just refactoring), "\
-       "you can disregard this.", :sticky => false)
-end
-
-# ------------------------------------------------------------------------------
-# Did you remove the CHANGELOG's "Your contribution here!" line?
-# ------------------------------------------------------------------------------
-if has_changelog_changes
-  unless IO.read("CHANGELOG.md") =~ /^\* Your contribution here/i
-    fail(
-      "Please put the `* Your contribution here!` line back into CHANGELOG.md.",
-      :sticky => false
-    )
-  end
-end
+danger.import_dangerfile(github: "capistrano/danger", branch: "no-changelog")

data/README.md

@@ -7,12 +7,12 @@ Rails specific tasks for Capistrano v3:
 
 ## Installation
 
-Add these lines to your application's Gemfile:
+Add these Capistrano gems to your application's Gemfile using `require: false`:
 
 ```ruby
 group :development do
-  gem 'capistrano', '~> 3.6'
-  gem 'capistrano-rails', '~> 1.2'
+  gem "capistrano", "~> 3.10", require: false
+  gem "capistrano-rails", "~> 1.6", require: false
 end
 ```
 
@@ -60,6 +60,9 @@ set :migration_role, :db
 # Defaults to the primary :db server
 set :migration_servers, -> { primary(fetch(:migration_role)) }
 
+# Defaults to `db:migrate`
+set :migration_command, 'db:migrate'
+
 # Defaults to false
 # Skip migration if files in db/migrate were not modified
 set :conditionally_migrate, true
@@ -71,6 +74,13 @@ set :assets_roles, [:web, :app]
 # This should match config.assets.prefix in your rails config/application.rb
 set :assets_prefix, 'prepackaged-assets'
 
+# Defaults to ["/path/to/release_path/public/#{fetch(:assets_prefix)}/.sprockets-manifest*", "/path/to/release_path/public/#{fetch(:assets_prefix)}/manifest*.*"]
+# This should match config.assets.manifest in your rails config/application.rb
+set :assets_manifests, ['app/assets/config/manifest.js']
+
+# RAILS_GROUPS env value for the assets:precompile task. Default to nil.
+set :rails_assets_groups, :assets
+
 # If you need to touch public/images, public/javascripts, and public/stylesheets on each deploy
 set :normalize_asset_timestamps, %w{public/images public/javascripts public/stylesheets}
 
@@ -87,10 +97,12 @@ Make sure you enable it by setting `linked_dirs` and `linked_files` options:
 
 ```ruby
 # deploy.rb
-set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', 'public/system', 'public/uploads')
-set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml')
+append :linked_dirs, 'log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', '.bundle', 'public/system', 'public/uploads'
+append :linked_files, 'config/database.yml', 'config/secrets.yml'
 ```
 
+In capistrano < 3.5, before `append` was introduced, you can use `fetch` and `push` to get the same result.
+
 ### Recommendations
 
 While migrations looks like a concern of the database layer, Rails migrations
@@ -104,6 +116,26 @@ set :migration_role, :app
 The advantage is you won't need to deploy your application to your database
 server, and overall a better separation of concerns.
 
+#### Uploading your master.key
+
+You can use the below configuration to upload your `master.key` to the server if it isn't already present.
+
+```ruby
+append :linked_files, "config/master.key"
+
+namespace :deploy do
+  namespace :check do
+    before :linked_files, :set_master_key do
+      on roles(:app), in: :sequence, wait: 10 do
+        unless test("[ -f #{shared_path}/config/master.key ]")
+          upload! 'config/master.key', "#{shared_path}/config/master.key"
+        end
+      end
+    end
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -2,3 +2,8 @@ require "bundler/gem_tasks"
 
 # Do nothing by default
 task :default
+
+Rake::Task["release"].enhance do
+  puts "Don't forget to publish the release on GitHub!"
+  system "open https://github.com/capistrano/rails/releases"
+end

data/capistrano-rails.gemspec

@@ -4,19 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-rails"
-  gem.version       = '1.2.3'
+  gem.version       = '1.6.0'
   gem.authors       = ["Tom Clements", "Lee Hambley", "Kir Shatrov"]
   gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com", "shatrov@me.com"]
   gem.description   = %q{Rails specific Capistrano tasks}
   gem.summary       = %q{Rails specific Capistrano tasks}
   gem.homepage      = "https://github.com/capistrano/rails"
+  gem.metadata      = {
+    "changelog_uri" => "https://github.com/capistrano/rails/releases"
+  }
+
+  gem.licenses      = ["MIT"]
 
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'capistrano', '~> 3.1'
-  gem.add_dependency 'capistrano-bundler', '~> 1.1'
+  gem.add_dependency 'capistrano-bundler', '>= 1.1', '< 3'
 
   gem.add_development_dependency 'danger'
 end

data/lib/capistrano/tasks/assets.rake

@@ -65,7 +65,7 @@ namespace :deploy do
     task :precompile do
       on release_roles(fetch(:assets_roles)) do
         within release_path do
-          with rails_env: fetch(:rails_env) do
+          with rails_env: fetch(:rails_env), rails_groups: fetch(:rails_assets_groups) do
             execute :rake, "assets:precompile"
           end
         end
@@ -88,10 +88,15 @@ namespace :deploy do
     task :restore_manifest do
       on release_roles(fetch(:assets_roles)) do
         within release_path do
-          target = detect_manifest_path
-          source = release_path.join('assets_manifest_backup', File.basename(target))
-          if test "[[ -f #{source} && -f #{target} ]]"
-            execute :cp, source, target
+          targets = detect_manifest_path.split(' ')
+          sources = targets.map do |target|
+            release_path.join('assets_manifest_backup', File.basename(target))
+          end
+          if test(:ls, *sources) && test(:ls, *targets)
+            source_map = sources.zip(targets)
+            source_map.each do |source, target|
+              execute :cp, source, target
+            end
           else
             msg = 'Rails assets manifest file (or backup file) not found.'
             warn msg
@@ -102,12 +107,8 @@ namespace :deploy do
     end
 
     def detect_manifest_path
-      %w(
-        .sprockets-manifest*
-        manifest*.*
-      ).each do |pattern|
-        candidate = release_path.join('public', fetch(:assets_prefix), pattern)
-        return capture(:ls, candidate).strip.gsub(/(\r|\n)/,' ') if test(:ls, candidate)
+      fetch(:assets_manifests).each do |candidate|
+        return capture(:ls, candidate).strip.gsub(/(\r|\n)/, ' ') if test(:ls, candidate)
       end
       msg = 'Rails assets manifest file not found.'
       warn msg
@@ -134,5 +135,10 @@ namespace :load do
   task :defaults do
     set :assets_roles, fetch(:assets_roles, [:web])
     set :assets_prefix, fetch(:assets_prefix, 'assets')
+    set :assets_manifests, -> {
+      %w[.sprockets-manifest* manifest*.*].map do |pattern|
+        release_path.join("public", fetch(:assets_prefix), pattern)
+      end
+    }
   end
 end

data/lib/capistrano/tasks/migrations.rake

@@ -22,7 +22,7 @@ namespace :deploy do
     on fetch(:migration_servers) do
       within release_path do
         with rails_env: fetch(:rails_env) do
-          execute :rake, 'db:migrate'
+          execute :rake, fetch(:migration_command)
         end
       end
     end
@@ -36,5 +36,6 @@ namespace :load do
     set :conditionally_migrate, fetch(:conditionally_migrate, false)
     set :migration_role, fetch(:migration_role, :db)
     set :migration_servers, -> { primary(fetch(:migration_role)) }
+    set :migration_command, -> { fetch(:migration_command, 'db:migrate') }
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
 - Kir Shatrov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -30,16 +30,22 @@ dependencies:
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: danger
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +69,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
+- ".github/release-drafter.yml"
+- ".github/workflows/push.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -80,9 +90,11 @@ files:
 - lib/capistrano/tasks/migrations.rake
 - lib/capistrano/tasks/set_rails_env.rake
 homepage: https://github.com/capistrano/rails
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  changelog_uri: https://github.com/capistrano/rails/releases
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Rails specific Capistrano tasks
 test_files: []