procodile 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507f12e0dc524f32be34c9dfaf80f1696dd6da41
-  data.tar.gz: ff6feb4c0ccf2d3f7db4972ded509729cc18ab50
+  metadata.gz: 7feabe360a0d490ac91076744fd7f782d39eebd0
+  data.tar.gz: 71e2007d58331378e50d47263f12dee80b35d103
 SHA512:
-  metadata.gz: 295a7caf4a5969807ed492ee3dad806dd120c060d73d21880af573c3f5fde655f941d0cf45fb8c32464ab24174fc9498ee229b1a63c70a999e4189ed2cb9dad2
-  data.tar.gz: af5cbb8a7678c306f1ce4844bef0c2e87e1d3126686d554aa015e26b33bad5531cc37818bc31d29534be4051eaacfc655aaf469283fc9b4acdea41bb1534f718
+  metadata.gz: ee34c71d613246a255baaa0c9d2a6bf43be1ed845bd0001413c3e1cf45bc4b43eb7fb39563c79483ced396a277158a11f65348e82791340db699cf4f7e847089
+  data.tar.gz: d6f501fbb6997231185507fcddd508446399a75b74eb53fa519f922c54d5eaecfb7e1c12f909407b056d1122b80baa9e3dfb1f2d279abffd3093e19667632f16

data/bin/procodile

@@ -46,100 +46,58 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
   exit 1
 end
 
-root = nil
-procfile = nil
-global_config = {}
-if options[:root] && options[:procfile]
-  # root and profile provided on the command line
-  root = options[:root]
-  procfile = options[:procfile]
-elsif options[:root] && options[:procfile].nil?
-  # root provided on the command line but no procfile
-  root = options[:root]
-  procfile = nil
-elsif options[:root].nil? && options[:procfile]
-  # no root provided but a procfile is provided
-  procfile = File.expand_path(options[:procfile])
-  root = File.dirname(procfile)
+
+# Get the global configuration file data
+global_config_path = ENV['PROCODILE_CONFIG'] || "/etc/procodile"
+if File.file?(global_config_path)
+  global_config = YAML.load_file(global_config_path)
 else
-  # we don't really know what to do in this situation, if there's a global config
-  # file we can use that
-  global_config_path = ENV['PROCODILE_CONFIG'] || "/etc/procodile"
-  if File.exist?(global_config_path)
-    global_config = YAML.load_file(global_config_path)
-    if global_config.is_a?(Array)
-      if ENV['PROCODILE_APP_ID']
-        app_id = ENV['PROCODILE_APP_ID'].to_i
-        preselect = true
-      else
-        puts "There are multiple applications configured in #{global_config_path}"
-        if File.file?("Procfile")
-          puts "\e[45;37mChoose an appplication or press ENTER to use the current directory:\e[0m"
-        else
-          puts "\e[45;37mChoose an application:\e[0m"
-        end
-        global_config.each_with_index do |app, i|
-          col = i % 3
-          print "#{(i+1)}) #{app['name']}"[0,28].ljust(col != 2 ? 30 : 0, ' ')
-          if col == 2 || i == global_config.size - 1
-            puts
-          end
-        end
-        app_id = STDIN.gets.to_i
-        ENV['PROCODILE_APP_ID'] = app_id.to_s
-        preselect = false
-      end
+  global_config = {}
+end
 
-      if app_id == 0
-        if File.file?('Procfile')
-          unless preselect
-            puts "Skipping application selection... using current directory"
-          end
-          global_config = {}
-        else
-          exit 1
-        end
-      elsif app = global_config[app_id - 1]
-        unless preselect
-          puts "\e[35mYou selected #{app['name']}\e[0m"
-        end
-        global_config = app
-      else
-        puts "Invalid app number"
-        exit 1
+# Create a determination to work out where we want to load our app from
+require 'procodile/app_determination'
+ap = Procodile::AppDetermination.new(FileUtils.pwd, options[:root], options[:procfile], options[:environment], global_config)
+if ap.ambiguous?
+  if ENV['PROCODILE_APP_ID']
+    ap.set_app(ENV['PROCODILE_APP_ID'].to_i)
+  elsif ap.app_options.empty?
+    $stderr.puts "Error: Could not find procodile in #{FileUtils.pwd}/Procfile".color(31)
+    exit 1
+  else
+    puts "There are multiple applications configured in #{global_config_path}"
+    puts "\e[45;37mChoose an application:\e[0m"
+    ap.app_options.each do |i, app|
+      col = i % 3
+      print "#{(i+1)}) #{app}"[0,28].ljust(col != 2 ? 30 : 0, ' ')
+      if col == 2 || i == ap.app_options.size - 1
+        puts
       end
     end
+
+    app_id = STDIN.gets.strip.to_i - 1
+    if ap.app_options[app_id]
+      ap.set_app(app_id)
+    else
+      puts "Invalid app number: #{app_id + 1}"
+      exit 1
+    end
   end
 end
 
-if global_config['user'] && ENV['USER'] != global_config['user']
+if ap.user && ENV['USER'] != ap.user
   if global_config['user_reexec']
-    $stderr.puts "\e[31mProcodile must be run as #{global_config['user']}. Re-executing as #{global_config['user']}...\e[0m"
-    exec("sudo -E -u #{global_config['user']} -- #{$0} #{ORIGINAL_ARGV}")
+    $stderr.puts "\e[31mProcodile must be run as #{ap.user}. Re-executing as #{ap.user}...\e[0m"
+    exec("sudo -E -u #{ap.user} -- #{$0} #{ORIGINAL_ARGV}")
   else
-    $stderr.puts "\e[31mError: Procodile must be run as #{global_config['user']}\e[0m"
+    $stderr.puts "\e[31mError: Procodile must be run as #{ap.user}\e[0m"
     exit 1
   end
 end
 
-if global_config['root'] && global_config['procfile']
-  # the global config specifies a root and a procfile
-  root = global_config['root']
-  procfile = File.expand_path(global_config['procfile'], root)
-elsif global_config['root'] && global_config['procfile'].nil?
-  root = global_config['root']
-  procfile = nil # assume from the root
-elsif global_config['root'].nil? && global_config['procfile']
-  procfile = global_config['procfile']
-  root = File.dirname(procfile)
-else
-  root ||= FileUtils.pwd
-  procfile ||= nil
-end
-
 begin
   if command != 'help'
-    cli.config = Procodile::Config.new(root, options[:environment], procfile)
+    cli.config = Procodile::Config.new(ap.root, ap.environment, ap.procfile)
   end
   cli.dispatch(command)
 rescue Procodile::Error => e

data/lib/procodile/app_determination.rb

@@ -0,0 +1,150 @@
+module Procodile
+  #
+  # This class is responsible for determining which application should be
+  # sued
+  #
+  class AppDetermination
+
+    # Start by creating an determination ased on the root and procfile that has been provided
+    # to us by the user (from --root and/or --procfile)
+    def initialize(pwd, given_root, given_procfile, given_environment, global_options = {})
+      @pwd = pwd
+      @given_root = given_root
+      @given_procfile = given_procfile
+      @given_environment = given_environment
+      @global_options = global_options
+      calculate
+    end
+
+    # Return the environment
+    def environment
+      @given_environment || @environment || 'production'
+    end
+
+    # Return the root directory
+    def root
+      @root
+    end
+
+    # Return the procfile
+    def procfile
+      @procfile
+    end
+
+    # Return the user that we must be executing as if not current user
+    def user
+      @user
+    end
+
+    # Should this be reexeced
+    def reexec?
+      @reexec == true
+    end
+
+    # Are we in an app's directory?
+    def in_app_directory?
+      @in_app_directory == true
+    end
+
+    # If we have a root and procfile, we're all good
+    def unambiguous?
+      !!(@root && @procfile)
+    end
+
+    def ambiguous?
+      !unambiguous?
+    end
+
+    # Choose which of the ambiguous options we want to choose
+    def set_app(id)
+      @app_id = id
+      find_root_and_procfile_from_options(@global_options)
+    end
+
+    # Return an hash of possible options to settle the ambiguity
+    def app_options
+      if ambiguous?
+        hash = {}
+        @global_options.each_with_index { |option, i| hash[i] = option['name'] || option['root'] }
+        hash
+      else
+        {}
+      end
+    end
+
+    private
+
+    def calculate
+      # Try and find something using the information that has been given to us by the user
+      find_root_and_procfile(@pwd, @given_root, @given_procfile)
+      if ambiguous?
+        # Otherwise, try and use the global config we have been given
+        find_root_and_procfile_from_options(@global_options)
+      else
+        # Try to load additional global details on to the existing app
+        if @root && options = global_options_for_path(@root)
+          add_global_options(options)
+        end
+      end
+    end
+
+    def find_root_and_procfile(pwd, root, procfile)
+      if root && procfile
+        # The user has provided both the root and procfile, we can use these
+        @root = File.expand_path(root)
+        @procfile = File.expand_path(procfile, @root)
+      elsif root && procfile.nil?
+        # The user has given us a root, we can assume they want to use the procfile
+        # from the root
+        @root = File.expand_path(root)
+        @procfile = File.join(@root, 'Procfile')
+      elsif root.nil? && procfile
+        # The user has given us a procfile but no root. We will assume the procfile
+        # is in the root of the directory
+        @procfile = File.expand_path(procfile)
+        @root = File.dirname(@procfile)
+      else
+        # The user has given us nothing. We will check to see if there's a Procfile
+        # in the root of our current pwd
+        if File.file?(File.join(pwd, 'Procfile'))
+          # If there's a procfile in our current pwd, we'll look at using that.
+          @procfile = File.join(pwd, 'Procfile')
+          @root = File.dirname(@procfile)
+          @in_app_directory = true
+        end
+      end
+    end
+
+    def find_root_and_procfile_from_options(options)
+      if options.is_a?(Hash)
+        # Use the current hash
+        find_root_and_procfile(@pwd, options['root'], options['procfile'])
+        add_global_options(options)
+      elsif options.is_a?(Array)
+        # Global options is provides a list of apps. We need to know which one of
+        # these we should be looking at.
+        if @app_id
+          find_root_and_procfile_from_options(options[@app_id])
+        end
+      end
+    end
+
+    def global_options_for_path(root)
+      root = File.expand_path(root)
+      if @global_options.is_a?(Hash) && @global_options['root'] && File.expand_path(@global_options['root']) == root
+        @global_options
+      elsif @global_options.is_a?(Array) && option = @global_options.select { |o| o['root'] && File.expand_path(o['root']) == root }.first
+        option
+      else
+        nil
+      end
+    end
+
+    def add_global_options(options)
+      @user = options['user'] if options['user']
+      @reexec = options['user_reexec'] if options['user_reexec']
+      @environment = options['environment'] if options['environment']
+    end
+
+  end
+end

data/lib/procodile/instance.rb

@@ -41,6 +41,17 @@ module Procodile
       end
     end
 
+    #
+    # Should this process be running?
+    #
+    def should_be_running?
+      if stopped? || stopping?
+        false
+      else
+        true
+      end
+    end
+
     #
     # Return an array of environment variables that should be set
     #

data/lib/procodile/supervisor.rb

@@ -184,7 +184,7 @@ module Procodile
           messages << {:type => :incorrect_quantity, :process => process.name, :current => process_instances.size, :desired => process.quantity}
         end
         for instance in process_instances
-          if instance.status != 'Running'
+          if instance.should_be_running? && instance.status != 'Running'
             messages << {:type => :not_running, :instance => instance.description, :status => instance.status}
           end
         end

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.12'
+  VERSION = '1.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -34,6 +34,7 @@ extra_rdoc_files: []
 files:
 - bin/procodile
 - lib/procodile.rb
+- lib/procodile/app_determination.rb
 - lib/procodile/cli.rb
 - lib/procodile/config.rb
 - lib/procodile/control_client.rb
@@ -75,3 +76,4 @@ specification_version: 4
 summary: This gem will help you run Ruby processes from a Procfile on Linux servers
   in the background.
 test_files: []
+has_rdoc: