honcho 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21631e6c9c4f232d6dcdde64454ebfac347112e9
-  data.tar.gz: 46eb594180d364e2dc5e3576a9e7e293fc7da92b
+  metadata.gz: 45989ba8f3704c6d5172f9518e7bfc1c2201d6db
+  data.tar.gz: 9e8f3b779d67d975a8ccdb7f30ba30ab933c04da
 SHA512:
-  metadata.gz: e365db119de34c395d23bd1e58e47c94aba937bd6c7cd7753fc783f3bf4317ce85b1f4d95f06ea2e1c8fc75d9ed2bc9254828c83726011f3a6758adc2f60bcc0
-  data.tar.gz: d97ae928be10369b2870049379189c244eaf4e1f8721a76c401a2f0203ac0cd296698e0964d7f19fecd818398ec75034c779adeac5cc866c18a07ba0f567d1a9
+  metadata.gz: b3ad82f616bc1b8deeeff75a498889f5c7804d20145a58e2dd4b1964dfa4d69bda29efd3773f5d13f92184751736d285abf597bc0095707bbb7fe4927926a62f
+  data.tar.gz: d541b3ad3601e544e244ef2e1ad1a32bf02e9c892dba2b32f7ea7a09695358e8da50a272fbe58d6f6eab77096177b2e81e96b4d868f1acb9b2f259023d889e03

data/bin/honcho

@@ -1,5 +1,18 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require_relative '../lib/honcho'
 
-Honcho.new.run
+options = {
+  config: 'honcho.yml'
+}
+
+OptionParser.new do |opts|
+  opts.banner = 'Usage: honcho [options]'
+
+  opts.on('-c', '--config path', 'specify config file path') do |path|
+    options[:config] = path
+  end
+end.parse!
+
+Honcho::Runner.new(options).run

data/lib/honcho.rb

@@ -1,178 +1 @@
-#!/usr/bin/env ruby
-
-require 'redis'
-require 'time'
-require 'stringio'
-require 'yaml'
-require_relative './honcho/adapters'
-
-Thread.abort_on_exception = true
-
-class Honcho
-  COLORS = {
-    red:            31,
-    green:          32,
-    yellow:         33,
-    blue:           34,
-    magenta:        35,
-    cyan:           36,
-    bright_red:     31,
-    bright_green:   32,
-    bright_yellow:  33,
-    bright_blue:    34,
-    bright_magenta: 35,
-    bright_cyan:    36
-  }.freeze
-
-  def initialize
-    @running = {}
-    @stopping = {}
-    @redis = Redis.new
-    @adapters = build_adapters
-    @colors = assign_colors
-  end
-
-  attr_reader :adapters, :running, :stopping, :redis, :colors
-
-  def run
-    trap(:INT)  { term_all && exit }
-    trap(:TERM) { term_all && exit }
-    loop do
-      check_for_work
-      sleep(interval)
-    end
-  end
-
-  private
-
-  def apps
-    config['apps']
-  end
-
-  def command_template
-    config['command_template'] || '%s'
-  end
-
-  def stop_delay
-    config['stop_delay'] || 30
-  end
-
-  def interval
-    config['interval'] || 2
-  end
-
-  def config
-    @config ||= YAML.load_file('honcho.yml')
-  end
-
-  def check_for_work
-    adapters.each do |adapter|
-      if adapter.run?
-        start(adapter)
-      else
-        stop(adapter)
-      end
-    end
-  end
-
-  def start(adapter)
-    stopping.delete(adapter)
-    return if running[adapter]
-    log(adapter.config['name'], "STARTING\n")
-    running[adapter] = start_command(adapter)
-  end
-
-  def start_command(adapter)
-    command = adapter.config['command']
-    Array(command).map do |cmd|
-      rout, wout = IO.pipe
-      pid = spawn(adapter.config['path'], cmd, wout)
-      Thread.new do
-        log(adapter.config['name'], rout.gets) until rout.eof?
-      end
-      [pid, wout]
-    end
-  end
-
-  def spawn(path, cmd, out)
-    Process.spawn(
-      "cd '#{path}' && " + command_template % cmd,
-      pgroup: true,
-      err: out,
-      out: out
-    )
-  end
-
-  def stop(adapter)
-    return unless running[adapter]
-    if should_stop?(adapter)
-      really_stop(adapter)
-    else
-      stopping[adapter] ||= stop_delay
-      stopping[adapter] -= interval
-    end
-  end
-
-  def should_stop?(adapter)
-    stopping[adapter] && stopping[adapter] <= 0
-  end
-
-  def really_stop(adapter)
-    log(adapter.config['name'], "STOPPING\n")
-    stopping.delete(adapter)
-    return unless running[adapter]
-    running[adapter].each do |(pid, wout)|
-      Process.kill('-TERM', pid)
-      wout.close
-    end
-    running.delete(adapter)
-  end
-
-  def term_all
-    running.values.flatten.each do |(pid)|
-      Process.kill('-TERM', pid)
-    end
-  end
-
-  def log(name, message)
-    color = colors[name]
-    $stdout.write("\e[#{color}m#{name.rjust(label_width)}:\e[0m #{message}")
-  end
-
-  def label_width
-    @label_width ||= apps.keys.map(&:size).max
-  end
-
-  def assign_colors
-    color_values = COLORS.values
-    apps.keys.each_with_object({}) do |app, hash|
-      hash[app] = color_values.shift
-    end
-  end
-
-  def build_adapters
-    apps.flat_map do |app, config|
-      config.map do |type, worker_config|
-        adapter = adapter_from_type(type)
-        next if adapter.nil?
-        adapter.new(
-          config: worker_config.merge('name' => app, 'path' => config['path']),
-          redis: redis
-        )
-      end
-    end.compact
-  end
-
-  def adapter_from_type(type)
-    case type
-    when 'sidekiq'
-      Adapters::Sidekiq
-    when 'resque'
-      Adapters::Resque
-    when 'path'
-      nil
-    else
-      fail "Unknown type #{type}"
-    end
-  end
-end
+require_relative './honcho/runner'

data/lib/honcho/adapters.rb

@@ -1,3 +1,22 @@
 require_relative './adapters/base'
 require_relative './adapters/resque'
 require_relative './adapters/sidekiq'
+
+module Honcho
+  module Adapters
+    module_function
+
+    def from_type(type)
+      case type
+      when 'sidekiq'
+        Adapters::Sidekiq
+      when 'resque'
+        Adapters::Resque
+      when 'path' # special config key that gets ignored
+        nil
+      else
+        raise "Unknown type #{type}"
+      end
+    end
+  end
+end

data/lib/honcho/adapters/base.rb

@@ -1,25 +1,115 @@
-class Honcho
+module Honcho
   module Adapters
     class Base
-      def initialize(config:, redis:)
-        @redis = redis
+      def initialize(config:, redis:, runner:)
         @config = config
+        @redis = redis
+        @runner = runner
+        @running = false
+        @stopping = false
+      end
+
+      attr_reader :config, :redis, :runner, :running, :stopping
+
+      def check_for_work
+        if run?
+          start
+        else
+          stop
+        end
+      end
+
+      def name
+        config['name']
+      end
+
+      def commands
+        Array(config['command'])
       end
 
-      attr_reader :config, :redis
+      def path
+        config['path']
+      end
 
       def run?
         work_to_do? || work_being_done?
       end
 
+      def running?
+        @running != false
+      end
+
+      def stopping?
+        @stopping != false
+      end
+
+      def start
+        @stopping = false
+        return if running?
+        log(name, "STARTING\n")
+        @running = start_command
+      end
+
+      def start_command
+        commands.map do |cmd|
+          rout, wout = IO.pipe
+          pid = spawn(path, cmd, wout)
+          Thread.new do
+            log(name, rout.gets) until rout.eof?
+          end
+          [pid, wout]
+        end
+      end
+
+      def stop
+        return unless running?
+        if should_stop?
+          really_stop
+        else
+          @stopping ||= stop_delay
+          @stopping -= interval
+        end
+      end
+
+      def should_stop?
+        stopping? && stopping <= 0
+      end
+
+      def really_stop
+        @stopping = false
+        return unless running?
+        log(name, "STOPPING\n")
+        running.each do |(pid, wout)|
+          Process.kill('-TERM', pid)
+          wout.close
+        end
+        @running = false
+      end
+
       private
 
+      def log(*args)
+        runner.log(*args)
+      end
+
+      def spawn(*args)
+        runner.spawn(*args)
+      end
+
+      def stop_delay
+        runner.stop_delay
+      end
+
+      def interval
+        runner.interval
+      end
+
       def work_to_do?
-        fail NotImplementedError, "please define #{this.class.name}##{__method__}"
+        raise NotImplementedError, "please define #{this.class.name}##{__method__}"
       end
 
       def work_being_done?
-        fail NotImplementedError, "please define #{this.class.name}##{__method__}"
+        raise NotImplementedError, "please define #{this.class.name}##{__method__}"
       end
     end
   end

data/lib/honcho/adapters/resque.rb

@@ -1,4 +1,4 @@
-class Honcho
+module Honcho
   module Adapters
     class Resque < Base
       private

data/lib/honcho/adapters/sidekiq.rb

@@ -1,4 +1,4 @@
-class Honcho
+module Honcho
   module Adapters
     class Sidekiq < Base
       private

data/lib/honcho/runner.rb

@@ -0,0 +1,121 @@
+require 'curses'
+require 'redis'
+require 'time'
+require 'stringio'
+require 'yaml'
+require_relative './adapters'
+
+Thread.abort_on_exception = true
+
+module Honcho
+  class Runner
+    COLORS = {
+      red:            '0;31',
+      green:          '0;32',
+      yellow:         '0;33',
+      blue:           '0;34',
+      magenta:        '0;35',
+      cyan:           '0;36',
+      bright_red:     '1;31',
+      bright_green:   '1;32',
+      bright_yellow:  '1;33',
+      bright_blue:    '1;34',
+      bright_magenta: '1;35',
+      bright_cyan:    '1;36'
+    }.freeze
+
+    def initialize(options)
+      @config_file_path = options[:config]
+      @root_path = File.expand_path('..', @config_file_path)
+      @running = {}
+      @stopping = {}
+      @redis = Redis.new
+      @adapters = build_adapters
+      @colors = assign_colors
+    end
+
+    attr_reader :config_file_path, :root_path, :adapters, :running, :stopping, :redis, :colors
+
+    def run
+      trap(:INT)  { term_all && exit }
+      trap(:TERM) { term_all && exit }
+      loop do
+        check_for_work
+        sleep(interval)
+      end
+    end
+
+    def log(name, message)
+      color = colors[name]
+      $stdout.write("\e[#{color}m#{name.rjust(label_width)}:\e[0m #{message}")
+    end
+
+    def spawn(path, cmd, out)
+      Process.spawn(
+        "cd '#{root_path}/#{path}' && " + command_template % cmd,
+        pgroup: true,
+        err: out,
+        out: out
+      )
+    end
+
+    def interval
+      config['interval'] || 2
+    end
+
+    def stop_delay
+      config['stop_delay'] || 30
+    end
+
+    private
+
+    def apps
+      config['apps']
+    end
+
+    def command_template
+      config['command_template'] || '%s'
+    end
+
+    def config
+      @config ||= YAML.load_file(config_file_path)
+    end
+
+    def check_for_work
+      adapters.each(&:check_for_work)
+    end
+
+    def term_all
+      adapters.each(&:really_stop)
+    end
+
+    def label_width
+      @label_width ||= apps.keys.map(&:size).max
+    end
+
+    def assign_colors
+      color_values = COLORS.values
+      apps.keys.each_with_object({}) do |app, hash|
+        hash[app] = color_values.shift
+      end
+    end
+
+    def build_adapters
+      apps.flat_map do |app, config|
+        config.map do |type, worker_config|
+          build_adapter(app, config, type, worker_config)
+        end
+      end.compact
+    end
+
+    def build_adapter(app, config, type, worker_config)
+      adapter = Adapters.from_type(type)
+      return if adapter.nil?
+      adapter.new(
+        config: worker_config.merge('name' => app, 'path' => config['path']),
+        redis: redis,
+        runner: self
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honcho
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Tim Morgn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sidekiq- and Resque-aware process manager (alternative to Foreman)
 email:
 - tim@timmorgan.org
@@ -38,6 +52,7 @@ files:
 - lib/honcho/adapters/base.rb
 - lib/honcho/adapters/resque.rb
 - lib/honcho/adapters/sidekiq.rb
+- lib/honcho/runner.rb
 homepage: https://github.com/seven1m/honcho
 licenses:
 - MIT