procodile 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362a13aa9b06e4850e9b004e02cbfb5895bb54fe
-  data.tar.gz: 05af226142d708e1764c4f2ac0cba68026d29a53
+  metadata.gz: 27d02f49619a2bed4bf6ea758c041de21c45a0a6
+  data.tar.gz: 185f7a035f673787062f20218fdfee23f14d0276
 SHA512:
-  metadata.gz: '09418e90b2052c698bf9846ddcfc83701a50779f1bc6c488e693bc9db20d016fea0bdca558dac130587f55254c30ca1f094b0e8ff61e0c31d9218c1365986f13'
-  data.tar.gz: 0f1eafdaf147330bc02f726b1346af937ab05eced950a6a1d6239ced6d4615110148256c7cbcb96611106fef96bdb5f67bcbd1adee26c99f5d1c95b01466bdec
+  metadata.gz: 84043a51c028bf6cd8e05cb07caa4639a0b8bc5c2acfae2889911561e5b221bb082cb77d9a7b1c12dc00acb286c5d5d96220e01212c9261d5c2f8169b848cd9c
+  data.tar.gz: 7bfa2f5d1d93f9aa244759acd064f4298392eb4b63763238e841fd9c607b51135d7482436f17a1c279e82d7985872f15dc1c4b8458e8d6e5c8f77a810eca75d6

data/bin/procodile

@@ -40,6 +40,15 @@ begin
     opts.on("-r", "--root PATH", "The path to the root of your application") do |root|
       options[:root] = root
     end
+
+    opts.on("-e", "--environment NAME", "The config environment to use") do |name|
+      options[:environment] = name
+    end
+
+    opts.on("--procfile PATH", "The path to the Procfile (defaults to: Procfile)") do |path|
+      options[:procfile_path] = path
+    end
+
     if cli.class.commands[command.to_sym] && option_block = cli.class.commands[command.to_sym][:options]
       option_block.call(opts, cli)
     end
@@ -51,7 +60,7 @@ end
 
 begin
   if command != 'help'
-    cli.config = Procodile::Config.new(options[:root] ? File.expand_path(options[:root]) : global_config['root'] || FileUtils.pwd)
+    cli.config = Procodile::Config.new(options[:root] ? File.expand_path(options[:root]) : global_config['root'] || FileUtils.pwd, options[:environment], options[:procfile_path])
   end
   cli.run(command)
 rescue Procodile::Error => e

data/lib/procodile/cli.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'procodile/version'
 require 'procodile/error'
+require 'procodile/message'
 require 'procodile/supervisor'
 require 'procodile/signal_handler'
 require 'procodile/control_client'
@@ -45,12 +46,6 @@ module Procodile
     # Help
     #
 
-    command def proxy
-      require 'procodile/tcp_proxy'
-      p = Procodile::TCPProxy.new(Supervisor.new(@config, {}))
-      p.run
-    end
-
     desc "Shows this help output"
     command def help
       puts "\e[45;37mWelcome to Procodile v#{Procodile::VERSION}\e[0m"
@@ -303,18 +298,34 @@ module Procodile
       opts.on("--json", "Return the status as a JSON hash") do
         cli.options[:json] = true
       end
+
+      opts.on("--simple", "Return overall status") do
+        cli.options[:simple] = true
+      end
     end
     command def status
       if supervisor_running?
         status = ControlClient.run(@config.sock_path, 'status')
         if @options[:json]
           puts status.to_json
+        elsif @options[:simple]
+          if status['messages'].empty?
+            message = status['instances'].map { |p,i| "#{p}[#{i.size}]" }
+            puts "OK || #{message.join(', ')}"
+          else
+            message = status['messages'].map { |p| Message.parse(p) }.join(', ')
+            puts "Issues || #{message}"
+          end
         else
           require 'procodile/status_cli_output'
           StatusCLIOutput.new(status).print_all
         end
       else
-        raise Error, "Procodile supervisor isn't running"
+        if @options[:simple]
+          puts "NotRunning || Procodile supervisor isn't running"
+        else
+          raise Error, "Procodile supervisor isn't running"
+        end
       end
     end
 

data/lib/procodile/config.rb

@@ -8,9 +8,12 @@ module Procodile
     COLORS = [35, 31, 36, 32, 33, 34]
 
     attr_reader :root
+    attr_reader :environment
 
-    def initialize(root)
+    def initialize(root, environment, procfile = nil)
       @root = root
+      @environment = environment || 'production'
+      @procfile = procfile
       unless File.exist?(procfile_path)
         raise Error, "Procfile not found at #{procfile_path}"
       end
@@ -56,7 +59,7 @@ module Procodile
     end
 
     def app_name
-      @app_name ||= local_options['app_name'] || options['app_name'] || 'Procodile'
+      @app_name ||= fetch(local_options['app_name']) || fetch(options['app_name']) || 'Procodile'
     end
 
     def processes
@@ -88,19 +91,15 @@ module Procodile
     end
 
     def environment_variables
-      (options['env'] || {}).merge(local_options['env'] || {})
-    end
-
-    def local_environment_variables
-      @local_environment_variables ||= local_options['env'] || {}
+      fetch_hash_values(options['env'] || {}).merge(fetch_hash_values(local_options['env'] || {}))
     end
 
     def pid_root
-      @pid_root ||= File.expand_path(local_options['pid_root'] || options['pid_root'] || 'pids', @root)
+      @pid_root ||= File.expand_path(fetch(local_options['pid_root']) || fetch(options['pid_root']) || 'pids', @root)
     end
 
     def log_path
-      @log_path ||= File.expand_path(local_options['log_path'] || options['log_path'] || 'procodile.log', @root)
+      @log_path ||= File.expand_path(fetch(local_options['log_path']) || fetch(options['log_path']) || 'procodile.log', @root)
     end
 
     def sock_path
@@ -110,15 +109,15 @@ module Procodile
     private
 
     def procfile_path
-      File.join(@root, 'Procfile')
+      @procfile_path || File.join(@root, 'Procfile')
     end
 
     def options_path
-      File.join(@root, 'Procfile.options')
+      procfile_path + ".options"
     end
 
     def local_options_path
-      File.join(@root, 'Procfile.local')
+      procfile_path + ".local"
     end
 
     def create_process(name, command, log_color)
@@ -127,5 +126,21 @@ module Procodile
       process
     end
 
+    def fetch(value, default = nil)
+      if value.is_a?(Hash)
+        value[@environment] || default
+      else
+        value || default
+      end
+    end
+
+    def fetch_hash_values(hash)
+      hash.each_with_object({}) do |(key, value), h|
+        if value = fetch(value)
+          h[key] = value
+        end
+      end
+    end
+
   end
 end

data/lib/procodile/control_session.rb

@@ -63,7 +63,9 @@ module Procodile
       processes = @supervisor.processes.keys.map(&:to_hash)
       result = {
         :version => Procodile::VERSION,
+        :messages => @supervisor.messages,
         :root => @supervisor.config.root,
+        :environment => @supervisor.config.environment,
         :app_name => @supervisor.config.app_name,
         :supervisor => @supervisor.to_hash,
         :instances => instances,

data/lib/procodile/message.rb

@@ -0,0 +1,13 @@
+module Procodile
+  module Message
+    def self.parse(message)
+      case message['type']
+      when 'not_running'
+        "#{message['instance']} is not running (#{message['status']})"
+      when 'incorrect_quantity'
+        "#{message['process']} only has #{message['current']} instances (should have #{message['desired']})"
+      end
+    end
+  end
+end
+

data/lib/procodile/process.rb

@@ -12,10 +12,11 @@ module Procodile
     attr_accessor :log_color
     attr_accessor :removed
 
-    def initialize(config, name, command, options = {})
+    def initialize(config, name, command, environment, options = {})
       @config = config
       @name = name
       @command = command
+      @environment = environment
       @options = options
       @log_color = 0
       @instance_index = 0

data/lib/procodile/status_cli_output.rb

@@ -1,3 +1,5 @@
+require 'procodile/message'
+
 module Procodile
   class StatusCLIOutput
 
@@ -13,6 +15,7 @@ module Procodile
     def print_header
       puts "Procodile Version   " + @status['version'].to_s.color(34)
       puts "Application Root    " + "#{@status['root']}".color(34)
+      puts "Environment         " + "#{@status['environment']}".color(34)
       puts "Supervisor PID      " + "#{@status['supervisor']['pid']}".color(34)
       if time = @status['supervisor']['started_at']
         time = Time.at(time)
@@ -29,6 +32,12 @@ module Procodile
           puts " " + value.to_s
         end
       end
+      unless @status['messages'].empty?
+        puts
+        for message in @status['messages']
+          puts "\e[31m * #{Message.parse(message)}\e[0m"
+        end
+      end
     end
 
     def print_processes

data/lib/procodile/supervisor.rb

@@ -29,6 +29,7 @@ module Procodile
 
     def start(&after_start)
       Procodile.log nil, "system", "Procodile supervisor started with PID #{::Process.pid}"
+      Procodile.log nil, "system", "Environment is #{@config.environment}"
       if @run_options[:respawn] == false
         Procodile.log nil, "system", "Automatic respawning is disabled"
       end
@@ -166,6 +167,21 @@ module Procodile
       }
     end
 
+    def messages
+      messages = []
+      processes.each do |process, process_instances|
+        if process.quantity != process_instances.size
+          messages << {:type => :incorrect_quantity, :process => process.name, :current => process_instances.size, :desired => process.quanaity}
+        end
+        for instance in process_instances
+          if instance.status != 'Running'
+            messages << {:type => :not_running, :instance => instance.description, :status => instance.status}
+          end
+        end
+      end
+      messages
+    end
+
     def add_reader(instance, io)
       @readers[io] = instance
       @signal_handler.notice

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -42,6 +42,7 @@ files:
 - lib/procodile/error.rb
 - lib/procodile/instance.rb
 - lib/procodile/logger.rb
+- lib/procodile/message.rb
 - lib/procodile/process.rb
 - lib/procodile/signal_handler.rb
 - lib/procodile/status_cli_output.rb
@@ -68,9 +69,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 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: