RubyGems - pipeline_toolkit - Versions diffs - 1.1.0 → 1.2.0 - Mend

pipeline_toolkit 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

data/LICENSE.markdown +1 -1
data/README.markdown +38 -19
data/bin/msg_generator +3 -4
data/bin/msg_push +3 -4
data/bin/msg_sink +3 -7
data/bin/msg_subscribe +3 -4
data/lib/pipeline_toolkit.rb +5 -5
data/lib/pipeline_toolkit/amqp/abstract.rb +81 -78
data/lib/pipeline_toolkit/amqp/reader.rb +55 -52
data/lib/pipeline_toolkit/amqp/writer.rb +42 -39
data/lib/pipeline_toolkit/{commands/msg_generator/cli.rb → cli/msg_generator_cli.rb} +6 -5
data/lib/pipeline_toolkit/{commands/msg_push/cli.rb → cli/msg_push_cli.rb} +16 -8
data/lib/pipeline_toolkit/cli/msg_sink_cli.rb +28 -0
data/lib/pipeline_toolkit/{commands/msg_subscribe/cli.rb → cli/msg_subscribe_cli.rb} +23 -14
data/lib/pipeline_toolkit/cucumber.rb +5 -3
data/lib/pipeline_toolkit/cucumber/amqp.rb +1 -1
data/lib/pipeline_toolkit/cucumber/in_out_process.rb +50 -0
data/lib/pipeline_toolkit/cucumber/machine.rb +44 -26
data/lib/pipeline_toolkit/cucumber/machine_steps.rb +15 -9
data/lib/pipeline_toolkit/cucumber/{msg_sub_machine.rb → msg_sub_process.rb} +5 -5
data/lib/pipeline_toolkit/handlers/message_handler.rb +43 -39
data/lib/pipeline_toolkit/message_coder.rb +38 -25
data/lib/pipeline_toolkit/message_command.rb +167 -157
data/lib/pipeline_toolkit/message_generator.rb +22 -18
data/lib/pipeline_toolkit/message_pusher.rb +46 -47
data/lib/pipeline_toolkit/message_sink.rb +9 -5
data/lib/pipeline_toolkit/message_subscriber.rb +190 -183
data/lib/pipeline_toolkit/monitoring/monitor_server.rb +64 -109
data/lib/pipeline_toolkit/util/hash_ext.rb +8 -0
data/lib/pipeline_toolkit/util/indifferent_hash.rb +10 -0
data/lib/pipeline_toolkit/{socket_util.rb → util/socket_util.rb} +1 -1
metadata +25 -115
data/lib/pipeline_toolkit/commands/msg_sink/cli.rb +0 -41
data/lib/pipeline_toolkit/open_hash.rb +0 -24

data/lib/pipeline_toolkit/monitoring/monitor_server.rb CHANGED Viewed

@@ -2,123 +2,78 @@
 require 'erb'
 require 'evma_httpserver'
-module Monitoring # :nodoc:
+module PipelineToolkit
+  module Monitoring # :nodoc:
-  ##
-  # The http server to monitor the pipeline and report the results.
-  #
-  class MonitorServer < EM::Connection
-    include EM::HttpServer
     ##
-    # Initialize a new intance
+    # The http server to monitor the pipeline and report the results.
     #
-    # @param message_subscriber<MessageSubscriber> The message subscriber
-    #
-    def initialize(message_subscriber, options = {})
-      DefaultLogger.init_logger(options)
-      @message_subscriber = message_subscriber
-      # @template = File.open("../lib/pipeline_toolkit/monitoring/index.rhtml","r:utf-8")
-    end
-    def post_init
-      super
-      no_environment_strings
-    end
-    def process_http_request
-      response = EM::DelegatedHttpResponse.new(self)
-      response.status = 200
-      response.content_type 'text/html'
-      # if ((@http_content_type =~ content_type_regex) == 0)
+    class MonitorServer < EM::Connection
+      include EM::HttpServer
+      ##
+      # Initialize a new intance
+      #
+      # @param message_subscriber<MessageSubscriber> The message subscriber
       #
-      # end
-      response.content = html_template
+      def initialize(message_subscriber, options = {})
+        DefaultLogger.init_logger(options)
+        @options = options
+        @message_subscriber = message_subscriber
+        @html_template = ERB.new(File.read(File.dirname(__FILE__) + "/monitor.erb"))
+      end
-      response.send_response
-    end
+      def post_init
+        super
+        no_environment_strings
+      end
+      def process_http_request
+        response = EM::DelegatedHttpResponse.new(self)
+        response.status = 200
+        case @http_path_info
+        when /.json$/
+          process_json(response)
+        else
+          process_html(response)
+        end
+        response.send_response
+      end
-    private
+      private
+      def process_json(response)
+        response.content_type 'application/json'
+        result = {
+          :pid        => @message_subscriber.process_id,
+          :host       => @message_subscriber.hostname,
+          :structure  => @message_subscriber.structure,
+          :throughput => @message_subscriber.mps,
+          :uptime     => @message_subscriber.uptime
+        }
+        response.content = result.to_json
+      end
+      def process_html(response)
+        response.content_type 'text/html'
+        response.content = @html_template.result(@message_subscriber.get_binding)
+      end
+      ##
+      # Build a regex to check the content_type request header
+      #
+      def content_type_regex
+        case options[:content_type]
+          when "json"
+            @content_type_regex = /^(text|application)\/json/
+          else
+            @content_type_regex = /^(text|application)\/html/
+        end
+      end
-    def html_template
-      <<-EOL
-      <!DOCTYPE HTML>
-      <html lang="en-NZ">
-        <head>
-        	<title>Message Probe</title>
-        	<meta charset="UTF-8">
-        	<style type="text/css">
-            body {
-              background: black;
-              color: #80c0c0;
-            }
-            h1 {
-              font: 12pt Monospace;
-              text-align:center;
-            }
-            table {
-              font: 10pt Monospace;
-              margin-left:auto;
-              margin-right:auto;
-              text-align:right;
-            }
-            .page {
-              position:relative;
-              top: 20%;
-              # border-style:solid;
-              # border-width:5px;
-              width: 400px;
-              margin-left:auto;
-              margin-right:auto;
-            }
-          </style>
-        </head>
-        <body>
-        	<div class=page>
-            <h1>
-              <span class="name">#{@message_subscriber.name}</span>
-            </h1>
-            <table>
-              <tr>
-                <td>Structure:</td>
-                <td>
-                  <span class="queue_in">#{@message_subscriber.queue_name}</span> -> <span class="queues_out">#{@message_subscriber.queues_out}</span>
-                </td>
-              </tr>
-              <tr>
-                <td>Throughput:</td>
-                <td>
-                  <span class="mps">#{@message_subscriber.mps.to_i}</span>
-                </td>
-              </tr>
-              <tr>
-                <td>Uptime:</td>
-                <td>
-                  <span class="uptime">#{(Time.now - @message_subscriber.start_time).to_i / 60}mins</span>
-                </td>
-              </tr>
-          </table>
-          </div>
-        </body>
-      </html>
-      EOL
     end
-    ##
-    # Build a regex to check the content_type request header
-    #
-    def content_type_regex
-      case options[:content_type]
-        when "json"
-          @content_type_regex = /^(text|application)\/json/
-        when "xml"
-          @content_type_regex = /^(text|application)\/xml/
-        else
-          @content_type_regex = /^(text|application)\/html/
-      end
-    end
   end
 end

data/lib/pipeline_toolkit/util/hash_ext.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class Hash
+  def select_keys(*keys)
+    h = {}
+    self.each do |key, value|
+      h[key] = value if keys.include?(key)
+    end
+  end
+end

data/lib/pipeline_toolkit/util/indifferent_hash.rb ADDED Viewed

@@ -0,0 +1,10 @@
+class IndifferentHash < Hash
+  # extended so that value is returned regardless if key is symbol or string
+  def initialize(hash)
+    self.merge!(hash)
+  end
+  def [](key)
+    super(key.to_s) || super(key.to_sym)
+  end
+end

data/lib/pipeline_toolkit/{socket_util.rb → util/socket_util.rb} RENAMED Viewed

@@ -3,7 +3,7 @@
 class Socket
   def self.select_random_port(low, high, host = "localhost")
-    raise Exception.new("'low' must be lower than 'high'") unless low < high
+    raise "'low' must be lower than 'high'" unless low < high
     port = nil
     begin
       port = low + rand(high - low)

metadata CHANGED Viewed

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Aisha Fenton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-08-20 00:00:00 +12:00
+date: 2010-08-23 00:00:00 +12:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -23,7 +23,7 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 0
@@ -37,12 +37,12 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 1
-        - 15
-        version: "1.15"
+        - 16
+        version: "1.16"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency
@@ -50,7 +50,7 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 0
@@ -64,7 +64,7 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 0
@@ -78,7 +78,7 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement
     requirements:
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 1
@@ -92,7 +92,7 @@ dependencies:
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 0
@@ -102,111 +102,19 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cucumber
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 0
-        - 0
-        - beta
-        - 2
-        version: 2.0.0.beta.2
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 0
-        - 0
-        - beta
-        - 2
-        version: 2.0.0.beta.2
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 0
-        - 0
-        - beta
-        - 2
-        version: 2.0.0.beta.2
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 0
-        - 0
-        - beta
-        - 2
-        version: 2.0.0.beta.2
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency
-  name: yard
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         segments:
         - 0
+        - 8
         - 5
-        - 3
-        version: 0.5.3
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency
-  name: aruba
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 1
-        - 7
-        version: 0.1.7
+        version: 0.8.5
   type: :development
-  version_requirements: *id013
+  version_requirements: *id007
 description: |-
   Command line tools for processing messages by constructing a pipeline of workers.
                            AMQP and Unix pipes are used to construct the pipeline. Messages are simple Hashes
@@ -227,16 +135,17 @@ files:
 - lib/pipeline_toolkit/amqp/abstract.rb
 - lib/pipeline_toolkit/amqp/reader.rb
 - lib/pipeline_toolkit/amqp/writer.rb
-- lib/pipeline_toolkit/commands/msg_generator/cli.rb
-- lib/pipeline_toolkit/commands/msg_push/cli.rb
-- lib/pipeline_toolkit/commands/msg_sink/cli.rb
-- lib/pipeline_toolkit/commands/msg_subscribe/cli.rb
+- lib/pipeline_toolkit/cli/msg_generator_cli.rb
+- lib/pipeline_toolkit/cli/msg_push_cli.rb
+- lib/pipeline_toolkit/cli/msg_sink_cli.rb
+- lib/pipeline_toolkit/cli/msg_subscribe_cli.rb
 - lib/pipeline_toolkit/cucumber.rb
 - lib/pipeline_toolkit/cucumber/amqp.rb
 - lib/pipeline_toolkit/cucumber/amqp_steps.rb
+- lib/pipeline_toolkit/cucumber/in_out_process.rb
 - lib/pipeline_toolkit/cucumber/machine.rb
 - lib/pipeline_toolkit/cucumber/machine_steps.rb
-- lib/pipeline_toolkit/cucumber/msg_sub_machine.rb
+- lib/pipeline_toolkit/cucumber/msg_sub_process.rb
 - lib/pipeline_toolkit/default_logger.rb
 - lib/pipeline_toolkit/handlers/message_handler.rb
 - lib/pipeline_toolkit/message_coder.rb
@@ -246,8 +155,9 @@ files:
 - lib/pipeline_toolkit/message_sink.rb
 - lib/pipeline_toolkit/message_subscriber.rb
 - lib/pipeline_toolkit/monitoring/monitor_server.rb
-- lib/pipeline_toolkit/open_hash.rb
-- lib/pipeline_toolkit/socket_util.rb
+- lib/pipeline_toolkit/util/hash_ext.rb
+- lib/pipeline_toolkit/util/indifferent_hash.rb
+- lib/pipeline_toolkit/util/socket_util.rb
 - LICENSE.markdown
 - README.markdown
 has_rdoc: true

data/lib/pipeline_toolkit/commands/msg_sink/cli.rb DELETED Viewed

@@ -1,41 +0,0 @@
-require 'rubygems'
-require 'trollop'
-Signal.trap('INT') do
-  # puts "\nStopping"
-  # TODO: complete signal trap interrupt
-end
-Signal.trap('TERM') do
-  # puts "\nStopping"
-  # TODO: complete signal trap terminate
-end
-module Commands # :nodoc:
-  module MsgSink
-    class CLI
-      def self.execute(stdout, arguments=[])
-        opts = Trollop::options do
-          banner <<-EOL
-Message Sink
-------------------
-  TODO: description
-  Usage:
-  msg_sink [options]
-Examples:
-  msg_sink
-Options:
-            EOL
-          opt :env, "The environment to run (development, production)", :default => "development", :short => :e
-        end
-        MessageSink.new(opts).start
-      end
-    end
-  end
-end