capistrano-rbenv 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -139,7 +139,7 @@ module Capistrano
139
139
  if top.namespaces.key?(:multistage)
140
140
  after "multistage:ensure", "rbenv:setup_default_environment"
141
141
  else
142
- on :start do
142
+ on :load do
143
143
  if top.namespaces.key?(:multistage)
144
144
  # workaround for loading `capistrano-rbenv` earlier than `capistrano/ext/multistage`.
145
145
  # https://github.com/yyuu/capistrano-rbenv/issues/7
@@ -153,7 +153,7 @@ module Capistrano
153
153
  _cset(:rbenv_environment_join_keys, %w(DYLD_LIBRARY_PATH LD_LIBRARY_PATH MANPATH PATH))
154
154
  def _merge_environment(x, y)
155
155
  x.merge(y) { |key, x_val, y_val|
156
- if rbenv_environment_join_keys.key?(key)
156
+ if rbenv_environment_join_keys.include?(key)
157
157
  ( y_val.split(":") + x_val.split(":") ).uniq.join(":")
158
158
  else
159
159
  y_val
@@ -1,5 +1,5 @@
1
1
  module Capistrano
2
2
  module RbEnv
3
- VERSION = "1.0.1"
3
+ VERSION = "1.0.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-rbenv
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-03-26 00:00:00.000000000 Z
12
+ date: 2013-04-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: capistrano