bluepill 0.0.68 → 0.0.69

data/lib/bluepill/application/client.rb

@@ -1,8 +1,6 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module Application
     module Client
-
     end
   end
 end

data/lib/bluepill/application/server.rb

@@ -1,10 +1,8 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module Application
     module ServerMethods
-
       def status
-        self.processes.collect do |process|
+        processes.collect do |process|
           "#{process.name} #{process.state}"
         end.join("\n")
       end

data/lib/bluepill/condition_watch.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class HistoryValue < Struct.new(:value, :critical)
   end
@@ -11,9 +10,9 @@ module Bluepill
       @name = name
 
       @logger = options.delete(:logger)
-      @fires  = options.has_key?(:fires) ? Array(options.delete(:fires)) : [:restart]
+      @fires  = options.key?(:fires) ? Array(options.delete(:fires)) : [:restart]
       @every  = options.delete(:every)
-      @times  = options.delete(:times) || [1,1]
+      @times  = options.delete(:times) || [1, 1]
       @times  = [@times, @times] unless @times.is_a?(Array) # handles :times => 5
       @include_children = options.delete(:include_children) || false
 
@@ -26,9 +25,15 @@ module Bluepill
       if @last_ran_at.nil? || (@last_ran_at + @every) <= tick_number
         @last_ran_at = tick_number
 
-        value = @process_condition.run(pid, @include_children)
+        begin
+          value = @process_condition.run(pid, @include_children)
+        rescue => e
+          logger.err(e.backtrace)
+          raise e
+        end
+
         @history << HistoryValue.new(@process_condition.format_value(value), @process_condition.check(value))
-        self.logger.info(self.to_s)
+        logger.info(to_s)
 
         return @fires if self.fired?
       end
@@ -40,11 +45,11 @@ module Bluepill
     end
 
     def fired?
-      @history.count {|v| not v.critical} >= @times.first
+      @history.count { |v| !v.critical } >= @times.first
     end
 
     def to_s
-      data = @history.collect {|v| "#{v.value}#{'*' unless v.critical}"}.join(", ")
+      data = @history.collect { |v| "#{v.value}#{'*' unless v.critical}" }.join(', ')
       "#{@name}: [#{data}]\n"
     end
   end

data/lib/bluepill/controller.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'fileutils'
 require 'bluepill/system'
 
@@ -17,18 +16,18 @@ module Bluepill
     end
 
     def running_applications
-      Dir[File.join(sockets_dir, "*.sock")].map{|x| File.basename(x, ".sock")}
+      Dir[File.join(sockets_dir, '*.sock')].map { |x| File.basename(x, '.sock') }
     end
 
     def handle_command(application, command, *args)
       case command.to_sym
       when :status
-        puts self.send_to_daemon(application, :status, *args)
+        puts send_to_daemon(application, :status, *args)
       when *Application::PROCESS_COMMANDS
         # these need to be sent to the daemon and the results printed out
-        affected = self.send_to_daemon(application, command, *args)
+        affected = send_to_daemon(application, command, *args)
         if affected.empty?
-          puts "No processes effected"
+          puts 'No processes effected'
         else
           puts "Sent #{command} to:"
           affected.each do |process|
@@ -38,14 +37,14 @@ module Bluepill
       when :quit
         pid = pid_for(application)
         if System.pid_alive?(pid)
-          ::Process.kill("TERM", pid)
+          ::Process.kill('TERM', pid)
           puts "Killing bluepilld[#{pid}]"
         else
           puts "bluepilld[#{pid}] not running"
         end
       when :log
-        log_file_location = self.send_to_daemon(application, :log_file)
-        log_file_location = self.log_file if log_file_location.to_s.strip.empty?
+        log_file_location = send_to_daemon(application, :log_file)
+        log_file_location = log_file if log_file_location.to_s.strip.empty?
 
         requested_pattern = args.first
         grep_pattern = self.grep_pattern(application, requested_pattern)
@@ -54,69 +53,65 @@ module Bluepill
         puts "Tailing log for #{requested_pattern}..."
         Kernel.exec(tail)
       else
-        $stderr.puts "Unknown command `%s` (or application `%s` has not been loaded yet)" % [command, command]
+        $stderr.puts(format('Unknown command `%s` (or application `%s` has not been loaded yet)', command, command))
         exit(1)
       end
     end
 
     def send_to_daemon(application, command, *args)
-      begin
-        verify_version!(application)
-
-        command = ([command, *args]).join(":")
-        response = Socket.client_command(base_dir, application, command)
-        if response.is_a?(Exception)
-          $stderr.puts "Received error from server:"
-          $stderr.puts response.inspect
-          $stderr.puts response.backtrace.join("\n")
-          exit(8)
-        else
-          response
-        end
+      verify_version!(application)
 
-      rescue Errno::ECONNREFUSED
-        abort("Connection Refused: Server is not running")
+      command = ([command, *args]).join(':')
+      response = Socket.client_command(base_dir, application, command)
+      if response.is_a?(Exception)
+        $stderr.puts 'Received error from server:'
+        $stderr.puts response.inspect
+        $stderr.puts response.backtrace.join("\n")
+        exit(8)
+      else
+        response
       end
+
+    rescue Errno::ECONNREFUSED
+      abort('Connection Refused: Server is not running')
     end
 
     def grep_pattern(application, query = nil)
       pattern = [application, query].compact.join(':')
       ['\[.*', Regexp.escape(pattern), '.*'].compact.join
     end
-    private
+
+  private
 
     def cleanup_bluepill_directory
-      self.running_applications.each do |app|
+      running_applications.each do |app|
         pid = pid_for(app)
-        if !pid || !System.pid_alive?(pid)
-          pid_file = File.join(self.pids_dir, "#{app}.pid")
-          sock_file = File.join(self.sockets_dir, "#{app}.sock")
-          System.delete_if_exists(pid_file)
-          System.delete_if_exists(sock_file)
-        end
+        next if pid || System.pid_alive?(pid)
+        pid_file = File.join(pids_dir, "#{app}.pid")
+        sock_file = File.join(sockets_dir, "#{app}.sock")
+        System.delete_if_exists(pid_file)
+        System.delete_if_exists(sock_file)
       end
     end
 
     def pid_for(app)
-      pid_file = File.join(self.pids_dir, "#{app}.pid")
-      File.exists?(pid_file) && File.read(pid_file).to_i
+      pid_file = File.join(pids_dir, "#{app}.pid")
+      File.exist?(pid_file) && File.read(pid_file).to_i
     end
 
     def setup_dir_structure
       [@sockets_dir, @pids_dir].each do |dir|
-        FileUtils.mkdir_p(dir) unless File.exists?(dir)
+        FileUtils.mkdir_p(dir) unless File.exist?(dir)
       end
     end
 
     def verify_version!(application)
-      begin
-        version = Socket.client_command(base_dir, application, "version")
-        if version != Bluepill::VERSION
-          abort("The running version of your daemon seems to be out of date.\nDaemon Version: #{version}, CLI Version: #{Bluepill::VERSION}")
-        end
-      rescue ArgumentError
-        abort("The running version of your daemon seems to be out of date.")
+      version = Socket.client_command(base_dir, application, 'version')
+      if version != Bluepill::VERSION
+        abort("The running version of your daemon seems to be out of date.\nDaemon Version: #{version}, CLI Version: #{Bluepill::VERSION}")
       end
+    rescue ArgumentError
+      abort('The running version of your daemon seems to be out of date.')
     end
   end
 end

data/lib/bluepill/dsl.rb

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   def self.application(app_name, options = {}, &block)
     app_proxy = AppProxy.new(app_name, options)
     if block.arity == 0
-      app_proxy.instance_eval &block
+      app_proxy.instance_eval(&block)
     else
       app_proxy.instance_exec(app_proxy, &block)
     end

data/lib/bluepill/dsl/app_proxy.rb

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class AppProxy
-    APP_ATTRIBUTES = [:working_dir, :uid, :gid, :environment, :auto_start ]
+    APP_ATTRIBUTES = [:working_dir, :uid, :gid, :environment, :auto_start]
 
-    attr_accessor *APP_ATTRIBUTES
+    attr_accessor(*APP_ATTRIBUTES)
     attr_reader :app
 
     def initialize(app_name, options)
@@ -12,7 +11,7 @@ module Bluepill
 
     def process(process_name, &process_block)
       attributes = {}
-      APP_ATTRIBUTES.each { |a| attributes[a] = self.send(a) }
+      APP_ATTRIBUTES.each { |a| attributes[a] = send(a) }
 
       process_factory = ProcessFactory.new(attributes, process_block)
 

data/lib/bluepill/dsl/process_factory.rb

@@ -1,10 +1,9 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class ProcessFactory
     attr_reader :attributes
 
-    @@process_keys = Hash.new
-    @@pid_files = Hash.new
+    @@process_keys = {}
+    @@pid_files = {}
 
     def initialize(attributes, process_block)
       @attributes = attributes
@@ -12,7 +11,7 @@ module Bluepill
     end
 
     def create_process(name, pids_dir)
-      self.assign_default_pid_file(name, pids_dir)
+      assign_default_pid_file(name, pids_dir)
 
       process = ProcessProxy.new(name, @attributes, @process_block)
       child_process_block = @attributes.delete(:child_process_block)
@@ -24,7 +23,7 @@ module Bluepill
 
     def create_child_process(name, pid, logger)
       attributes = {}
-      [:start_grace_time, :stop_grace_time, :restart_grace_time].each {|a| attributes[a] = @attributes[a]}
+      [:start_grace_time, :stop_grace_time, :restart_grace_time].each { |a| attributes[a] = @attributes[a] }
       attributes[:actual_pid] = pid
       attributes[:logger] = logger
 
@@ -36,19 +35,18 @@ module Bluepill
       process
     end
 
-    protected
+  protected
 
     def assign_default_pid_file(process_name, pids_dir)
-      unless @attributes.key?(:pid_file)
-        group_name = @attributes[:group]
-        default_pid_name = [group_name, process_name].compact.join('_').gsub(/[^A-Za-z0-9_\-]/, "_")
-        @attributes[:pid_file] = File.join(pids_dir, default_pid_name + ".pid")
-      end
+      return if @attributes.key?(:pid_file)
+      group_name = @attributes[:group]
+      default_pid_name = [group_name, process_name].compact.join('_').gsub(/[^A-Za-z0-9_\-]/, '_')
+      @attributes[:pid_file] = File.join(pids_dir, default_pid_name + '.pid')
     end
 
     def validate_process!(process)
       # validate uniqueness of group:process
-      process_key = [process.attributes[:group], process.name].join(":")
+      process_key = [process.attributes[:group], process.name].join(':')
       if @@process_keys.key?(process_key)
         $stderr.print "Config Error: You have two entries for the process name '#{process.name}'"
         $stderr.print " in the group '#{process.attributes[:group]}'" if process.attributes.key?(:group)
@@ -60,7 +58,7 @@ module Bluepill
 
       # validate required attributes
       [:start_command].each do |required_attr|
-        if !process.attributes.key?(required_attr)
+        unless process.attributes.key?(required_attr)
           $stderr.puts "Config Error: You must specify a #{required_attr} for '#{process.name}'"
           exit(6)
         end
@@ -75,48 +73,46 @@ module Bluepill
         @@pid_files[pid_key] = 0
       end
 
-      #validate stop_signals array
+      # validate stop_signals array
       stop_grace_time = process.attributes[:stop_grace_time]
       stop_signals = process.attributes[:stop_signals]
 
-      unless stop_signals.nil?
-        #Start with the more helpful error messages before the 'odd number' message.
-        delay_sum = 0
-        stop_signals.each_with_index do |s_or_d, i|
-          if i % 2 == 0
-            signal = s_or_d
-            unless signal.is_a? Symbol
-              $stderr.puts "Config Error: Invalid stop_signals!  Expected a symbol (signal) at position #{i} instead of '#{signal}'."
-              exit(6)
-            end
-          else
-            delay = s_or_d
-            unless delay.is_a? Fixnum
-              $stderr.puts "Config Error: Invalid stop_signals!  Expected a number (delay) at position #{i} instead of '#{delay}'."
-              exit(6)
-            end
-            delay_sum += delay
+      return if stop_signals.nil?
+      # Start with the more helpful error messages before the 'odd number' message.
+      delay_sum = 0
+      stop_signals.each_with_index do |s_or_d, i|
+        if i.even?
+          signal = s_or_d
+          unless signal.is_a? Symbol
+            $stderr.puts "Config Error: Invalid stop_signals!  Expected a symbol (signal) at position #{i} instead of '#{signal}'."
+            exit(6)
+          end
+        else
+          delay = s_or_d
+          unless delay.is_a? Fixnum
+            $stderr.puts "Config Error: Invalid stop_signals!  Expected a number (delay) at position #{i} instead of '#{delay}'."
+            exit(6)
           end
+          delay_sum += delay
         end
+      end
 
-        unless stop_signals.size % 2 == 1
-          $stderr.puts "Config Error: Invalid stop_signals!  Expected an odd number of elements."
-          exit(6)
-        end
+      unless stop_signals.size.odd?
+        $stderr.puts 'Config Error: Invalid stop_signals!  Expected an odd number of elements.'
+        exit(6)
+      end
 
-        if stop_grace_time.nil? || stop_grace_time <= delay_sum
-          $stderr.puts "Config Error: Stop_grace_time should be greater than the sum of stop_signals delays!"
-          exit(6)
-        end
+      if stop_grace_time.nil? || stop_grace_time <= delay_sum
+        $stderr.puts 'Config Error: Stop_grace_time should be greater than the sum of stop_signals delays!'
+        exit(6)
       end
     end
 
     def validate_child_process!(child)
-      unless child.attributes.has_key?(:stop_command)
-        $stderr.puts "Config Error: Invalid child process monitor for #{child.name}"
-        $stderr.puts "You must specify a stop command to monitor child processes."
-        exit(6)
-      end
+      return if child.attributes.key?(:stop_command)
+      $stderr.puts "Config Error: Invalid child process monitor for #{child.name}"
+      $stderr.puts 'You must specify a stop command to monitor child processes.'
+      exit(6)
     end
   end
 end

data/lib/bluepill/dsl/process_proxy.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class ProcessProxy
     attr_reader :attributes, :watches, :name
@@ -7,8 +6,8 @@ module Bluepill
       @attributes = attributes
       @watches = {}
 
-      if process_block.arity == 0
-        instance_eval &process_block
+      if process_block.arity.zero?
+        instance_eval(&process_block)
       else
         instance_exec(self, &process_block)
       end
@@ -16,11 +15,11 @@ module Bluepill
 
     def method_missing(name, *args)
       if args.size == 1 && name.to_s =~ /^(.*)=$/
-        @attributes[$1.to_sym] = args.first
+        @attributes[Regexp.last_match[1].to_sym] = args.first
       elsif args.size == 1
         @attributes[name.to_sym] = args.first
       elsif args.size == 0 && name.to_s =~ /^(.*)!$/
-        @attributes[$1.to_sym] = true
+        @attributes[Regexp.last_match[1].to_sym] = true
       elsif args.empty? && @attributes.key?(name.to_sym)
         @attributes[name.to_sym]
       else

data/lib/bluepill/group.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class Group
     attr_accessor :name, :processes, :logger
@@ -11,20 +10,16 @@ module Bluepill
     end
 
     def add_process(process)
-      process.logger = self.logger.prefix_with(process.name)
-      self.processes << process
+      process.logger = logger.prefix_with(process.name)
+      processes << process
     end
 
     def tick
-      self.processes.each do |process|
-        process.tick
-      end
+      processes.each(&:tick)
     end
 
     def determine_initial_state
-      self.processes.each do |process|
-        process.determine_initial_state
-      end
+      processes.each(&:determine_initial_state)
     end
 
     # proxied events
@@ -55,26 +50,25 @@ module Bluepill
     def status(process_name = nil)
       lines = []
       if process_name.nil?
-        prefix = self.name ? "  " : ""
-        lines << "#{self.name}:" if self.name
+        prefix = name ? '  ' : ''
+        lines << "#{name}:" if name
 
-        self.processes.each do |process|
-          lines << "%s%s(pid:%s): %s" % [prefix, process.name, process.actual_pid, process.state]
-          if process.monitor_children?
-            process.children.each do |child|
-              lines << "  %s%s: %s" % [prefix, child.name, child.state]
-            end
+        processes.each do |process|
+          next unless process.monitor_children?
+          lines << format('%s%s(pid:%s): %s', prefix, process.name, process.actual_pid, process.state)
+          process.children.each do |child|
+            lines << format('  %s%s: %s', prefix, child.name, child.state)
           end
         end
+
       else
-        self.processes.each do |process|
+        processes.each do |process|
           next if process_name != process.name
-          lines << "%s%s(pid:%s): %s" % [prefix, process.name, process.actual_pid, process.state]
+          lines << format('%s%s(pid:%s): %s', prefix, process.name, process.actual_pid, process.state)
           lines << process.statistics.to_s
         end
       end
-      lines << ""
+      lines << ''
     end
-
   end
 end