hydroponic_bean 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be5fc754d60f8829cbbd0ba05227eba6870223f
-  data.tar.gz: 84c0e63df7d54790e15fe9c740a916d6abd09486
+  metadata.gz: 2f4b6d8a2f04c35eb3f1633af6644cd013a72ed8
+  data.tar.gz: 30490d78a6e123d415091462c65d8eee5f663d67
 SHA512:
-  metadata.gz: 1fecd8d584eb0d85cf2e0398d5330aeff2fd418dabe8a1c218815b1d894b4d9e56748c1d716022cf61041b0f96e2b5ac4e1940e77cb16a6ccad4ca628c6723a5
-  data.tar.gz: 4a11702f8cfe3255080f2597814693a132b6dc007b1bf93951a5de28b844faf2093f777ff896f4a935af2ab3b3fc8325b17cc3968f1a54b5f77f8d6e9188ea4c
+  metadata.gz: 374d7a1c86c90bb0c4e11300910ef30cae7ce3b9b1867ea61df180a086049b9813b1628ffe25645cf72f2ecf7fe4a695bb0d16e4fcc6c1508bd38987f7523fde
+  data.tar.gz: 65fbc11688e4fd1770890e6542c9d9f8d7c5b52ba8488b918518750ca6355fa57be1d2e2771d340dd3dfa174651e74bdb76554839555e0893dcb946b135855c9

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# 1.1.0
+
+- Added support for a lot more commands, see lib/hydroponic_bean/commands/
+- Changed internal code structure
+
+# 1.0.0
+
+- Initial release
+- Support for only some very basic commands

data/lib/hydroponic_bean/commands/other.rb

@@ -1,15 +1,69 @@
 module HydroponicBean
   module Commands
     module Other
-      def peek(stream, id)
-        peek_output(HydroponicBean.jobs[id.to_i - 1])
+      def peek(stream, id = nil)
+        id = id.to_i
+        job = (id == 0) ? nil : HydroponicBean.jobs[id - 1]
+        peek_output(job)
+      end
+
+      def peek_ready(stream)
+        peek_output current_tube.ready_jobs.first
+      end
+
+      def peek_buried(stream)
+        peek_output current_tube.buried_jobs.first
+      end
+
+      def peek_delayed(stream)
+        peek_output current_tube.delayed_jobs.first
+      end
+
+      def stats_job(stream, id)
+        id = id.to_i
+        job = (id == 0) ? nil : HydroponicBean.jobs[id - 1]
+        if !job
+          output(Protocol::NOT_FOUND)
+          return false
+        end
+
+        stats = job.serialize_stats.to_yaml
+        output("OK #{stats.length}\r\n")
+        output("#{stats}\r\n")
+      end
+
+      def kick_job(stream, id)
+        id = id.to_i
+        job = (id == 0) ? nil : HydroponicBean.jobs[id - 1]
+        if !job || !job.kick
+          output(Protocol::NOT_FOUND)
+          return false
+        end
+        job.kick
+        output("KICKED\r\n")
+      end
+
+      def watch(stream, tube_name)
+        watched_tube_names << tube_name
+        watched_tube_names.uniq!
+        output("WATCHING #{watched_tube_names.count}\r\n")
+      end
+
+      def ignore(stream, tube_name)
+        watched_tube_names.delete(tube_name)
+        if watched_tube_names.empty?
+          watched_tube_names << tube_name
+          output("NOT_IGNORED\r\n")
+        else
+          output("WATCHING #{watched_tube_names.count}\r\n")
+        end
       end
 
       protected
       def peek_output(job)
         if job
-          output("FOUND #{job[:id]} #{job[:data].length}\r\n")
-          output("#{job[:data]}\r\n")
+          output("FOUND #{job.id} #{job.data.length}\r\n")
+          output("#{job.data}\r\n")
         else
           output(Protocol::NOT_FOUND)
           return false

data/lib/hydroponic_bean/commands/tube.rb

@@ -0,0 +1,57 @@
+module HydroponicBean
+  module Commands
+    module Tube
+      def delete(stream, id)
+        job = HydroponicBean.jobs[id.to_i - 1]
+        if job
+          job.delete
+          output("DELETED\r\n")
+        else
+          output(Protocol::NOT_FOUND)
+          return false
+        end
+      end
+
+      def list_tubes(stream)
+        tubes = HydroponicBean.tubes.keys.to_yaml
+        output("OK #{tubes.length}\r\n")
+        output("#{tubes}\r\n")
+      end
+
+      def list_tubes_watched(stream)
+        tubes = watched_tube_names.to_yaml
+        output("OK #{tubes.length}\r\n")
+        output("#{tubes}\r\n")
+      end
+
+      def stats_tube(stream, tube_name)
+        if HydroponicBean.tubes.has_key?(tube_name)
+          tube = HydroponicBean.tubes[tube_name]
+          data = tube.serialize_stats.to_yaml
+          output("OK #{data.length}\r\n")
+          output("#{data}\r\n")
+        else
+          output(Protocol::NOT_FOUND)
+          return false
+        end
+      end
+
+      def pause_tube(stream, tube_name, delay)
+        if HydroponicBean.tubes.has_key?(tube_name)
+          tube = HydroponicBean.tubes[tube_name]
+          tube.pause(delay)
+          output("PAUSED\r\n")
+        else
+          output(Protocol::NOT_FOUND)
+          return false
+        end
+      end
+
+      def kick(stream, bound)
+        bound = bound.to_i
+        tube = current_tube
+        output("KICKED #{tube.kick(bound)}\r\n")
+      end
+    end
+  end
+end

data/lib/hydroponic_bean/commands.rb

@@ -1,11 +1,13 @@
 require 'hydroponic_bean/commands/producer'
 require 'hydroponic_bean/commands/worker'
+require 'hydroponic_bean/commands/tube'
 require 'hydroponic_bean/commands/other'
 
 module HydroponicBean
   module Commands
     include HydroponicBean::Commands::Producer
     include HydroponicBean::Commands::Worker
+    include HydroponicBean::Commands::Tube
     include HydroponicBean::Commands::Other
   end
 end

data/lib/hydroponic_bean/data.rb

@@ -1,6 +1,9 @@
+require 'hydroponic_bean/tube'
+require 'hydroponic_bean/job'
+
 module HydroponicBean
   def self.tubes
-    @tubes ||= Hash.new{|h, k| h[k] = []}
+    @tubes ||= Hash.new{|h, k| h[k] = Tube.new(k)}
   end
 
   def self.jobs
@@ -16,25 +19,16 @@ module HydroponicBean
       HydroponicBean.tubes[current_tube_name]
     end
 
-    def next_id
-      HydroponicBean.jobs.length + 1
+    def watched_tube_names
+      @watched_tube_names ||= ['default']
     end
 
     def create_job(pri, delay, ttr, data)
-      job = {
-        id: next_id,
-        tube: current_tube_name,
-        pri: pri.to_i,
-        delay: delay.to_i,
-        ttr: ttr.to_i,
-        data: data,
-      }
-      job[:state] = (job[:delay] == 0) ? :ready : :delayed
+      job = Job.new(current_tube, pri, delay, ttr, data)
 
       HydroponicBean.jobs.push(job)
-      current_tube.push(job)
 
-      return job[:id]
+      return job.id
     end
   end
 end

data/lib/hydroponic_bean/job.rb

@@ -0,0 +1,87 @@
+module HydroponicBean
+  class Job
+    def self.next_id
+      HydroponicBean.jobs.length + 1
+    end
+
+    attr_accessor :id, :pri, :delay, :ttr, :data, :created_at,
+      :state, :tube, :stats
+
+    attr_reader :deleted
+
+    def initialize(tube, pri, delay, ttr, data)
+      @id = self.class.next_id
+      @created_at = Time.now.utc
+      @tube = tube
+      @pri = pri.to_i
+      @delay = delay.to_i
+      @ttr = ttr.to_i
+      @state = @delay > 0 ? State.delayed : State.ready
+      @data = data
+      @deleted = false
+      @stats = {
+        'reserves' => 0,
+        'timeouts' => 0,
+        'releases' => 0,
+        'buries' => 0,
+        'kicks' => 0,
+      }
+
+      @tube.push(self)
+    end
+
+    def age
+      (Time.now.utc - created_at).to_i
+    end
+
+    def tube_name
+      @tube.name
+    end
+
+    def urgent?;   exists? && pri <= 1024; end
+    def ready?;    exists? && state == State.ready; end
+    def reserved?; exists? && state == State.reserved; end
+    def delayed?;  exists? && state == State.delayed; end
+    def buried?;   exists? && state == State.buried; end
+
+    def delete
+      if @deleted == false
+        @tube.job_deleted
+        @deleted = true
+      end
+    end
+    def exists?; !deleted; end
+
+    def kick
+      if buried? || delayed?
+        stats['kicks'] += 1
+        @state = State.ready
+      end
+    end
+
+    def time_left
+      reserved? ? ttr : [delay - age, 0].max
+    end
+
+    def serialize_stats
+      {
+        'id' => id,
+        'tube' => tube.name,
+        'state' => state.to_s,
+        'pri' => pri,
+        'age' => age,
+        'delay' => delay,
+        'ttr' => ttr,
+        'time-left' => time_left,
+        'file' => 0,
+      }.merge(stats)
+    end
+
+    module State
+      def self.ready;     :ready;    end
+      def self.reserved;  :reserved; end
+      def self.delayed;   :delayed;  end
+      def self.buried;    :buried;   end
+    end
+  end
+end

data/lib/hydroponic_bean/tube.rb

@@ -0,0 +1,73 @@
+module HydroponicBean
+  class Tube
+    attr_reader :name, :jobs, :stats
+
+    def initialize(name)
+      @name = name
+      @jobs = []
+      @stats = {
+        'cmd-delete' => 0,
+        'cmd-pause-tube' => 0,
+        'pause' => 0,
+        'pause-time-left' => 0,
+      }
+    end
+
+    def push(job)
+      @jobs.push(job)
+      self
+    end
+
+    def current_jobs_urgent;    jobs.select(&:urgent?).count; end
+    def current_jobs_ready;     jobs.select(&:ready?).count; end
+    def current_jobs_reserved;  jobs.select(&:reserved?).count; end
+    def current_jobs_delayed;   jobs.select(&:delayed?).count; end
+    def current_jobs_buried;    jobs.select(&:buried?).count; end
+
+    def serialize_stats
+      {
+        'name' => name,
+        'current-jobs-urgent'   => current_jobs_urgent,
+        'current-jobs-ready'    => current_jobs_ready,
+        'current-jobs-reserved' => current_jobs_reserved,
+        'current-jobs-delayed'  => current_jobs_delayed,
+        'current-jobs-buried'   => current_jobs_buried,
+        'total-jobs' => jobs.count,
+        'current-using' => 0,
+        'current-waiting' => 0,
+        'current-watching' => 0,
+      }.merge(stats)
+    end
+
+    def pause(delay)
+      delay = delay.to_i
+      stats['pause'] = delay
+      stats['pause-time-left'] = delay
+      stats['cmd-pause-tube'] += 1
+    end
+
+    def ready_jobs;   jobs.select(&:ready?);    end
+    def buried_jobs;  jobs.select(&:buried?);   end
+    def delayed_jobs; jobs.select(&:delayed?).sort_by(&:delay);  end
+
+    def kick(bound)
+      initial_bound = bound
+      while bound > 0
+        if buried_jobs.count > 0
+          buried_jobs.first.kick
+          bound -= 1
+        elsif delayed_jobs.count > 0
+          delayed_jobs.first.kick
+          bound -= 1
+        else
+          return initial_bound - bound
+        end
+      end
+      return initial_bound
+    end
+
+    def job_deleted
+      stats['cmd-delete'] += 1
+    end
+  end
+end

data/lib/hydroponic_bean/version.rb

@@ -1,3 +1,3 @@
 module HydroponicBean
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydroponic_bean
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Geoffroy Planquart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -87,11 +88,14 @@ files:
 - lib/hydroponic_bean/commands.rb
 - lib/hydroponic_bean/commands/other.rb
 - lib/hydroponic_bean/commands/producer.rb
+- lib/hydroponic_bean/commands/tube.rb
 - lib/hydroponic_bean/commands/worker.rb
 - lib/hydroponic_bean/connection.rb
 - lib/hydroponic_bean/data.rb
+- lib/hydroponic_bean/job.rb
 - lib/hydroponic_bean/protocol.rb
 - lib/hydroponic_bean/test_helper.rb
+- lib/hydroponic_bean/tube.rb
 - lib/hydroponic_bean/version.rb
 homepage: https://github.com/Aethelflaed/hydroponic_bean
 licenses: