eye-patch 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a904d9ab31e2dc78e874ff356a9c63b35da0d41
-  data.tar.gz: 40bc46108198bd4a9f430e646a3a7d7c9d8df63f
+  metadata.gz: e5c73a375a8162cfb4df08af8cd0b4f85fa97861
+  data.tar.gz: ae491bfcb4e759566e3f0f2315c22cd7f57ef3be
 SHA512:
-  metadata.gz: 32a289481244b7276564d46e4b035d8a214a8fc6873238ee0ecb8704110808b8437662028d2efa03b5bd9f2cfd5cd246e0c64186157ff31e2daf6e1489d77068
-  data.tar.gz: 577b74325ae1560c616c92b9af23720d50d9ac9a1ea8d7a5b77656e58ee4dcafc0a7eb76ad16626202c6ea82f05d889668ec8dc06c4b26c1115ddb388a703b12
+  metadata.gz: aaebf06a44118db1b8f0be72cbc0678e99e0af174794f4d16297ddb0ff8d95d1f6a257dcce3d63139f219c08417200eb1b5648e4a5939c1b5e9814ccacba11c6
+  data.tar.gz: 069c6c9f416fab611f60b6005e66b07bae61b903e55defb8c2027a1e411a87a20436c4c29e0ef6ac800dcd41e7da9069cf3af35344fb83c203185f47f8a73f5c

data/bin/eye-patch-loader

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))
+require "eye/loader"
+require "optparse"
+require "eye/patch"
+
+options = {:debug => true}
+
+OptionParser.new do |opts|
+  opts.on( '-h', '--help', 'Display this screen' ) do
+    puts opts
+    exit
+  end
+
+  opts.on( '-c', '--config CONFIG', 'load with config' ) do |config_path|
+    options[:config] = config_path
+  end
+
+  opts.on( '-s', '--socket SOCKET', 'start listen on socket' ) do |socket_path|
+    options[:socket_path] = socket_path
+  end
+
+  opts.on( '-l', '--logger LOGGER', 'custom logger' ) do |logger|
+    options[:logger] = logger
+  end
+
+  opts.on( '-d', '--debug', 'debug info to logger' ) do
+    options[:debug] = true
+  end
+
+end.parse!
+
+Eye::Local.ensure_eye_dir
+
+socket_path = options[:socket_path] || Eye::Local.socket_path
+server = Eye::Server.new(socket_path)
+
+Eye::Logger.log_level = options[:debug] ? Logger::DEBUG : Logger::INFO
+Eye::Logger.link_logger(options[:logger]) if options[:logger]
+
+config = options[:config]
+config = File.expand_path(config) if config && !config.empty?
+
+if config
+  res = server.command('load', config)
+  exit if res.values.any? { |r| r[:error] }
+end
+
+Eye::Control.set_proc_line
+
+server.async.run
+
+trap("INT"){ exit }
+trap("USR1"){ Eye::Logger.reopen }
+trap("USR2"){ GC.start }
+
+sleep

data/lib/eye/patch.rb

@@ -1,4 +1,5 @@
 require "eye"
+require "eye/patch/overrides"
 
 module Eye::Patch
 
@@ -18,12 +19,3 @@ module Eye::Patch
     config
   end
 end
-
-module Eye::Controller::Load
-
-  private
-
-  def parse_config(filename)
-    Eye::Patch.parse(filename)
-  end
-end

data/lib/eye/patch/application.rb

@@ -43,22 +43,20 @@ class Eye::Patch::Application < Hash
     @config[:groups] = {}
 
     Array(settings[:processes]).group_by{ |item| item[:group] }.each do |group_name, items|
-      if group_name
-        parse_group(group_name, items)
-      else
-        @config[:processes] = parse_process_list(items)
-      end
+      name = group_name || "__default__"
+
+      @config[:groups][name.to_s] = { application: settings[:name].to_s }
+      parse_group(name.to_s, items)
     end
   end
 
   def parse_group(name, processes)
-    @config[:groups][name.to_s] = {}
-    @config[:groups][name.to_s][:processes] = parse_process_list(processes)
+    @config[:groups][name][:processes] = parse_process_list(name, processes)
   end
 
-  def parse_process_list(processes)
+  def parse_process_list(group_name, processes)
     processes.each_with_object({}) do |process, process_map|
-      process_map[process[:name].to_s] = process[:config]
+      process_map[process[:name].to_s] = process[:config].merge(group: group_name)
     end
   end
 end

data/lib/eye/patch/overrides.rb

@@ -0,0 +1,18 @@
+Eye::Cli.class_eval do
+  private
+
+  def loader_path
+    filename = File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. .. bin eye-patch-loader]))
+    File.exists?(filename) ? filename : nil
+  end
+end
+
+Eye::Controller.class_eval do
+  private
+
+  def parse_config(filename)
+    Eye::Patch.parse(filename)
+  end
+end
+
+Eye::Control

data/lib/eye/patch/version.rb

@@ -1,5 +1,5 @@
 module Eye
   module Patch
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eye-patch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Horner
@@ -71,6 +71,7 @@ email:
 - andrew@tablexi.com
 executables:
 - eye-patch
+- eye-patch-loader
 extensions: []
 extra_rdoc_files: []
 files:
@@ -80,11 +81,13 @@ files:
 - README.md
 - Rakefile
 - bin/eye-patch
+- bin/eye-patch-loader
 - eye-patch.gemspec
 - lib/eye/notify/ses.rb
 - lib/eye/patch.rb
 - lib/eye/patch/application.rb
 - lib/eye/patch/config.rb
+- lib/eye/patch/overrides.rb
 - lib/eye/patch/settings.rb
 - lib/eye/patch/version.rb
 - test/test_helper.rb