autoshell 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 58f7cc0a022ee148921ad31525211ef83963e842
4
- data.tar.gz: abc7b801e9b7ecf76cd8750663917bca854fe0ba
3
+ metadata.gz: a510d10de9f31d65c664a16c59585cacdfdb38c6
4
+ data.tar.gz: 3f5350377817d6c9c9c02656568b2841a459e4fe
5
5
  SHA512:
6
- metadata.gz: 7d3cc1ae23a9f0fc436d297afb34ef0171a6a632758eeff03fe592f939ab258ef21c90b69ebebc7018da6dcc9ac75a375f78d9d4a53ca1a1e4a005cf96a3c78f
7
- data.tar.gz: 33257ae7b9a532a50b0ddf199841791540969413f11936cf75a7ae74571a927c9014277c53f8964738cb86596ea1e45f1d267604399088fc4666e520de35b0da
6
+ metadata.gz: e332a07d22d3f8eed11ba01fee5290fdafd38a9366818220f66117c1591473a80c2f93a81a47fa70160aa73523bdb28da07cca72bfdba6b6b88211ff82d364b5
7
+ data.tar.gz: 291f4882c0c51fa70d8e20387650235113aeeec6d31ce31a3fc0634737256cfe47e72eba59cc79d333effa7a464b3cfabec293b2f9f92fc20846d8c5ed284e64
@@ -68,6 +68,17 @@ module Autoshell
68
68
  self.env = ENV.select { |k, _| ALLOWED_ENV.include? k }
69
69
  # Set some defaults
70
70
  self.env['SHELL'] = '/bin/bash'
71
+ # Since this is likely to be running within a `bundle exec` context, we
72
+ # expect any original GEM_PATH has been unset, and the ENV is configured
73
+ # such that we only use what is within this bundle, which probably
74
+ # doesn't include bundler itself, although we'll actually need to
75
+ # 'bundle install' in working directories. To keep things sane, just
76
+ # carry over the _ORIGINAL_GEM_PATH so that bundler is available
77
+ if !ENV['_ORIGINAL_GEM_PATH'].nil? &&
78
+ ENV['_ORIGINAL_GEM_PATH'].strip.length > 0 &&
79
+ (env['GEM_PATH'].nil? || env['GEM_PATH'].strip.length == 0)
80
+ self.env['GEM_PATH'] = ENV['_ORIGINAL_GEM_PATH']
81
+ end
71
82
  # Update environment variables from option
72
83
  self.env.update env
73
84
  # did we get a logger to use?
@@ -1,4 +1,4 @@
1
1
  # Version info
2
2
  module Autoshell
3
- VERSION = '1.0.1'
3
+ VERSION = '1.0.2'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autoshell
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Mark
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-05 00:00:00.000000000 Z
11
+ date: 2016-07-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mime-types