kryten 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90431dc32ceeee94a2291b79484345f99b5f114
-  data.tar.gz: 27220e16a89720ee2798aef49e3ff9644a6adfcd
+  metadata.gz: c9f5b08989dcf2d7dbe11eda53457a0fccef4cc5
+  data.tar.gz: 8ea02ee22eb5de93bb27154c96b29486735ca2d4
 SHA512:
-  metadata.gz: 2cb25f8cc35ec56af461631a49c8def24443ba05d5244fe2700fb7ab56950155bd0f263fb8dcb0206041e1e6777e083929ed679e72a18c5fc03e20134bdfc7f3
-  data.tar.gz: 814260091434791219ee52d6589bf3e1d05a251998ad2e0a39a94f67e5e14a3ac2b5d617fce3d14d7c691da363df1a782d9503db673a98a4952439d091a616da
+  metadata.gz: b92828d495df7fe6e490c90ab96eeadc8f97f50215413ff159965e0f1b6b6256c9623cb1e4439110d888e83fb79195942f0795a8932b1b54b6feec6cbbfde099
+  data.tar.gz: 4f8316267b0dcd2671f6d0b21dc4b00a4ef94eb5127a268027cf5174dbe02fa237ea2c30d0c74a0afc66ec47c63594607cb306c22013d0d9aa17b1f778f50ce2

data/README.md

@@ -23,11 +23,12 @@ Or install it yourself as:
 ```ruby
 
   require 'kryten'
+  include Kryten
 
   # define work to be done in a class with a run method
 
   class Work
-    include Kryten
+    include ThreadedTask
 
     def run
       log "working..."
@@ -35,25 +36,19 @@ Or install it yourself as:
 
   end
 
-  # The worker can run on it's own
+  # The worker can run on it's own and responds to the interrupt signal.
   Work.new.start        # loop run method in foreground
-  Work.new.init_daemon  # loop run method in a daemon process
+  Work.new.start_worker # loop run method in a thread
 
-  # One or more workers can be managed by RedDwarf
-  # Power it up by passing a block with an array of workers
-  RedDwarf.power_up { Work.new }
-
-  # power_up is non-blocking. Send the power_down message stops all workers
-  RedDwarf.power_down
+  # Two or more workers can be managed by the Supervisor
+  tasks = []
+  tasks << FirstTask.new
+  tasks << SecondTask.new
+  Supervisor.start(tasks)
 
 
 ```
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/bin/console

@@ -2,7 +2,16 @@
 
 require "bundler/setup"
 require "kryten"
-require "reddwarf"
-
 require "pry"
-Pry.start
+
+include Kryten
+
+class Work
+  include ThreadedTask
+end
+
+w1 = Work.new('work1')
+w2 = Work.new('work2')
+w3 = Work.new('work3')
+
+binding.pry

data/bin/kryten

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "kryten"
+require "pry"
+
+include Kryten
+
+class Work
+  include ThreadedTask
+end
+
+workers = []
+workers << Work.new('work1')
+workers << Work.new('work2')
+w3 = Work.new('work3').workers do
+  [Work.new('work3sub1'),
+   Work.new('work3sub2')]
+end
+workers << w3
+
+Supervisor.start(workers)
+
+sleep 10

data/kryten.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "awesome_print"
 
   spec.add_dependency "daemons", "~> 1.2.0"
   spec.add_dependency "logger"

data/lib/kryten/lawger.rb

@@ -1,14 +1,23 @@
 require 'logger'
 
 module Kryten::Lawger
+  attr_accessor :logger
 
   def log_path
-    "/tmp/#{name}.log"
+    "log/#{name}.log"
   end
 
   def log message
+    default_log_format
+    logger.debug(name) { message }
+  end
+
+  def logger
     @logger ||= Logger.new(log_path)
-    @logger.debug message
+  end
+
+  def default_log_format
+    nil
   end
 
 end

data/lib/kryten/runner.rb

@@ -1,48 +1,69 @@
 module Kryten::Runner
+  attr_accessor :timer
+  attr_reader :running, :started
+
+  def initialize title=nil
+    @name, @running, @started = title, false, false
+    log "initializing"
+    Signal.trap("INT", proc { stop_running })
+  end
 
   def start
-    log "starting #{name}"
     setup
+    log "starting"
+    @started = true
 
-    @running = true
-    Signal.trap("INT", proc { stop_running })
-    Signal.trap("TERM", proc { stop_running })
-
-    while @running do
-      sleep @timer || 4
+    while started do
+      sleep timer
+      @running = true
       run
+      @running = false
     end
 
-    log "stopped #{name}"
+    log "stopped"
+    true
   rescue => e
     log "error #{e}"
     #raise
   end
 
   def run
-    log "running #{name}"
+    log "running"
+  end
+
+  def timer
+    @timer || 4
   end
 
   def stop_running
-    # no logging here, this is a signal handler
-    @running = false
+    @started = false
   end
 
   def setup
-    log "setting up #{name}"
+    log "setting up"
   end
 
   def debug
-    log "debugging #{name}"
+    log "debugging"
     setup
     2.times do
       run
-      sleep @timer || 4
+      sleep timer
     end
   end
 
   def log message
-    puts message
+    puts [name, message].join(': ')
+  end
+
+  def name
+    @name || self.class.to_s.gsub('::','-').downcase
+  end
+
+  def status
+    log [started ? 'on and ' : 'off and ',
+         running ? 'running' : 'sleeping'].join
+    started
   end
 
 end

data/lib/kryten/summoner.rb

@@ -1,3 +1,5 @@
+# WARNING: Legacy Code
+
 require 'daemons'
 
 module Daemons
@@ -19,10 +21,6 @@ end
 
 module Kryten::Summoner
 
-  def name
-    self.class.to_s.gsub('::','_').downcase
-  end
-
   def init_daemon
     options = {
       log_output: false,
@@ -61,3 +59,119 @@ module Kryten::Summoner
   end
 
 end
+
+module Kryten::RedDwarf
+
+  def self.start
+
+    unless self.daemons.empty?
+      puts "BackgroundFactory is already running"
+      return
+    end
+
+    raise "No Block Given" unless block_given?
+
+    puts "starting all daemons"
+    @@daemons = []
+    @@daemons << yield
+    @@daemons = @@daemons.flatten
+    @@daemons.each { |d| d.init_daemon }
+
+    self.can_shutdown = true
+
+  end
+
+  def self.daemons
+    (@@daemons ||= [])
+  end
+
+  def self.daemon name
+    self.daemons.detect { |d| d.name == name }
+  end
+
+  def self.alive
+    self.daemons.select(&:pid)
+  end
+
+  def self.dead
+    self.daemons - self.alive
+  end
+
+  def self.monitor
+    self.start unless self.running?
+    self.status
+  end
+
+  def self.status
+    status = proc do |job|
+      {
+        name: job.daemon.pid.progname,
+        pid: job.daemon.pid,
+        pid_dir: job.daemon.pidfile_dir,
+        logfile: job.daemon.logfile,
+        output: job.daemon.output_logfile,
+        status: job.status,
+        object: job
+      }
+    end
+    alive = self.alive.map(&status)
+    dead = self.dead.map(&status)
+    #puts "#{alive.count} running daemons"
+    #puts "#{dead.count} dead daemons"
+    { alive: alive, dead: dead }
+  end
+
+  def self.run job
+    self.can_shutdown = false
+    daemon = self.daemon job
+    if daemon.pid
+      puts "daemon #{daemon} is still running"
+    else
+      daemon.start_daemon
+    end
+    self.can_shutdown = true
+  end
+
+  def self.halt job
+    daemon = self.daemon job
+    if daemon.pid
+      daemon.stop
+    else
+      puts "daemon #{daemon} was not running"
+    end
+  end
+
+  def self.can_shutdown= bool
+    @sd = bool
+  end
+
+  def self.can_shutdown
+    @sd
+  end
+
+  def self.stop
+
+    return unless self.can_shutdown
+
+    if self.running?
+      puts "stopping all daemons"
+      @@daemons.count.times do
+        daemon = @@daemons.pop
+        if daemon.pid
+          pid = Process.fork { daemon.stop }
+          Process.detach(pid)
+        else
+          puts "daemon #{daemon} was not running"
+        end
+      end
+    else
+      puts "BackgroundFactory has not been started yet"
+    end
+
+  end
+
+  def self.running?
+    !self.daemons.empty?
+  end
+
+end

data/lib/kryten/version.rb

@@ -1,3 +1,3 @@
 module Kryten
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/kryten/weaver.rb

@@ -0,0 +1,56 @@
+module Kryten::Weaver
+  attr_reader :worker
+  attr_accessor :workers
+
+  def start_work
+    workers.each(&:start_work) if workers
+
+    if worker && worker.alive?
+      log 'worker already running'
+      return false
+    end
+    @worker = Thread.new { start }
+  end
+
+  def stop_work
+    workers.each(&:stop_work) if workers
+    stop_running
+  end
+
+  def workers
+    if block_given?
+      @workers = Array(yield)
+      return self
+    end
+    @workers
+  end
+
+end
+
+class Kryten::Supervisor
+  def self.start(workers)
+    start_workers(workers)
+    sleep 1 while @started
+  end
+
+  def self.start_workers(workers)
+    @workers = workers
+    @started = true
+    Signal.trap("INT", proc { self.stop })
+    workers.each(&:start_work)
+  end
+
+  def self.stop
+    if @started
+      @workers.each(&:stop_work)
+      sleep 1 while self.running?
+      @started = false
+    end
+  end
+
+  def self.running?
+    @workers.detect(&:running)
+  end
+
+end
+

data/lib/kryten.rb

@@ -1,18 +1,23 @@
 require "kryten/version"
 require "kryten/summoner"
+require "kryten/weaver"
 require "kryten/lawger"
 require "kryten/runner"
 require "kryten/helper"
 require "kryten/environment"
 
-module Kryten
-  include Summoner
-  include Runner
-  include Lawger
-  include Helper
-end
-
-module Kryten::Worker
+module Kryten::Task
+  include Kryten::Runner
   include Kryten::Lawger
   include Kryten::Helper
 end
+
+module Kryten::DaemonTask
+  include Kryten::Task
+  include Kryten::Summoner
+end
+
+module Kryten::ThreadedTask
+  include Kryten::Task
+  include Kryten::Weaver
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kryten
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Zsolt Fekete
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/kryten
 - bin/setup
 - kryten.gemspec
 - lib/kryten.rb
@@ -117,7 +132,7 @@ files:
 - lib/kryten/runner.rb
 - lib/kryten/summoner.rb
 - lib/kryten/version.rb
-- lib/reddwarf.rb
+- lib/kryten/weaver.rb
 homepage: https://github.com/zsoltf/kryten
 licenses:
 - MIT

data/lib/reddwarf.rb

@@ -1,115 +0,0 @@
-module RedDwarf
-
-  def self.power_up
-
-    unless self.daemons.empty?
-      puts "RedDwarf is already running"
-      return
-    end
-
-    raise "No Block Given" unless block_given?
-
-    puts "starting all daemons"
-    @@daemons = []
-    @@daemons << yield
-    @@daemons = @@daemons.flatten
-    @@daemons.each { |d| d.init_daemon }
-
-    self.can_shutdown = true
-
-  end
-
-  def self.daemons
-    (@@daemons ||= [])
-  end
-
-  def self.daemon name
-    self.daemons.detect { |d| d.name == name }
-  end
-
-  def self.alive
-    self.daemons.select(&:pid)
-  end
-
-  def self.dead
-    self.daemons - self.alive
-  end
-
-  def self.monitor
-    self.power_up unless self.running?
-    self.status
-  end
-
-  def self.status
-    status = proc do |replicant|
-      {
-        name: replicant.daemon.pid.progname,
-        pid: replicant.daemon.pid,
-        pid_dir: replicant.daemon.pidfile_dir,
-        logfile: replicant.daemon.logfile,
-        output: replicant.daemon.output_logfile,
-        status: replicant.status,
-        object: replicant
-      }
-    end
-    alive = self.alive.map(&status)
-    dead = self.dead.map(&status)
-    #puts "#{alive.count} running daemons"
-    #puts "#{dead.count} dead daemons"
-    { alive: alive, dead: dead }
-  end
-
-  def self.start replicant
-    self.can_shutdown = false
-    daemon = self.daemon replicant
-    if daemon.pid
-      puts "daemon #{daemon} is still running"
-    else
-      daemon.start_daemon
-    end
-    self.can_shutdown = true
-  end
-
-  def self.stop replicant
-    daemon = self.daemon replicant
-    if daemon.pid
-      daemon.stop
-    else
-      puts "daemon #{daemon} was not running"
-    end
-  end
-
-  def self.can_shutdown= bool
-    @sd = bool
-  end
-
-  def self.can_shutdown
-    @sd
-  end
-
-  def self.power_down
-
-    return unless self.can_shutdown
-
-    if self.running?
-      puts "stopping all daemons"
-      @@daemons.count.times do
-        daemon = @@daemons.pop
-        if daemon.pid
-          pid = Process.fork { daemon.stop }
-          Process.detach(pid)
-        else
-          puts "daemon #{daemon} was not running"
-        end
-      end
-    else
-      puts "RedDwarf has not been started yet"
-    end
-
-  end
-
-  def self.running?
-    !self.daemons.empty?
-  end
-
-end