resurrected_god 0.14.0 → 1.0.0

data/lib/god/cli/run.rb

@@ -1,6 +1,5 @@
 module God
   module CLI
-
     class Run
       def initialize(options)
         @options = options
@@ -12,9 +11,7 @@ module God
         # have at_exit start god
         $run = true
 
-        if @options[:syslog]
-          require 'god/sys_logger'
-        end
+        require 'god/sys_logger' if @options[:syslog]
 
         # run
         if @options[:daemonize]
@@ -42,29 +39,21 @@ module God
         setup_logging
 
         # start attached pid watcher if necessary
-        if @options[:attach]
-          self.attach
-        end
+        attach if @options[:attach]
 
-        if @options[:port]
-          God.port = @options[:port]
-        end
+        God.port = @options[:port] if @options[:port]
 
-        if @options[:events]
-          God::EventHandler.load
-        end
+        God::EventHandler.load if @options[:events]
 
         # set log level, defaults to WARN
-        if @options[:log_level]
-          God.log_level = @options[:log_level]
-        else
-          God.log_level = @options[:daemonize] ? :warn : :info
-        end
+        God.log_level = if @options[:log_level]
+                          @options[:log_level]
+                        else
+                          @options[:daemonize] ? :warn : :info
+                        end
 
         if @options[:config]
-          if !@options[:config].include?('*') && !File.exist?(@options[:config])
-            abort "File not found: #{@options[:config]}"
-          end
+          abort "File not found: #{@options[:config]}" if !@options[:config].include?('*') && !File.exist?(@options[:config])
 
           # start the event handler
           God::EventHandler.start if God::EventHandler.loaded?
@@ -82,42 +71,35 @@ module God
 
       def run_daemonized
         # trap and ignore SIGHUP
-        Signal.trap('HUP') {}
+        Signal.trap('HUP') {} # block must be passed
         # trap and log-reopen SIGUSR1
         Signal.trap('USR1') { setup_logging }
 
         pid = fork do
-          begin
-            require 'god'
-
-            # set pid if requested
-            if @options[:pid] # and as deamon
-              God.pid = @options[:pid]
-            end
-
-            default_run
-
-            unless God::EventHandler.loaded?
-              puts
-              puts "***********************************************************************"
-              puts "*"
-              puts "* Event conditions are not available for your installation of god."
-              puts "* You may still use and write custom conditions using the poll system"
-              puts "*"
-              puts "***********************************************************************"
-              puts
-            end
-
-          rescue => e
-            puts e.message
-            puts e.backtrace.join("\n")
-            abort "There was a fatal system error while starting god (see above)"
+          require 'god'
+
+          # set pid if requested
+          God.pid = @options[:pid] if @options[:pid] # and as daemon
+
+          default_run
+
+          unless God::EventHandler.loaded?
+            puts
+            puts '***********************************************************************'
+            puts '*'
+            puts '* Event conditions are not available for your installation of god.'
+            puts '* You may still use and write custom conditions using the poll system'
+            puts '*'
+            puts '***********************************************************************'
+            puts
           end
+        rescue => e
+          puts e.message
+          puts e.backtrace.join("\n")
+          abort 'There was a fatal system error while starting god (see above)'
         end
 
-        if @options[:pid]
-          File.open(@options[:pid], 'w') { |f| f.write pid }
-        end
+        File.write(@options[:pid], pid) if @options[:pid]
 
         ::Process.detach pid
 
@@ -127,25 +109,23 @@ module God
       def setup_logging
         log_file = God.log_file
         log_file = File.expand_path(@options[:log]) if @options[:log]
-        log_file = "/dev/null" if !log_file && @options[:daemonize]
-        if log_file
-          puts "Sending output to log file: #{log_file}" unless @options[:daemonize]
-
-          # reset file descriptors
-          STDIN.reopen "/dev/null"
-          STDOUT.reopen(log_file, "a")
-          STDERR.reopen STDOUT
-          STDOUT.sync = true
-        end
+        log_file = '/dev/null' if !log_file && @options[:daemonize]
+        return unless log_file
+
+        puts "Sending output to log file: #{log_file}" unless @options[:daemonize]
+
+        # reset file descriptors
+        $stdin.reopen '/dev/null'
+        $stdout.reopen(log_file, 'a')
+        $stderr.reopen $stdout
+        $stdout.sync = true
       end
 
       def load_config(config)
         files = File.directory?(config) ? Dir['**/*.god'] : Dir[config]
-        abort "No files could be found" if files.empty?
+        abort 'No files could be found' if files.empty?
         files.each do |god_file|
-          unless load_god_file(god_file)
-            abort "File '#{god_file}' could not be loaded"
-          end
+          abort "File '#{god_file}' could not be loaded" unless load_god_file(god_file)
         end
       end
 
@@ -154,17 +134,13 @@ module God
         load File.expand_path(god_file)
         true
       rescue Exception => e
-        if e.instance_of?(SystemExit)
-          raise
-        else
-          puts "There was an error in #{god_file}"
-          puts "\t" + e.message
-          puts "\t" + e.backtrace.join("\n\t")
-          false
-        end
-      end
-
-    end # Run
+        raise if e.instance_of?(SystemExit)
 
+        puts "There was an error in #{god_file}"
+        puts "\t#{e.message}"
+        puts "\t#{e.backtrace.join("\n\t")}"
+        false
+      end
+    end
   end
 end

data/lib/god/cli/version.rb

@@ -1,6 +1,5 @@
 module God
   module CLI
-
     class Version
       def self.version
         require 'god'
@@ -12,12 +11,11 @@ module God
 
       def self.version_extended
         puts "Version: #{God.version}"
-        puts "Polls: enabled"
-        puts "Events: " + God::EventHandler.event_system
+        puts 'Polls: enabled'
+        puts "Events: #{God::EventHandler.event_system}"
 
         exit
       end
     end
-
   end
 end

data/lib/god/condition.rb

@@ -1,5 +1,4 @@
 module God
-
   class Condition < Behavior
     attr_accessor :transition, :notify, :info, :phase
 
@@ -7,21 +6,21 @@ module God
     # kind (which is given as an underscored symbol).
     #   +kind+ is the underscored symbol representing the class (e.g. :foo_bar for God::Conditions::FooBar)
     def self.generate(kind, watch)
-      sym = kind.to_s.capitalize.gsub(/_(.)/){$1.upcase}.intern
+      sym = kind.to_s.capitalize.gsub(/_(.)/) { Regexp.last_match(1).upcase }.intern
       c = God::Conditions.const_get(sym).new
 
-      unless c.kind_of?(PollCondition) || c.kind_of?(EventCondition) || c.kind_of?(TriggerCondition)
+      unless c.is_a?(PollCondition) || c.is_a?(EventCondition) || c.is_a?(TriggerCondition)
         abort "Condition '#{c.class.name}' must subclass God::PollCondition, God::EventCondition, or God::TriggerCondition"
       end
 
-      if !EventHandler.loaded? && c.kind_of?(EventCondition)
+      if !EventHandler.loaded? && c.is_a?(EventCondition)
         abort "Condition '#{c.class.name}' requires an event system but none has been loaded"
       end
 
       c.watch = watch
       c
     rescue NameError
-      raise NoSuchConditionError.new("No Condition found with the class name God::Conditions::#{sym}")
+      raise NoSuchConditionError, "No Condition found with the class name God::Conditions::#{sym}"
     end
 
     def self.valid?(condition)
@@ -30,7 +29,7 @@ module God
         begin
           Contact.normalize(condition.notify)
         rescue ArgumentError => e
-          valid &= Configurable.complain("Attribute 'notify' " + e.message, condition)
+          valid &= Configurable.complain("Attribute 'notify' #{e.message}", condition)
         end
       end
       valid
@@ -40,7 +39,7 @@ module God
     #
     # Condition FooBar on Watch 'baz'
     def friendly_name
-      "Condition #{self.class.name.split('::').last} on Watch '#{self.watch.name}'"
+      "Condition #{self.class.name.split('::').last} on Watch '#{watch.name}'"
     end
   end
 
@@ -57,7 +56,7 @@ module God
     # Return true if the test passes (everything is ok)
     # Return false otherwise
     def test
-      raise AbstractMethodNotOverriddenError.new("PollCondition#test must be overridden in subclasses")
+      raise AbstractMethodNotOverriddenError, 'PollCondition#test must be overridden in subclasses'
     end
 
     # Override this method in your Conditions (optional)
@@ -67,21 +66,21 @@ module God
 
   class EventCondition < Condition
     def register
-      raise AbstractMethodNotOverriddenError.new("EventCondition#register must be overridden in subclasses")
+      raise AbstractMethodNotOverriddenError, 'EventCondition#register must be overridden in subclasses'
     end
 
     def deregister
-      raise AbstractMethodNotOverriddenError.new("EventCondition#deregister must be overridden in subclasses")
+      raise AbstractMethodNotOverriddenError, 'EventCondition#deregister must be overridden in subclasses'
     end
   end
 
   class TriggerCondition < Condition
-    def process(event, payload)
-      raise AbstractMethodNotOverriddenError.new("TriggerCondition#process must be overridden in subclasses")
+    def process(event, payload) # rubocop:disable Lint/UnusedMethodArgument
+      raise AbstractMethodNotOverriddenError, 'TriggerCondition#process must be overridden in subclasses'
     end
 
     def trigger
-      self.watch.trigger(self)
+      watch.trigger(self)
     end
 
     def register
@@ -92,5 +91,4 @@ module God
       Trigger.deregister(self)
     end
   end
-
 end

data/lib/god/conditions/always.rb

@@ -19,12 +19,13 @@ module God
       attr_accessor :what
 
       def initialize
-        self.info = "always"
+        super
+        self.info = 'always'
       end
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'what' must be specified", self) if self.what.nil?
+        valid &= complain("Attribute 'what' must be specified", self) if what.nil?
         valid
       end
 

data/lib/god/conditions/complex.rb

@@ -1,12 +1,11 @@
 module God
   module Conditions
-
     class Complex < PollCondition
       AND = 0x1
       OR  = 0x2
       NOT = 0x4
 
-      def initialize()
+      def initialize
         super
 
         @oper_stack = []
@@ -20,18 +19,18 @@ module God
       end
 
       def prepare
-        @oper_stack.each { |oper| oper.prepare }
+        @oper_stack.each(&:prepare)
       end
 
-      def new_oper(kind, op)
-        oper = Condition.generate(kind, self.watch)
+      def new_oper(kind, operand)
+        oper = Condition.generate(kind, watch)
         @oper_stack.push(oper)
-        @op_stack.push(op)
+        @op_stack.push(operand)
         oper
       end
 
       def this(kind)
-        @this = Condition.generate(kind, self.watch)
+        @this = Condition.generate(kind, watch)
         yield @this if block_given?
       end
 
@@ -56,31 +55,31 @@ module God
       end
 
       def test
-        if @this.nil?
-          # Although this() makes sense semantically and therefore
-          # encourages easy-to-read conditions, being able to omit it
-          # allows for more DRY code in some cases, so we deal with a
-          # nil @this here by initially setting res to true or false,
-          # depending on whether the first operator used is AND or OR
-          # respectively.
-          if 0 < @op_stack[0] & AND
-            res = true
-          else
-            res = false
-          end
-        else
-          res = @this.test
-        end
+        res = if @this.nil?
+                # Although this() makes sense semantically and therefore
+                # encourages easy-to-read conditions, being able to omit it
+                # allows for more DRY code in some cases, so we deal with a
+                # nil @this here by initially setting res to true or false,
+                # depending on whether the first operator used is AND or OR
+                # respectively.
+                @op_stack[0] & AND > 0
+              else
+                @this.test
+              end
 
         @op_stack.each do |op|
           cond = @oper_stack.shift
-          eval "res " + ((0 < op & AND) ? "&&" : "||") + "= " + ((0 < op & NOT) ? "!" : "") + "cond.test"
+          value = op & NOT > 0 ? !cond.test : cond.test
+          if op & AND > 0
+            res &&= value
+          else
+            res ||= value
+          end
           @oper_stack.push cond
         end
 
         res
       end
     end
-
   end
 end

data/lib/god/conditions/cpu_usage.rb

@@ -1,13 +1,12 @@
 module God
   module Conditions
-
     # Condition Symbol :cpu_usage
     # Type: Poll
     #
     # Trigger when the percent of CPU use of a process is above a specified limit.
     # On multi-core systems, this number could conceivably be above 100.
     #
-    # Paramaters
+    # Parameters
     #   Required
     #     +pid_file+ is the pid file of the process in question. Automatically
     #                populated for Watches.
@@ -38,11 +37,9 @@ module God
       end
 
       def prepare
-        if self.times.kind_of?(Integer)
-          self.times = [self.times, self.times]
-        end
+        self.times = [times, times] if times.is_a?(Integer)
 
-        @timeline = Timeline.new(self.times[1])
+        @timeline = Timeline.new(times[1])
       end
 
       def reset
@@ -50,31 +47,30 @@ module God
       end
 
       def pid
-        self.pid_file ? File.read(self.pid_file).strip.to_i : self.watch.pid
+        pid_file ? File.read(pid_file).strip.to_i : watch.pid
       end
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'pid_file' must be specified", self) if self.pid_file.nil? && self.watch.pid_file.nil?
-        valid &= complain("Attribute 'above' must be specified", self) if self.above.nil?
+        valid &= complain("Attribute 'pid_file' must be specified", self) if pid_file.nil? && watch.pid_file.nil?
+        valid &= complain("Attribute 'above' must be specified", self) if above.nil?
         valid
       end
 
       def test
-        process = System::Process.new(self.pid)
+        process = System::Process.new(pid)
         @timeline.push(process.percent_cpu)
         self.info = []
 
-        history = "[" + @timeline.map { |x| "#{x > self.above ? '*' : ''}#{x}%%" }.join(", ") + "]"
+        history = @timeline.map { |x| "#{x > above ? '*' : ''}#{x}%%" }.join(', ')
 
-        if @timeline.select { |x| x > self.above }.size >= self.times.first
-          self.info = "cpu out of bounds #{history}"
-          return true
+        if @timeline.count { |x| x > above } >= times.first
+          self.info = "cpu out of bounds [#{history}]"
+          true
         else
-          return false
+          false
         end
       end
     end
-
   end
 end

data/lib/god/conditions/degrading_lambda.rb

@@ -1,6 +1,5 @@
 module God
   module Conditions
-
     # This condition degrades its interval by a factor of two for 3 tries before failing
     class DegradingLambda < PollCondition
       attr_accessor :lambda
@@ -17,36 +16,33 @@ module God
       end
 
       def test
-        puts "Calling test. Interval at #{self.interval}"
-        @original_interval ||= self.interval
-        unless pass?
+        puts "Calling test. Interval at #{interval}"
+        @original_interval ||= interval
+        if pass?
+          @tries = 0
+          self.interval = @original_interval
+        else
           if @tries == 2
-            self.info = "lambda condition was satisfied"
+            self.info = 'lambda condition was satisfied'
             return true
           end
-          self.interval = self.interval / 2.0
+          self.interval = interval / 2.0
           @tries += 1
-        else
-          @tries = 0
-          self.interval = @original_interval
         end
 
-        self.info = "lambda condition was not satisfied"
+        self.info = 'lambda condition was not satisfied'
         false
       end
 
       private
 
-        def pass?
-          begin
-            Timeout::timeout(@interval) {
-              self.lambda.call()
-            }
-          rescue Timeout::Error
-            false
-          end
+      def pass?
+        Timeout.timeout(@interval) do
+          self.lambda.call
         end
+      rescue Timeout::Error
+        false
+      end
     end
-
   end
 end

data/lib/god/conditions/disk_usage.rb

@@ -1,6 +1,5 @@
 module God
   module Conditions
-
     class DiskUsage < PollCondition
       attr_accessor :above, :mount_point
 
@@ -12,19 +11,19 @@ module God
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'mount_point' must be specified", self) if self.mount_point.nil?
-        valid &= complain("Attribute 'above' must be specified", self) if self.above.nil?
+        valid &= complain("Attribute 'mount_point' must be specified", self) if mount_point.nil?
+        valid &= complain("Attribute 'above' must be specified", self) if above.nil?
         valid
       end
 
       def test
         self.info = []
-        usage = `df -P | grep -i " #{self.mount_point}$" | awk '{print $5}' | sed 's/%//'`
-        if usage.to_i > self.above
-          self.info = "disk space out of bounds"
-          return true
+        usage = `df -P | grep -i " #{mount_point}$" | awk '{print $5}' | sed 's/%//'`
+        if usage.to_i > above
+          self.info = 'disk space out of bounds'
+          true
         else
-          return false
+          false
         end
       end
     end

data/lib/god/conditions/file_mtime.rb

@@ -1,6 +1,5 @@
 module God
   module Conditions
-
     class FileMtime < PollCondition
       attr_accessor :path, :max_age
 
@@ -12,17 +11,14 @@ module God
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'path' must be specified", self) if self.path.nil?
-        valid &= complain("Attribute 'max_age' must be specified", self) if self.max_age.nil?
+        valid &= complain("Attribute 'path' must be specified", self) if path.nil?
+        valid &= complain("Attribute 'max_age' must be specified", self) if max_age.nil?
         valid
       end
 
       def test
-        (Time.now - File.mtime(self.path)) > self.max_age
+        (Time.now - File.mtime(path)) > max_age
       end
     end
-
   end
 end
-
-

data/lib/god/conditions/file_touched.rb

@@ -1,12 +1,11 @@
 module God
   module Conditions
-  
     # Condition Symbol :file_touched
     # Type: Poll
     #
     # Trigger when a specified file is touched.
     #
-    # Paramaters
+    # Parameters
     #   Required
     #     +path+ is the path to the file to watch.
     #
@@ -28,13 +27,13 @@ module God
 
       def valid?
         valid = true
-        valid &= complain("Attribute 'path' must be specified", self) if self.path.nil?
+        valid &= complain("Attribute 'path' must be specified", self) if path.nil?
         valid
       end
 
       def test
-        if File.exists?(self.path)
-          (Time.now - File.mtime(self.path)) <= self.interval
+        if File.exist?(path)
+          (Time.now - File.mtime(path)) <= interval
         else
           false
         end