eye-patch 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4fd5387a724ebe2a8206f632a0bd82ebbcbdbb2
-  data.tar.gz: 136ce649ba422aa607a6a72b44d3d856a6ba87e8
+  metadata.gz: a8281021f4db405a7011e70f5ea0f01aa0b1afc3
+  data.tar.gz: 4ac4ff0e9c9b16f55912ffe1a885af3d424e6819
 SHA512:
-  metadata.gz: 97f7c12413d6d8099385be3252a121a704499e651b1ea4238b08a49fa90029d625d8afff803cbe1469292ca1ed2905fd7fd96ee6105ed958fa20d01963f09ed2
-  data.tar.gz: bfd5dd4a330ab8053c07583ddbd6346e3e78dea17482fdae0cdd80304b7ba15f53640d17721c8546cbfef38e2014956186ae74b5ade09611787c96dfb10c877b
+  metadata.gz: 9f58bfc30efef715e657c4c76611f9eda3040fa7ae8ebba0ca0c3b5f84ec997ddc65be39bf80ecb101ae2983f215a087106a8ee04c9e144df1daa6715bdf29a6
+  data.tar.gz: 667974afe57844d67faadc9ecc7bcd4926b19d982285d525f92c181224ef081c012a208da434dad5a2afea309dd6b4689371ce0f6faa9fc17972fc653cdebefa

data/README.md

@@ -71,6 +71,22 @@ Note that memory and duration values are written in plain english. See `lib/eye/
 
 Processes will inherit all configurations from the main application. All process options supported by `eye` are available by using the appropriate key in the `config` block.
 
+##### Checks and Triggers
+
+You can define per-process checks and triggers by defining a `checks` or `triggers` block within the process definition. 
+
+    processes:
+      - name: my-process
+        checks:
+          - name: memory
+            config:
+              times: 3
+              every: 10 seconds
+              below: 52 megabytes
+    ...
+
+Any check or trigger already defined at the application level will be overwritten with the new configuration. Application-level checks and triggers which are not redefined for the process will be persisted.
+
 ##### Grouping
 
 Rather than using the `eye` DSL's nesting approaching to setting up processes within groups, `Eye::Patch` simply needs a `group` attribute to be added to the process definition.
@@ -180,5 +196,4 @@ See `lib/eye/patch/capistrano.rb` for a list of available configuration options.
 
 ## Coming Soon
 
-- Proper support for per-process triggers and checks.
 - Process templates for commonly-used libraries (unicorn, sidekiq, delayed_jobs).

data/eye-patch.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "eye"
+  spec.add_dependency "eye", "~> 0.5"
   spec.add_dependency "chronic_duration"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/eye/patch/application.rb

@@ -21,7 +21,7 @@ module Eye::Patch
     end
 
     def parse_configuration
-      @config = (@settings[:application] || {}).merge(
+      @config = @settings.fetch(:application, {}).merge(
         name: @settings[:name],
         notify: notifications,
         triggers: triggers,

data/lib/eye/patch/capistrano.rb

@@ -15,7 +15,7 @@ Capistrano::Configuration.instance.load do
 
     desc "Start eye with the desired configuration file"
     task :load_config, roles: -> { fetch(:eye_roles) } do
-      run "cd #{current_path} && #{fetch(:eye_bin)} l #{fetch(:eye_config)}"
+      run "cd #{current_path} && #{fetch(:eye_bin)} q && #{fetch(:eye_bin)} l #{fetch(:eye_config)}"
     end
 
     desc "Stop eye and all of its monitored tasks"

data/lib/eye/patch/capistrano3.rb

@@ -17,6 +17,7 @@ namespace :eye do
   task :load_config do
     on roles(fetch(:eye_roles)) do
       within current_path do
+        execute fetch(:eye_bin), "q"
         execute fetch(:eye_bin), "l #{fetch(:eye_config)}"
       end
     end

data/lib/eye/patch/process_set.rb

@@ -16,22 +16,31 @@ module Eye::Patch
       if process[:count]
         parse_process_cluster(process)
       else
-        parse_single_process(process[:name], process[:config])
+        parse_single_process(
+          process[:name],
+          process[:config],
+          process_monitors(process))
       end
     end
 
     def parse_process_cluster(process)
       process[:count].times do |index|
         name = "#{process[:name]}-#{index}"
-        parse_single_process(name, indexed_config(process[:config], index))
+        parse_single_process(
+          name,
+          indexed_config(process[:config], index),
+          process_monitors(process))
       end
     end
 
-    def parse_single_process(name, config)
+    def parse_single_process(name, config, monitors)
       self[name] = @group
         .merge(stdout: config[:stdall], stderr: config[:stdall])
         .merge(config)
         .merge(name: name, group: @group[:name])
+
+      self[name][:triggers] = self[name][:triggers].merge(monitors[:triggers])
+      self[name][:checks] = self[name][:checks].merge(monitors[:checks])
     end
 
     def indexed_config(config, index)
@@ -39,5 +48,10 @@ module Eye::Patch
         result[key] = value.is_a?(String) ? value.gsub("{ID}", index.to_s) : value
       end
     end
+
+    def process_monitors(config)
+      { triggers: OptionSet.new(Eye::Trigger, config[:triggers]),
+        checks: OptionSet.new(Eye::Checker, config[:checks]) }
+    end
   end
 end

data/lib/eye/patch/settings.rb

@@ -1,15 +1,15 @@
+require "erb"
+require "forwardable"
 require_relative "value_parser"
 
 module Eye::Patch
 
   class Settings
+    extend Forwardable
+    def_delegators :parsed, :[], :fetch
 
     def initialize(filename)
-      @settings = YAML.load(File.open(filename))
-    end
-
-    def [](value)
-      parsed[value]
+      @settings = YAML.load(ERB.new(File.read(filename)).result)
     end
 
     private

data/lib/eye/patch/value_parser.rb

@@ -11,6 +11,8 @@ module Eye::Patch
       size: SIZE_MATCHER }.freeze
 
     def self.parse(value)
+      return value unless value.is_a?(String)
+
       result = MATCHERS.detect do |match_type, matcher|
         break send(:"parse_#{match_type}", value) if value.match(matcher)
       end

data/lib/eye/patch/version.rb

@@ -1,5 +1,5 @@
 module Eye
   module Patch
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/test/fixtures/overrides.yml

@@ -0,0 +1,39 @@
+name: Test Application With Per-Process Overrides
+
+config:
+  logger: /path/to/log/eye.log
+
+application:
+  working_dir: /path/to/application
+
+triggers:
+  - name: flapping
+    config:
+      times: 10
+      within: 1 minute
+
+checks:
+  - name: memory
+    config:
+      times: 3
+      every: 20 seconds
+      below: 1.5 gigabytes
+
+processes:
+  - name: my-process
+    triggers:
+      - name: flapping
+        config:
+          times: 6
+          within: 40 seconds
+    checks:
+      - name: memory
+        config:
+          times: 2
+          every: 15 seconds
+          below: 1.2 megabytes
+    config:
+      start_timeout: 25 seconds
+      start_command: bundle exec my-process
+      pid_file: tmp/pids/my-process.pid
+      stdall: log/my-process.log

data/test/lib/eye/patch/settings_test.rb

@@ -0,0 +1,15 @@
+require_relative "../../../test_helper"
+require "tempfile"
+
+module Eye
+  module Patch
+    describe Settings do
+      it "evaluates the yaml as ERB" do
+        file = Tempfile.new("yaml")
+        file.write("sum: <%= 1 + 2 %>")
+        file.close
+        assert_equal 3, Settings.new(file.path)[:sum]
+      end
+    end
+  end
+end

data/test/lib/eye/patch_test.rb

@@ -2,13 +2,13 @@ require_relative "../../test_helper"
 
 describe Eye::Patch do
   before do
-    @fixture = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. fixtures test.yml]))
-    @original = YAML.load(File.open(@fixture))
+    Eye::Config.any_instance.stubs(:validate!)
   end
 
   describe ".parse" do
     before do
-      Eye::Config.any_instance.stubs(:validate!)
+      @fixture = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. fixtures test.yml]))
+      @original = YAML.load(File.open(@fixture))
       @parsed = Eye::Patch.parse(@fixture)
 
       @settings = @parsed.settings
@@ -37,17 +37,18 @@ describe Eye::Patch do
       trigger = @original["triggers"].first
       parsed_trigger = @application[:triggers][trigger["name"].to_sym]
 
-      assert_equal trigger["config"]["times"], parsed_trigger[:times]
-      assert_equal Eye::Patch::ValueParser.parse(trigger["config"]["within"]), parsed_trigger[:within]
+      %w(times within).each do |setting|
+        assert_equal Eye::Patch::ValueParser.parse(trigger["config"][setting]), parsed_trigger[setting.to_sym]
+      end
     end
 
     it "parses checks" do
       check = @original["checks"].first
       parsed_check = @application[:checks][check["name"].to_sym]
 
-      assert_equal check["config"]["times"], parsed_check[:times]
-      assert_equal Eye::Patch::ValueParser.parse(check["config"]["every"]), parsed_check[:every]
-      assert_equal Eye::Patch::ValueParser.parse(check["config"]["below"]), parsed_check[:below]
+      %w(times every below).each do |setting|
+        assert_equal Eye::Patch::ValueParser.parse(check["config"][setting]), parsed_check[setting.to_sym]
+      end
     end
 
     it "splits processes into groups" do
@@ -88,4 +89,36 @@ describe Eye::Patch do
       assert_equal process["config"]["stdall"], parsed_process[:stderr]
     end
   end
+
+  describe ".parse with per-process overrides" do
+    before do
+      @fixture = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. fixtures overrides.yml]))
+      @original = YAML.load(File.open(@fixture))
+      @parsed = Eye::Patch.parse(@fixture)
+
+      @settings = @parsed.settings
+      @applications = @parsed.applications
+      @application = @applications.values.first
+    end
+
+    it "loads per-process triggers" do
+      process = @application[:groups]["__default__"][:processes].values.first
+      trigger = @original["processes"].detect { |p| p["name"] == process[:name] }["triggers"].first
+      parsed_trigger = process[:triggers][trigger["name"].to_sym]
+
+      %w(times within).each do |setting|
+        assert_equal Eye::Patch::ValueParser.parse(trigger["config"][setting]), parsed_trigger[setting.to_sym]
+      end
+    end
+
+    it "loads per-process checks" do
+      process = @application[:groups]["__default__"][:processes].values.first
+      check = @original["processes"].detect { |p| p["name"] == process[:name] }["checks"].first
+      parsed_check = process[:checks][check["name"].to_sym]
+
+      %w(times every below).each do |setting|
+        assert_equal Eye::Patch::ValueParser.parse(check["config"][setting]), parsed_check[setting.to_sym]
+      end
+    end
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: eye-patch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eye
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,9 @@ files:
 - lib/eye/patch/settings.rb
 - lib/eye/patch/value_parser.rb
 - lib/eye/patch/version.rb
+- test/fixtures/overrides.yml
 - test/fixtures/test.yml
+- test/lib/eye/patch/settings_test.rb
 - test/lib/eye/patch/value_parser_test.rb
 - test/lib/eye/patch/version_test.rb
 - test/lib/eye/patch_test.rb
@@ -135,13 +137,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Eye::Patch abstracts out the Eye DSL to allow you to load your configuration
   from a structured YAML file, rather than relying on Eye's built-in DSL.
 test_files:
+- test/fixtures/overrides.yml
 - test/fixtures/test.yml
+- test/lib/eye/patch/settings_test.rb
 - test/lib/eye/patch/value_parser_test.rb
 - test/lib/eye/patch/version_test.rb
 - test/lib/eye/patch_test.rb