capistrano-bundler 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156c9c34a8f9f71ee38ea7bd2edf04fc66bc97be
-  data.tar.gz: 33f87d10fbf56c7b9ca4f80fdfd79c0a47d93fa9
+  metadata.gz: 15de615ad7ef1c7bc41ffcc4001f9061c7d618e8
+  data.tar.gz: 44a0f9373b330c8349c5c6bb668e9f1d4438e784
 SHA512:
-  metadata.gz: 0a97bb24202d0ed4b982801c3b17f0748e28113d70be6550843ecbedeb6226086ee37fb46c3e196ea212db841c1c64d1456f31ad60940da0bf3d01f36c3dd43e
-  data.tar.gz: b712023a13f38b268016e3153ca52517833221131b41de6a34085bcd0262c569836ae3f62f33da73bf157fd9d1148e7cbae5b579d486c1d92c435f558e4b06a5
+  metadata.gz: 29b4e3a989df7f373227fc0d749140ef94cc8f67212b6c155b830058e67419524de4e0cf8027b9254543aa97a3ce419821ee76fbf7ef77a5cb14dc85d0d8e0bb
+  data.tar.gz: 6b6329f5a298119c931ddc12a728bb614ff62367b3ebd89c239bb8be969c2e8282fbb42a5507e12c196c1505e7e4399c086ef4041970bc709d2f634bfa4944cc

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.1.2 (8 Feb 2014)
+
+* Added `bundle_env_variables` option for specifying environment variables that should be set when running `bundle`.
+* The `bundle_dir` option is now named `bundle_path`
+* Use `bundle install` instead of `bundle`
+* All options are now optional and can be excluded from the final bundle command by setting them to `nil`
+* Bundler looks for a `Gemfile` by default, so there is no need to specify it.
+
 # 1.1.1
 
 * ruby is not prefixed with `bundle exec` anymore by default

data/README.md

@@ -1,13 +1,17 @@
 # Capistrano::Bundler
 
-Bundler for support for Capistrano 3.x
+Bundler specific tasks for Capistrano v3:
+
+   * cap production bundler:install
+
+It also prefixes certain binaries to use `bundle exec`.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano', '~> 3.0.0'
-    gem 'capistrano-bundler'
+    gem 'capistrano', '~> 3.1'
+    gem 'capistrano-bundler', '~> 1.1.2'
 
 And then execute:
 
@@ -23,23 +27,44 @@ Require in `Capfile` to use the default task:
 
     require 'capistrano/bundler'
 
-The task will run before `deploy:updated` as part of Capistrano's default deploy,
-or can be run in isolation with `cap production bundler:install`
+The task will run before `deploy:updated` as part of Capistrano's default deploy, or can be run in isolation with `cap production bundler:install`
+
+By default, the plugin adds `bundle exec` prefix to common executables listed in `bundle_bins` option. This currently applies for `gem`, `rake` and `rails`.
+
+You can add any custom executable to this list:
+```ruby
+set :bundle_bins, fetch(:bundle_bins, []).push %w(my_new_binary)
+```
+
+Configurable options:
+
+    set :bundle_roles, :all                                  # this is default
+    set :bundle_binstubs, -> { shared_path.join('bin') }     # this is default
+    set :bundle_gemfile, -> { release_path.join('MyGemfile') } # default: nil
+    set :bundle_path, -> { shared_path.join('bundle') }      # this is default
+    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
+
+This would execute the following bundle command on all servers
+(actual paths depend on the real deploy directory):
+
+    bundle install \
+      --binstubs /my_app/shared/bin \
+      --gemfile /my_app/releases/20130623094732/MyGemfile \
+      --path /my_app/shared/bundle \
+      --without development test \
+      --deployment --quiet
 
-Configurable options, shown here with defaults:
+If any option is set to `nil` it will be excluded from the final bundle command.
 
-    set :bundle_gemfile, -> { release_path.join('Gemfile') }
-    set :bundle_dir, -> { shared_path.join('bundle') }
-    set :bundle_flags, '--deployment --quiet'
-    set :bundle_without, %w{development test}.join(' ')
-    set :bundle_binstubs, -> { shared_path.join('bin') }
-    set :bundle_roles, :all
-    set :bundle_bins, %w(gem rake rails)
+### Environment Variables
 
-By default, the plugin adds `bundle exec` prefix to common executables listed in `bundle_bins` option. You can add any custom executable to this list:
+The `bundle_env_variables` option can be used to specify any environment variables you want present when running the `bundle` command:
 
 ```ruby
-set :bundle_bins, fetch(:bundle_bins).push %w(my_new_binary)
+# This translates to NOKOGIRI_USE_SYSTEM_LIBRARIES=1 when executed
+set :bundle_env_variables, { nokogiri_use_system_libraries: 1 }
 ```
 
 ## Contributing

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.1'
+  spec.version       = '1.1.2'
   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}
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'capistrano', '~> 3.0'
-  spec.add_dependency 'sshkit', '>= 1.2.0'
+  spec.add_dependency 'sshkit', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/capistrano/tasks/bundler.cap

@@ -7,25 +7,38 @@ namespace :bundler do
 
         You can override any of these defaults by setting the variables shown below.
 
+          set :bundle_roles, :all
+
+          set :bundle_binstubs, -> { shared_path.join('bin') }
           set :bundle_gemfile, -> { release_path.join('Gemfile') }
-          set :bundle_dir, -> { shared_path.join('bundle') }
-          set :bundle_flags, '--deployment --quiet'
+          set :bundle_path, -> { shared_path.join('bundle') }
           set :bundle_without, %w{development test}.join(' ')
-          set :bundle_binstubs, -> { shared_path.join('bin') }
-          set :bundle_roles, :all
+          set :bundle_flags, '--deployment --quiet'
+          set :bundle_env_variables, {}
     DESC
   task :install do
     on roles fetch(:bundle_roles) do
       within release_path do
-        execute :bundle, "--gemfile #{fetch(:bundle_gemfile)}",
-          "--path #{fetch(:bundle_dir)}",
-          fetch(:bundle_flags),
-          "--binstubs #{fetch(:bundle_binstubs)}",
-          "--without #{fetch(:bundle_without)}"
+        with fetch(:bundle_env_variables, {}) do
+          options = ["install"]
+          options << "--binstubs #{fetch(:bundle_binstubs)}" if fetch(:bundle_binstubs)
+          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 << "#{fetch(:bundle_flags)}" if fetch(:bundle_flags)
+
+          execute :bundle, options
+        end
       end
     end
   end
 
+  desc <<-DESC
+        Maps all binaries to use `bundle exec` by default.
+        Add your own binaries to the array with the command shown below.
+
+          set :bundle_bins, fetch(:bundle_bins).push %w(my_new_binary)
+    DESC
   task :map_bins do
     fetch(:bundle_bins).each do |command|
       SSHKit.config.command_map.prefix[command.to_sym].push("bundle exec")
@@ -41,12 +54,12 @@ end
 
 namespace :load do
   task :defaults do
-    set :bundle_gemfile, -> { release_path.join('Gemfile') }
-    set :bundle_dir, -> { shared_path.join('bundle') }
-    set :bundle_flags, '--deployment --quiet'
-    set :bundle_without, %w{development test}.join(' ')
-    set :bundle_binstubs, -> { shared_path.join('bin') }
-    set :bundle_roles, :all
     set :bundle_bins, %w{gem rake rails}
+
+    set :bundle_roles, :all
+    set :bundle_binstubs, -> { shared_path.join('bin') }
+    set :bundle_path, -> { shared_path.join('bundle') }
+    set :bundle_without, %w{development test}.join(' ')
+    set :bundle_flags, '--deployment --quiet'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-bundler
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tom Clements
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -30,16 +30,16 @@ dependencies:
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - capistrano-bundler.gemspec
@@ -108,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Bundler support for Capistrano 3.x

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 seenmyfate
-
-MIT License
-
-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 the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.