procodile 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f9970119b9f9480ad0894234851c37b852fa29b
-  data.tar.gz: 22e30024ec12580a2469d89520c28a03465e4e49
+  metadata.gz: b81b8bba13398ec47594e50c91ad24c721306874
+  data.tar.gz: a8ffc4cdeae8f6804469bf556587826f65562afa
 SHA512:
-  metadata.gz: 70036e03d4e9940d8460540302b91ebd0d94d70dfac2a8d73bf4ad29a4753bc9a4ed2c5e3c35f69bc7bdb4e707c019c86138da406ada41774f66c189a98bd79e
-  data.tar.gz: b8740fbfa8d2ceff5b0f053abef7e8958f934f1d7aaf636aeb18e3195685f58246166c82afd7f87178f4c8f31b3c372df5650236972e448b860609cfc15184f3
+  metadata.gz: 862ab4fcfd46b29cfcb882ff9f4e7c88e418b743797924f4fd6315ac70ae7c3052f11f75cbd355c5a962c6e067d4c67f4d564db59c798d96dfe0bf7d954b3e21
+  data.tar.gz: 293bab2e09493cefb4162a46f1b9804fa69eb0899547beaec6f83d52a01c47619e7c4eec8e6ccb267a49a7bd09b88f112aaddff3f92036c42ed0b38030c59b35

data/lib/procodile/app_determination.rb

@@ -71,11 +71,11 @@ module Procodile
 
     def find_root_and_procfile(pwd, root, procfile)
       if root && procfile
-        # The user has provided both the root and procfile, we can use these
+        # The user has provided both the root and procfile, we can use these
         @root = expand_path(root)
         @procfile = expand_path(procfile, @root)
       elsif root && procfile.nil?
-        # The user has given us a root, we can assume they want to use the procfile
+        # The user has given us a root, we can assume they want to use the procfile
         # from the root
         @root = expand_path(root)
         @procfile = File.join(@root, 'Procfile')
@@ -117,7 +117,7 @@ module Procodile
         path
       else
         # Otherwise, if there's a root provided, it should be from the root
-        # of that otherwise from the root of the current directory.
+        # of that otherwise from the root of the current directory.
         root ? File.join(root, path) : File.join(@pwd, path)
       end
     end

data/lib/procodile/cli.rb

@@ -63,7 +63,7 @@ module Procodile
     end
 
     #
-    # Start
+    # Start
     #
 
     desc "Starts processes and/or the supervisor"
@@ -148,7 +148,7 @@ module Procodile
         return
       else
         # The supervisor isn't actually running. We need to start it before processes can be
-        # begin being processed
+        # begin being processed
         if @options[:start_supervisor] == false
           raise Error, "Supervisor is not running and cannot be started because --no-supervisor is set"
         else
@@ -162,7 +162,7 @@ module Procodile
     end
 
     #
-    # Stop
+    # Stop
     #
 
     desc "Stops processes and/or the supervisor"

data/lib/procodile/instance.rb

@@ -7,7 +7,7 @@ module Procodile
     attr_reader :id
     attr_accessor :process
     attr_reader :tag
-    attr_reader :port
+    attr_accessor :port
 
     def initialize(supervisor, process, id)
       @supervisor = supervisor
@@ -25,7 +25,7 @@ module Procodile
     end
 
     #
-    # Return the status of this instance
+    # Return the status of this instance
     #
     def status
       if stopped?
@@ -119,12 +119,18 @@ module Procodile
             Procodile.log(@process.log_color, description, "Assigned #{chosen_port} to process")
           end
         elsif @process.proxy? && @supervisor.tcp_proxy
-          # Allocate a port randomly if a proxy is needed
-          allocate_port
-        end
-
-        if (@supervisor.run_options[:allocate_ports] && @supervisor.run_options[:allocate_ports].include?(@process.name)) || (@process.proxy? && @supervisor.tcp_proxy)
+          # Allocate a port randomly if a proxy is needed
           allocate_port
+        elsif @process.allocate_port_from && @process.restart_mode != 'start-term'
+          # Allocate ports to this process sequentially from the starting port
+          allocated_ports = (@supervisor.processes[@process] ? @supervisor.processes[@process].select(&:running?) : []).map(&:port)
+          proposed_port = @process.allocate_port_from
+          until @port
+            unless allocated_ports.include?(proposed_port)
+              @port = proposed_port
+            end
+            proposed_port += 1
+          end
         end
 
         if self.process.log_path && @supervisor.run_options[:force_single_log] != true
@@ -160,7 +166,7 @@ module Procodile
     end
 
     #
-    # Is this stopped?
+    # Is this stopped?
     #
     def stopped?
       @stopped || false
@@ -221,7 +227,9 @@ module Procodile
         else
           Procodile.log(@process.log_color, description, "Process not running already. Starting it.")
           on_stop
-          @process.create_instance(@supervisor).start
+          new_instance = @process.create_instance(@supervisor)
+          new_instance.port = self.port
+          new_instance.start
         end
         self
       when 'start-term'
@@ -232,6 +240,7 @@ module Procodile
       when 'term-start'
         stop
         new_instance = @process.create_instance(@supervisor)
+        new_instance.port = self.port
         Thread.new do
           sleep 0.5 while running?
           new_instance.start
@@ -354,7 +363,7 @@ module Procodile
     end
 
     #
-    # Is the given port available?
+    # Is the given port available?
     #
     def port_available?(port)
       case @process.network_protocol
@@ -375,8 +384,8 @@ module Procodile
     end
 
     #
-    # If procodile is executed through rbenv it will pollute our environment which means that
-    # any spawned processes will be invoked with procodile's ruby rather than the ruby that
+    # If procodile is executed through rbenv it will pollute our environment which means that
+    # any spawned processes will be invoked with procodile's ruby rather than the ruby that
     # the application wishes to use
     #
     def without_rbenv(&block)

data/lib/procodile/process.rb

@@ -81,7 +81,7 @@ module Procodile
 
     #
     # Return the log path for this process if no log path is provided and split logs
-    # is enabled
+    # is enabled
     #
     def default_log_path
       if @config.log_root
@@ -92,7 +92,7 @@ module Procodile
     end
 
     #
-    # Return the signal to send to terminate the process
+    # Return the signal to send to terminate the process
     #
     def term_signal
       @options['term_signal'] || 'TERM'
@@ -102,7 +102,7 @@ module Procodile
     # Defines how this process should be restarted
     #
     # start-term = start new instances and send term to children
-    # usr1 = just send a usr1 signal to the current instance
+    # usr1 = just send a usr1 signal to the current instance
     # usr2 = just send a usr2 signal to the current instance
     # term-start = stop the old instances, when no longer running, start a new one
     #
@@ -110,6 +110,13 @@ module Procodile
       @options['restart_mode'] || 'term-start'
     end
 
+    #
+    # Return the first port that ports should be allocated from for this process
+    #
+    def allocate_port_from
+      @options['allocate_port_from']
+    end
+
     #
     # Is this process enabled for proxying?
     #
@@ -132,7 +139,7 @@ module Procodile
     end
 
     #
-    # Return the network protocol for this process
+    # Return the network protocol for this process
     #
     def network_protocol
       @options['network_protocol'] || 'tcp'

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.16'
+  VERSION = '1.0.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json