utils 0.0.96 → 0.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 266c90fe7703c6489e6d66096965c92b59f80e1c
-  data.tar.gz: 51d36018ce055b1887c081ae93f401c826f6d79f
+  metadata.gz: ba3f1c86f80cdeb4bd56a41096e45b8b09223e04
+  data.tar.gz: a08b42e891d46dcac8bed897f9d117651cef2c9b
 SHA512:
-  metadata.gz: 77964738b8e9413f48ad1b73cef2709e789539fa9ee4227953cbcebfbce40cde887319b7ccf06653828093e5994c04516c624cfe383804fc223cfc86ee3a8f43
-  data.tar.gz: b567bc1621be74d10258a5e3f1a6040b0a1fb719ddfba11d14ae94fe000e14f46bfacff07d01576ec5b59137616a4808e24b285270b5bb2fa027daf8b4c1cf1e
+  metadata.gz: 269d1c179beac61cda05b4e569086ac540beaa554a6b44b00566b53e289bb6a929e59d014400e14d7a68e94275fceb49ac4bee862a70f54da1d082bf650826da
+  data.tar.gz: eb07239565819ec09e9de3bb56f711e717e7a139dde3667f824ba52046c57ed72fd9c1b0d781619c300e85ae385640dfb4ed70654715a47c5255822b4cd7787a

data/VERSION

@@ -1 +1 @@
-0.0.96
+0.0.97

data/bin/probe

@@ -71,6 +71,7 @@ def start_server
 end
 
 def connect_server
+  Utils::ProbeServer::Job.colorize = true
   puts "Connecting probe server on #{$uri.inspect}."
   DRb.start_service
   probe_server = DRbObject.new_with_uri($uri)

data/lib/utils/probe_server.rb

@@ -7,6 +7,16 @@ end
 module Utils
   class ProbeServer
     class Job
+
+      class << self
+        attr_writer :colorize
+
+        def colorize?
+          !!@colorize
+        end
+      end
+      self.colorize = false
+
       def initialize(probe_server, args)
         @id           = probe_server.next_job_id
         @args         = args
@@ -16,46 +26,91 @@ module Utils
 
       attr_reader :args
 
+      attr_writer :ok
+
+      def ok
+        case @ok
+        when false then 'n'
+        when true  then 'y'
+        else            '-'
+        end
+      end
+
+      def ok_colorize(string)
+        return string unless self.class.colorize?
+        case @ok
+        when false then string.white.on_red
+        when true  then string.black.on_green
+        else            string.black.on_yellow
+        end
+      end
+
       def inspect
-        "#<#{self.class}: id=#{id} args=#{args.inspect}>"
+        ok_colorize(
+          "#<#{self.class}: id=#{id} args=#{args.inspect} ok=#{ok}>"
+        )
       end
+
+      alias to_s inspect
     end
 
     def initialize
+      @history    = [].freeze
       @jobs_queue = Queue.new
       @current_job_id = 0
       Thread.new { work_loop }
     end
 
+    annotate :doc
+
+    def docs
+      annotations = self.class.doc_annotations.sort_by(&:first)
+      max_size = annotations.map { |a| a.first.size }.max
+      annotations.map { |n, v| "#{n.to_s.ljust(max_size + 1)}#{v}" }
+    end
+
+    doc 'Return the currently running job.'
+    def job
+      queue_synchronize do
+        @job
+      end
+    end
+
     def next_job_id
       @current_job_id += 1
     end
 
-    def enqueue(job_args)
+    doc 'Enqueue a new job with the argument array <job_args>.'
+    def job_enqueue(job_args)
       job = Job.new(self, job_args)
       output_message "#{job.inspect} enqueued."
       @jobs_queue.push job
     end
-    alias run enqueue
+    alias enqueue job_enqueue
 
-    def stop
+    doc 'Stop the process that is working on the current job, if any.'
+    def job_stop
       @pid and Process.kill :STOP, @pid
     end
 
-    def continue
+    doc 'Continue the process that is working on the current job, if any.'
+    def job_continue
       @pid and Process.kill :CONT, @pid
     end
 
-    def shutdown
+    doc 'Shutdown the server.'
+    def server_shutdown
       output_message "Server was shutdown down – HARD!", :type => :warn
       exit! 23
     end
 
-    def list_jobs
-      @jobs_queue.instance_variable_get(:@que)
+    doc 'List the currently pending jobs waiting to be run.'
+    def jobs_list
+      @jobs_queue.instance_variable_get(:@que).dup
     end
 
-    def clear_jobs
+    doc 'Clear all pending jobs.'
+    def jobs_clear
       queue_synchronize do
         unless @jobs_queue.empty?
           @jobs_queue.clear
@@ -67,6 +122,32 @@ module Utils
       end
     end
 
+    doc 'Repeat the job with <job_id>, it will be assigned a new id, though.'
+    def job_repeat(job_id)
+      if old_job = @history.find { |job| job.id == job_id }
+        job_enqueue old_job.args
+        true
+      else
+        false
+      end
+    end
+
+    doc 'List the history of run jobs.'
+    def history_list
+      @history.dup
+    end
+
+    doc 'Clear the history of run jobs.'
+    def history_clear
+      @history = []
+      true
+    end
+
+    doc "The environment of the server process, use env['a'] = 'b' and env['a']."
+    def env
+      ENV
+    end
+
     private
 
     def queue_synchronize(&block)
@@ -96,18 +177,23 @@ module Utils
       Process.wait @pid
       message = "#{job.inspect} was just run"
       if $?.success?
+        job.ok = true
         message << " successfully."
         output_message message, :type => :success
       else
+        job.ok = false
         message << " and failed with exit status #{$?.exitstatus}!"
         output_message message, :type => :failure
       end
+      @history += [ @job.freeze ]
+      @history.freeze
+      @job = nil
     end
 
     def work_loop
       loop do
-        job = @jobs_queue.shift
-        run_job job
+        @job = @jobs_queue.shift
+        run_job @job
       end
     end
 

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.0.96'
+  VERSION         = '0.0.97'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.0.96 ruby lib
+# stub: utils 0.0.97 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils"
-  s.version = "0.0.96"
+  s.version = "0.0.97"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.0.96
+  version: 0.0.97
 platform: ruby
 authors:
 - Florian Frank