procodile 1.0.19 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6dcf0618a81cc0d780b8136f67bea37b95e3001
-  data.tar.gz: 0ea5e88b4bf5d02e9e546da844ca0d93e314b2a8
+  metadata.gz: '08e686a096345f3522112998618bf86e470624e5'
+  data.tar.gz: 15432576aae3bb463a987fe91f31a8ad68309583
 SHA512:
-  metadata.gz: 0b08aaf4026a62fb4b1d00560f34ca8422ebecda7ff511ebb9cdbc3d1fdb2c2472a825777349924d70c228cec96d371db9a0aba28649ee54b9c2ffd6cd9d5132
-  data.tar.gz: 1c30e51c97c11ad6ec1cf2fb55d23ded12f01868a924a0b8dc3d8d6bde4aa38bfe490f53f6b3aa971ef34f35555eb61952c5250de1c6fa73fb991debc05b14f4
+  metadata.gz: 0ab3208e3e3f6a16f9a00d555981caaa4dac0d16fbe2973e2f03d1d2dfc35ef68da1c3141f8b218fc173a846bf61107c447e2923278dfc0d31260a257c177a60
+  data.tar.gz: bdb05ad0b32b565c829ffb1117b115873b2213ac7b9e5e755e5187f47637c774b712421460031685452bc458bd863f45632f2ca0938f648f7454df8e744a0bc9

data/lib/procodile/config.rb

@@ -14,6 +14,15 @@ module Procodile
       unless File.file?(procfile_path)
         raise Error, "Procfile not found at #{procfile_path}"
       end
+
+      # We need to check to see if the local or options
+      # configuration will override the root that we've been given.
+      # If they do, we can throw away any reference to the one that the
+      # configuration was initialized with and start using that immediately.
+      if new_root = (local_options['root'] || options['root'])
+        @root = new_root
+      end
+
       FileUtils.mkdir_p(pid_root)
 
       @processes = process_list.each_with_index.each_with_object({}) do |((name, command), index), hash|
@@ -56,7 +65,7 @@ module Procodile
     end
 
     def root
-      local_options['root'] || options['root'] || @root
+      @root
     end
 
     def user
@@ -135,7 +144,7 @@ module Procodile
     end
 
     def procfile_path
-      @procfile_path || File.join(@root, 'Procfile')
+      @procfile_path || File.join(self.root, 'Procfile')
     end
 
     def options_path

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.19'
+  VERSION = '1.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.21
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json