capistrano-bundler 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4171f4d53229aa69f9b7efe265ff11cef104fc16
-  data.tar.gz: b845be8d3ea22e20c13dfad9b97e85b7a03fd921
+  metadata.gz: dad2fda55a7ff2ba45994bdb2006b580c6eb02b9
+  data.tar.gz: 59d5e76aa5c93e97ef4099c0cb88197851267869
 SHA512:
-  metadata.gz: 490de12e53ac8aafe7e69f6c46a426bc47705fb7553c4bdd2c7a372ff44474737e71f8bc68da11b68892be85ae0e5c8ef0b3c6aeeb87097264c8795a855bd26c
-  data.tar.gz: 7a26518cd23474aa1ee7a9bc0500c9dc6ab0921ec988bdf18460ff8dcd6b393fcff9d58ed8859db3935b2db731d947fb029246611db3c3d553a4561f2299e5c3
+  metadata.gz: f34798db9356c5c5ea4665c20bc297a9c6a373bd3277a2051543bf855e84e032a98db11f202b0b036d44e7dccc65a4f46d660eed2acdee9ea683a5188129780a
+  data.tar.gz: fdc68e85d87d94b2a7d1a281c5cbc5978f3e4d69459ab326bcfd852bf5c7f8019e04fe69d9f734d1d65cdeb75b7d3f4fe4fc24571dd0f00dfbfeb0c7b40e8c7c

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-# 1.1.4 (22 Jan 2014)
+# [Unreleased][] (master)
+
+* Your contribution here!
+
+# [1.2.0][] (1 Oct 2016)
+
+* Added a `bundle clean` task.  There are no default hooks for it.
+* Use `bundle check` to check if we can skip `bundle install`
+* Run `bundle:install` on rollback (`deploy:reverted`)
+* You can now `require "capistrano/bundler/tasks"` to load the tasks only without the hooks
+
+# 1.1.4 (22 Jan 2015)
 
 * Don’t generate binstubs by default (#61)
 
@@ -29,3 +40,6 @@
 # 1.0.0
 
 Initial release
+
+[Unreleased]: https://github.com/capistrano/bundler/compare/v1.2.0...HEAD
+[1.2.0]: https://github.com/capistrano/bundler/compare/v1.1.4...v1.2.0

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Capistrano, your one stop deployment shop.
+Copyright (c) 2016 Capistrano, your one stop deployment shop.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -53,10 +53,11 @@ set :bundle_roles, :all                                         # this is defaul
 set :bundle_servers, -> { release_roles(fetch(:bundle_roles)) } # this is default
 set :bundle_binstubs, -> { shared_path.join('bin') }            # default: nil
 set :bundle_gemfile, -> { release_path.join('MyGemfile') }      # default: nil
-set :bundle_path, -> { shared_path.join('bundle') }             # this is default
+set :bundle_path, -> { shared_path.join('bundle') }             # this is default. set it to nil for skipping the --path flag.
 set :bundle_without, %w{development test}.join(' ')             # this is default
 set :bundle_flags, '--deployment --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
 ```
 
 You can parallelize the installation of gems with bundler's jobs feature.
@@ -86,6 +87,13 @@ $ bundle install \
 
 If any option is set to `nil` it will be excluded from the final bundle command.
 
+If you want to clean up gems after a successful deploy, add `after 'deploy:published', 'bundler:clean'` to config/deploy.rb.
+
+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.
+
 ### 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       = '1.1.4'
+  spec.version       = '1.2.0'
   spec.authors       = ['Tom Clements', 'Lee Hambley', 'Kir Shatrov']
   spec.email         = ['seenmyfate@gmail.com', 'lee.hambley@gmail.com', 'shatrov@me.com']
   spec.description   = %q{Bundler support for Capistrano 3.x}
@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sshkit', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'rake'
 end

data/lib/capistrano/bundler.rb

@@ -1 +1,2 @@
-load File.expand_path('../tasks/bundler.cap', __FILE__)
+require_relative 'bundler/tasks'
+require_relative 'bundler/hooks'

data/lib/capistrano/bundler/hooks.rb

@@ -0,0 +1 @@
+load File.expand_path('../../tasks/hooks.cap', __FILE__)

data/lib/capistrano/bundler/tasks.rb

@@ -0,0 +1 @@
+load File.expand_path('../../tasks/bundler.cap', __FILE__)

data/lib/capistrano/tasks/bundler.cap

@@ -19,20 +19,22 @@ namespace :bundler do
           set :bundle_flags, '--deployment --quiet'
           set :bundle_jobs, nil
           set :bundle_env_variables, {}
+          set :bundle_clean_options, ""
     DESC
   task :install do
     on fetch(:bundle_servers) do
       within release_path do
         with fetch(:bundle_env_variables, {}) do
-          options = ["install"]
-          options << "--binstubs #{fetch(:bundle_binstubs)}" if fetch(:bundle_binstubs)
+          options = []
           options << "--gemfile #{fetch(:bundle_gemfile)}" if fetch(:bundle_gemfile)
           options << "--path #{fetch(:bundle_path)}" if fetch(:bundle_path)
-          options << "--without #{fetch(:bundle_without)}" if fetch(:bundle_without)
-          options << "--jobs #{fetch(:bundle_jobs)}" if fetch(:bundle_jobs)
-          options << "#{fetch(:bundle_flags)}" if fetch(:bundle_flags)
-
-          execute :bundle, options
+          unless test(:bundle, :check, *options)
+            options << "--binstubs #{fetch(:bundle_binstubs)}" if fetch(:bundle_binstubs)
+            options << "--jobs #{fetch(:bundle_jobs)}" if fetch(:bundle_jobs)
+            options << "--without #{fetch(:bundle_without)}" if fetch(:bundle_without)
+            options << "#{fetch(:bundle_flags)}" if fetch(:bundle_flags)
+            execute :bundle, :install, *options
+          end
         end
       end
     end
@@ -50,7 +52,16 @@ namespace :bundler do
     end
   end
 
-  before 'deploy:updated', 'bundler:install'
+  desc "Remove unused gems intalled by bundler"
+  task :clean do
+    on fetch(:bundle_servers) do
+      within release_path do
+        with fetch(:bundle_env_variables, {}) do
+          execute :bundle, :clean, fetch(:bundle_clean_options, "")
+        end
+      end
+    end
+  end
 end
 
 Capistrano::DSL.stages.each do |stage|

data/lib/capistrano/tasks/hooks.cap

@@ -0,0 +1,2 @@
+before 'deploy:updated', 'bundler:install'
+before 'deploy:reverted', 'bundler:install'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundler
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Tom Clements
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -58,14 +58,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Bundler support for Capistrano 3.x
@@ -86,7 +86,10 @@ files:
 - capistrano-bundler.gemspec
 - lib/capistrano-bundler.rb
 - lib/capistrano/bundler.rb
+- lib/capistrano/bundler/hooks.rb
+- lib/capistrano/bundler/tasks.rb
 - lib/capistrano/tasks/bundler.cap
+- lib/capistrano/tasks/hooks.cap
 homepage: https://github.com/capistrano/bundler
 licenses:
 - MIT
@@ -107,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Bundler support for Capistrano 3.x