procodile 1.0.19 → 1.0.21

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e6dcf0618a81cc0d780b8136f67bea37b95e3001
4
- data.tar.gz: 0ea5e88b4bf5d02e9e546da844ca0d93e314b2a8
3
+ metadata.gz: '08e686a096345f3522112998618bf86e470624e5'
4
+ data.tar.gz: 15432576aae3bb463a987fe91f31a8ad68309583
5
5
  SHA512:
6
- metadata.gz: 0b08aaf4026a62fb4b1d00560f34ca8422ebecda7ff511ebb9cdbc3d1fdb2c2472a825777349924d70c228cec96d371db9a0aba28649ee54b9c2ffd6cd9d5132
7
- data.tar.gz: 1c30e51c97c11ad6ec1cf2fb55d23ded12f01868a924a0b8dc3d8d6bde4aa38bfe490f53f6b3aa971ef34f35555eb61952c5250de1c6fa73fb991debc05b14f4
6
+ metadata.gz: 0ab3208e3e3f6a16f9a00d555981caaa4dac0d16fbe2973e2f03d1d2dfc35ef68da1c3141f8b218fc173a846bf61107c447e2923278dfc0d31260a257c177a60
7
+ data.tar.gz: bdb05ad0b32b565c829ffb1117b115873b2213ac7b9e5e755e5187f47637c774b712421460031685452bc458bd863f45632f2ca0938f648f7454df8e744a0bc9
@@ -14,6 +14,15 @@ module Procodile
14
14
  unless File.file?(procfile_path)
15
15
  raise Error, "Procfile not found at #{procfile_path}"
16
16
  end
17
+
18
+ # We need to check to see if the local or options
19
+ # configuration will override the root that we've been given.
20
+ # If they do, we can throw away any reference to the one that the
21
+ # configuration was initialized with and start using that immediately.
22
+ if new_root = (local_options['root'] || options['root'])
23
+ @root = new_root
24
+ end
25
+
17
26
  FileUtils.mkdir_p(pid_root)
18
27
 
19
28
  @processes = process_list.each_with_index.each_with_object({}) do |((name, command), index), hash|
@@ -56,7 +65,7 @@ module Procodile
56
65
  end
57
66
 
58
67
  def root
59
- local_options['root'] || options['root'] || @root
68
+ @root
60
69
  end
61
70
 
62
71
  def user
@@ -135,7 +144,7 @@ module Procodile
135
144
  end
136
145
 
137
146
  def procfile_path
138
- @procfile_path || File.join(@root, 'Procfile')
147
+ @procfile_path || File.join(self.root, 'Procfile')
139
148
  end
140
149
 
141
150
  def options_path
@@ -1,3 +1,3 @@
1
1
  module Procodile
2
- VERSION = '1.0.19'
2
+ VERSION = '1.0.21'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: procodile
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.19
4
+ version: 1.0.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Cooke
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-05 00:00:00.000000000 Z
11
+ date: 2018-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json