capistrano-pyenv 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  module Capistrano
2
2
  module PyEnv
3
- VERSION = "1.0.1"
3
+ VERSION = "1.0.2"
4
4
  end
5
5
  end
@@ -128,9 +128,9 @@ module Capistrano
128
128
  # workaround for loading `capistrano-rbenv` later than `capistrano/ext/multistage`.
129
129
  # https://github.com/yyuu/capistrano-rbenv/pull/5
130
130
  if top.namespaces.key?(:multistage)
131
- after "multistage:ensure", "pyenv:setup_default_environmnt"
131
+ after "multistage:ensure", "pyenv:setup_default_environment"
132
132
  else
133
- on :start do
133
+ on :load do
134
134
  if top.namespaces.key?(:multistage)
135
135
  # workaround for loading `capistrano-rbenv` earlier than `capistrano/ext/multistage`.
136
136
  # https://github.com/yyuu/capistrano-rbenv/issues/7
@@ -144,8 +144,8 @@ module Capistrano
144
144
  _cset(:pyenv_environment_join_keys, %w(DYLD_LIBRARY_PATH LD_LIBRARY_PATH MANPATH PATH))
145
145
  def _merge_environment(x, y)
146
146
  x.merge(y) { |key, x_val, y_val|
147
- if pyenv_environment_join_keys.key?(key)
148
- ( y_val.split(":") + x_val.split(":") ).join(":")
147
+ if pyenv_environment_join_keys.include?(key)
148
+ ( y_val.split(":") + x_val.split(":") ).uniq.join(":")
149
149
  else
150
150
  y_val
151
151
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: capistrano-pyenv
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