capistrano-bundler 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8053398d08ff32053d03773eee9c1e5d1a3984e681fc4e88b9154b3d51ede801
-  data.tar.gz: 8bf98c42d9eed292d72d3a0993122b0d4c3b7ff4fa5ae0c2099d47c23ce9f05c
+  metadata.gz: eea30bf997db801e1bbb1932f44b0172b4e73c58a661aff968852cb96ad581db
+  data.tar.gz: 502e0187165f65283064bcd1eb7d6c686a932d6f50baea3f95a6260c29cbf610
 SHA512:
-  metadata.gz: c980a9df70ef8f627147349540992413c6fe47a1744d17f802a5d2b278be573e9be9073de698f17854307a34dffcfd21b51d2cd355cfe324e003c8c37d0f525f
-  data.tar.gz: f37e5b38046f9b89e6d8fd17d786190563b2ffa98162cbb3d83caccd42c0ab87034307bfca8dc538c5c81d2c1b23f1b22bf9d9b1622f79701de703ad30a90caa
+  metadata.gz: a996ce4e27d4a0f0253ac97e07bc839eeaf08195e30cf974db5ec8ea8b28e8a626e54d21b6ec5b31c9fcb31371569239eec9f359d97766ca42aeb6711e06b61e
+  data.tar.gz: 8e5ee6e16316078c4772311bb1346dab824eb648c4b1daeee129a1530e039e5fa251f044037ea3dcfb1985b8320ad9a8218d8426d7c36912bc583507271b8277

data/README.md

@@ -75,9 +75,10 @@ set :bundle_roles, :all                                         # this is defaul
 set :bundle_config, { deployment: true }                        # this is default
 set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) } # this is default
 set :bundle_binstubs, -> { shared_path.join('bin') }            # default: nil
+set :bundle_binstubs_command, :install                          # this is default
 set :bundle_gemfile, -> { release_path.join('MyGemfile') }      # default: nil
 set :bundle_path, -> { shared_path.join('bundle') }             # this is default. set it to nil to use bundler's default path
-set :bundle_without, %w{development test}.join(' ')             # this is default
+set :bundle_without, %w{development test}.join(':')             # this is default
 set :bundle_flags, '--quiet'                                    # this is default
 set :bundle_env_variables, {}                                   # this is default
 set :bundle_clean_options, ""                                   # this is default. Use "--dry-run" if you just want to know what gems would be deleted, without actually deleting them
@@ -117,6 +118,14 @@ Downsides to cleaning:
 * If a rollback requires rebuilding a Gem with a large compiled binary component, such as Nokogiri, the rollback will take a while.
 * In rare cases, if a gem that was used in the previously deployed version was yanked, rollback would entirely fail.
 
+If you're using Bundler >= 2.1 and you are generating binstubs, you can configure capistrano-bundler to use the newer
+`bundle binstubs` command. This will avoid the deprecation warning that you'd otherwise get when using `bundle install`
+to generate binstubs:
+
+```ruby
+set :bundle_binstubs_command, :binstubs
+```
+
 ### Environment Variables
 
 The `bundle_env_variables` option can be used to specify any environment variables you want present when running the `bundle` command:

data/capistrano-bundler.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-bundler'
-  spec.version       = '2.0.1'
+  spec.version       = '2.1.0'
   spec.license       = 'MIT'
   spec.authors       = ['Tom Clements', 'Lee Hambley', 'Kir Shatrov']
   spec.email         = ['seenmyfate@gmail.com', 'lee.hambley@gmail.com', 'shatrov@me.com']

data/lib/capistrano/tasks/bundler.cap

@@ -44,9 +44,10 @@ namespace :bundler do
           set :bundle_config, { deployment: true }
           set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) }
           set :bundle_binstubs, nil
+          set :bundle_binstubs_command, :install
           set :bundle_gemfile, -> { release_path.join('Gemfile') }
           set :bundle_path, -> { shared_path.join('bundle') }
-          set :bundle_without, %w{development test}.join(' ')
+          set :bundle_without, %w{development test}.join(':')
           set :bundle_flags, '--quiet'
           set :bundle_jobs, 4
           set :bundle_env_variables, {}
@@ -60,10 +61,17 @@ namespace :bundler do
             info "The Gemfile's dependencies are satisfied, skipping installation"
           else
             options = []
-            options << "--binstubs #{fetch(:bundle_binstubs)}" if fetch(:bundle_binstubs)
+            if fetch(:bundle_binstubs) &&
+               fetch(:bundle_binstubs_command) == :install
+              options << "--binstubs #{fetch(:bundle_binstubs)}"
+            end
             options << "--jobs #{fetch(:bundle_jobs)}" if fetch(:bundle_jobs)
             options << "#{fetch(:bundle_flags)}" if fetch(:bundle_flags)
             execute :bundle, :install, *options
+            if fetch(:bundle_binstubs) &&
+               fetch(:bundle_binstubs_command) == :binstubs
+              execute :bundle, :binstubs, '--all', '--path', fetch(:bundle_binstubs)
+            end
           end
         end
       end
@@ -107,6 +115,7 @@ namespace :load do
     set :bundle_config, { deployment: true }
     set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) }
     set :bundle_binstubs, nil
+    set :bundle_binstubs_command, :install
     set :bundle_gemfile, nil
     set :bundle_path, -> { shared_path.join('bundle') }
     set :bundle_without, %w{development test}.join(':')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundler
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tom Clements
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: Bundler support for Capistrano 3.x