pipeline_toolkit 1.2.7 → 1.2.8

data/README.markdown

@@ -96,13 +96,14 @@ Pipeline toolkit also includes pre-canned cucumber steps for you to test your ma
 
         Given I run this machine:
         When I input these messages:
+        When I input these messages with ack_ids:
         Then these messages are passed on:
         Then these messages are acknowledged:
     
         Given an amqp server running at "localhost" on port 1234
-        Given amqp queue "test" is empty
-        When I input these messages to exchange "test"
-        Then these messages are on queue "test"
+        Given amqp queue "queue-name" is empty
+        When I input these messages to exchange "queue-name"
+        Then these messages are on queue "queue-name"
 
 The steps are defined in the following files, so have a look at them to get more details 
    

data/lib/pipeline_toolkit/cli/msg_sink_cli.rb

@@ -17,6 +17,8 @@ Message Sink
   msg_sink
             EOL
 
+          opt :acknowledge, "If flag is set then messages are acknowledged", :type => :flag, :short => :a
+          opt :out, "If flag is set then messages are printed to stdout in plain-text", :type => :flag, :short => :o
           opt :env, "The environment to run (development, production)", :default => "development", :short => :e
         end
 

data/lib/pipeline_toolkit/cucumber.rb

@@ -1,7 +1,7 @@
 require 'pipeline_toolkit/cucumber/amqp'
-require 'pipeline_toolkit/cucumber/in_out_process'
+require 'pipeline_toolkit/cucumber/io_process'
+require 'pipeline_toolkit/cucumber/pipeline_io'
 require 'pipeline_toolkit/cucumber/machine'
-require 'pipeline_toolkit/cucumber/msg_sub_process'
 
 require 'pipeline_toolkit/cucumber/machine_steps'
 require 'pipeline_toolkit/cucumber/amqp_steps'

data/lib/pipeline_toolkit/cucumber/{in_out_process.rb → io_process.rb}

@@ -5,7 +5,7 @@ module PipelineToolkit
     
     # Provides an interface for running and interacting with a stdin/stdout process which 
     # talks messages. 
-    class InOutProcess
+    class IOProcess
       
       def run(command)
         @process = BackgroundProcess.run("ruby -rubygems bin/#{command}")
@@ -23,13 +23,13 @@ module PipelineToolkit
         @process.pid
       end
 
-      def get_messages(number, timeout = 5)
-        output_msgs = []
+      # Gets the raw output of the process 
+      def get_output(number, timeout = 5)
+        lines = []
         get_lines(@process.stdout, number, timeout) do |line|
-          msg = MessageCoder.decode(line)
-          output_msgs << msg
+          lines << line
         end
-        output_msgs
+        lines
       end
 
     private

data/lib/pipeline_toolkit/cucumber/machine.rb

@@ -5,29 +5,22 @@ module PipelineToolkit
   module Cucumber
     
     # Provides an interface for running and interacting with a pipeline_toolkit machine. 
-    class Machine < InOutProcess
+    class Machine < IOProcess
+      include PipelineIO
       
       attr_reader :use_acknowledgements
 
       def run(command, use_acknowledgements = true)
         super(command)
-        
+
         @use_acknowledgements = use_acknowledgements
-        setup_system
+        setup_system        
       end
 
       def kill
         destroy_sys_pipe
         super
       end
-
-      def input_messages(messages)
-        messages.each do |message|
-          store_acknowledgement(message) if use_acknowledgements
-          @process.stdin.puts(MessageCoder.encode(message))
-          @process.stdin.flush
-        end
-      end
             
       def get_acknowledged_messages(number, timeout = 5)
         output_msgs = []
@@ -50,6 +43,10 @@ module PipelineToolkit
         # send sys_message
         input_messages([message])
 
+        # first message should be system one
+        @sys_setup = get_messages(1).first
+        raise "Expecting first message to be system message, got instead: #{@sys_setup.inspect}" if @sys_setup[:msg_type] != "system"
+
         # get pipe_desc off sys_pipe
         get_lines(@sys_pipe, 1, 5)
       end
@@ -64,9 +61,9 @@ module PipelineToolkit
         @sys_pipe = File.new(name, "r+")
       end
 
-      def store_acknowledgement(message)
+      def simulate_ack_id(message)
+        super(message)
         @messages_to_ack ||= {}
-        message[:ack_id] = "#{Time.now.to_i}_#{rand(9999)}"
         @messages_to_ack[message[:ack_id]] = message
       end    
        

data/lib/pipeline_toolkit/cucumber/machine_steps.rb

@@ -9,8 +9,8 @@ After do
   @process.kill unless @process.nil?
 end
 
-When /^I input these messages:$/ do |messages|
-  @process.input_messages(messages.hashes)
+When /^I input these messages with(out)? ack_ids?:$/ do |without_acks_ids, messages|
+  @process.input_messages(messages.hashes, !without_acks_ids)
 end
 
 Then /^these messages are passed on:$/ do |expected_msgs|

data/lib/pipeline_toolkit/cucumber/pipeline_io.rb

@@ -0,0 +1,37 @@
+require 'pipeline_toolkit'
+require 'background_process'
+
+module PipelineToolkit
+  module Cucumber
+    
+    # Provides IO methods for reading and writting pipeline messages to an IOProcess. NB: It is assumed that the module
+    # is being included in a IOProcess or subclass of.
+    module PipelineIO
+      
+      # Gets output from process, and decodes it into a pipeline message 
+      def get_messages(number, timeout = 5)
+        output_msgs = []
+        get_lines(@process.stdout, number, timeout) do |line|
+          msg = MessageCoder.decode(line)
+          output_msgs << msg
+        end
+        output_msgs
+      end
+
+      def input_messages(messages, simulate_acks = false)
+        messages.each do |message|
+          simulate_ack_id(message) if simulate_acks
+          @process.stdin.puts(MessageCoder.encode(message))
+          @process.stdin.flush
+        end
+      end
+
+    private
+    
+      def simulate_ack_id(message)
+        message[:ack_id] = "#{Time.now.to_i}_#{rand(9999)}"
+      end    
+       
+    end
+  end
+end

data/lib/pipeline_toolkit/message_pusher.rb

@@ -49,7 +49,7 @@ module PipelineToolkit
     def process_standard(message)
       DefaultLogger.debug("MessagePusher#process_standard(message)") if options[:env] == "development"
       publish(message)
-      acknowledge(message) if options[:ack]
+      acknowledge(message) if options[:ack] && message[:ack_id]
     end
 
   end

data/lib/pipeline_toolkit/message_sink.rb

@@ -2,9 +2,13 @@ module PipelineToolkit
 
   class MessageSink
     include MessageCommand
-  
+    
     def process_standard(message)
-      acknowledge(message)
+      if @options[:out] 
+        $stdout.puts(message.inspect) 
+        $stdout.flush
+      end
+      acknowledge(message) if @options[:acknowledge]
     end
     
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 7
-  version: 1.2.7
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Aisha Fenton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 +12:00
+date: 2010-08-29 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,10 +169,10 @@ files:
 - 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/io_process.rb
 - lib/pipeline_toolkit/cucumber/machine.rb
 - lib/pipeline_toolkit/cucumber/machine_steps.rb
-- lib/pipeline_toolkit/cucumber/msg_sub_process.rb
+- lib/pipeline_toolkit/cucumber/pipeline_io.rb
 - lib/pipeline_toolkit/default_logger.rb
 - lib/pipeline_toolkit/handlers/message_handler.rb
 - lib/pipeline_toolkit/message_coder.rb

data/lib/pipeline_toolkit/cucumber/msg_sub_process.rb

@@ -1,34 +0,0 @@
-
-module PipelineToolkit 
-  module Cucumber
-    
-    # Provides an interface for running and interacting with a msg_subscribe process. 
-    class MsgSubProcess < InOutProcess
-      
-      def run(command)
-        super(command)
-        self.setup_pipe
-      end
-      
-      def setup_pipe
-        # first message should be system one
-        msg = get_messages(1).first
-        raise "Expecting first message to be system message, got instead: #{msg.inspect}" if msg[:msg_type] != "system"
-        @system_setup = msg
-        @ack_pipe = File.open(msg[:sys_pipe], "w")
-      end
-      
-      def acknowledge_message(message)
-        ack_message = {:msg_type => "ack", :ack_id => message[:ack_id]}
-        @ack_pipe.syswrite(MessageCoder.encode(ack_message) << "\n")
-      end
-      
-      def kill
-        @ack_pipe.close
-        super
-      end
-      
-    end
-
-  end
-end