deadly_serious 2.0.0.pre.rc3 → 2.0.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18986d733595a3d6609eeaf7b1ebf54c3070124c
-  data.tar.gz: ef0aca05e8e5b1d8e22716ed1b37080c0dac378c
+  metadata.gz: 79958414a4debbba95a15706cede69f4dfce039f
+  data.tar.gz: db4c929449d7ac7b6ae0bf031d22f1fa93155e00
 SHA512:
-  metadata.gz: 1466eac2586c52dcf92733b42706f827487263a108ebc4c29ac8c5f57dc192d70808b6a610888997911d931bebc73ef1981da5971c560260625335aee27284a1
-  data.tar.gz: 096af17e0aec68f257a57052ff5065700365c2bf0b50d7af7d765b517ac481e85fb1c6a5253317b875ca3f0041d3c379fcc60b2875851475029288803c0ad212
+  metadata.gz: 325a5926e3633b2b7a6de58daa669d8c27fad79bb76e547ebcf86bd19f8974a2b8d77f96cbcdd628782bb5305d1b7c4feb15272345912d058959740e8bd103dc
+  data.tar.gz: e9f77696f7feb5f5e088fa6dca2ccddeeba51b99a27cf91deb76280d39dd4386fb3a07ef90951593bbe0a7aed295a4e159e4c9bcfe01fef1d6b50ee71e85653c

data/lib/deadly_serious/engine/channel/socket/socket_vent_recvr.rb

@@ -19,8 +19,8 @@ module DeadlySerious
         return enum_for(:each) unless block_given?
         @minion.send('') # I'm ready!
         while (msg = @minion.recv) != END_MSG
-          yield msg
           @minion.send('') # More msg, pls!
+          yield msg
         end
       end
 

data/lib/deadly_serious/engine/commands.rb

@@ -39,7 +39,7 @@ module DeadlySerious
       # This is useful after a {#spawn_tee}, sometimes.
       def from_pipe(pipe_name, writer: next_pipe)
         pipe = pipe_name.sub(/^>?/, '')
-        spawn_command('cat', readers: [pipe], writers: [writer])
+        spawn_command('cat ((<))', readers: [pipe], writers: [writer])
       end
 
       # Write the output of the last component to
@@ -59,6 +59,7 @@ module DeadlySerious
       end
 
       # Spawn a class connected to the last and next components
+      # @deprecated use #spawn
       def spawn_class(a_class, *args, reader: last_pipe, writer: next_pipe)
         spawn_process(a_class, *args, readers: [reader], writers: [writer])
       end
@@ -66,7 +67,7 @@ module DeadlySerious
       # Spawn {number_of_processes} classes, one process for each of them.
       # Also, it divides the previous pipe in {number_of_processes} pipes,
       # an routes data through them.
-      # @deprecated
+      # @deprecated use #parallel
       def spawn_class_parallel(number_of_processes, class_name, *args, reader: last_pipe, writer: next_pipe)
         connect_a = (1..number_of_processes).map { |i| sprintf('%s.%da.splitter', class_name.to_s.downcase.gsub(/\W+/, '_'), i) }
         connect_b = (1..number_of_processes).map { |i| sprintf('%s.%db.splitter', class_name.to_s.downcase.gsub(/\W+/, '_'), i) }
@@ -78,7 +79,7 @@ module DeadlySerious
       end
 
       def spawn_lambda(name: 'Lambda',reader: last_pipe, writer: next_pipe, &block)
-        spawn_process(DeadlySerious::Processes::Lambda, block, process_name: name, readers: [reader], writers: [writer])
+        spawn(DeadlySerious::Processes::Lambda.new(block, name: name), reader: reader, writer: writer)
       end
 
       # Pipe from the last component to a intermediate
@@ -129,8 +130,8 @@ module DeadlySerious
         output = format('>}localhost:%d', @port)
         @port += 1
 
-        spawn(Processes::Converter.new, reader: reader, writer: ventilator)
-        spawn(Processes::Converter.new, reader: sink, writer: writer)
+        spawn_process(Processes::Identity.new, process_name: 'Ventilator', readers: [reader], writers: [ventilator])
+        spawn_process(Processes::Identity.new, process_name: 'Sink', readers: [sink], writers: [writer])
         on_subnet do
           number_of_lanes.times { yield input, output }
         end

data/lib/deadly_serious/processes/{converter.rb → identity.rb}

@@ -1,6 +1,6 @@
 module DeadlySerious
   module Processes
-    class Converter
+    class Identity
       def run(readers: [], writers: [])
         reader = readers.first
         reader.each do |line|

data/lib/deadly_serious/processes/lambda.rb

@@ -1,8 +1,15 @@
 module DeadlySerious
   module Processes
     class Lambda
-      def run(block, readers:, writers:)
-        params = block.parameters
+      attr_reader :name
+
+      def initialize(block, name: 'Lambda')
+        @name = name
+        @block = block
+      end
+
+      def run(readers:, writers:)
+        params = @block.parameters
         writer_param = params.any? { |(k, n)| k == :keyreq && n == :writer }
         reader_param = params.any? { |(k, n)| k == :keyreq && n == :reader }
 
@@ -13,18 +20,18 @@ module DeadlySerious
           unless reader
             fail %(Missing "#{readers.first.filename}", did you provide a reader to lambda?)
           end
-          block.call(reader: reader, writer: writer)
+          @block.call(reader: reader, writer: writer)
         elsif writer_param && reader
           reader.each do |data|
-            block.call(*data, writer: writer)
+            @block.call(*data, writer: writer)
           end
         elsif writer_param && !reader
-          block.call(writer: writer)
+          @block.call(writer: writer)
         elsif reader
           # This is a little "too smarty" for my taste,
           # however, it's awesomely useful. =\
           reader.each do |data|
-            result = block.call(*data)
+            result = @block.call(*data)
 
             # noinspection RubySimplifyBooleanInspection
             if result == true # really TRUE, not thruthy
@@ -39,7 +46,7 @@ module DeadlySerious
             end
           end
         else
-          block.call
+          @block.call
         end
       end
     end

data/lib/deadly_serious/version.rb

@@ -1,3 +1,3 @@
 module DeadlySerious
-  VERSION = '2.0.0-rc3'
+  VERSION = '2.0.0-rc4'
 end

data/spec/lib/deadly_serious/engine/channel/socket_channel_spec.rb

@@ -142,16 +142,23 @@ describe SocketChannel do
     end
 
     it 'does load balancing' do
-      send_msg(1, 2, 3)
+      send_msg(1, 2, 3, 4, 5)
       channel1 = Channel.new("#{rcv}localhost:5555", nil)
       channel2 = Channel.new("#{rcv}localhost:5555", nil)
 
       c1 = channel1.each
       c2 = channel2.each
 
+      # Load balancing is tuned to fast round trip.
+      # That means as soon I get a line, before I
+      #   starting process it, I ask for another one.
+      # This optimizes ZMQ, but the message order is
+      #   a bit strange, as you can check below:
       expect(c1.next).to eq '1'
-      expect(c2.next).to eq '2'
-      expect(c1.next).to eq '3'
+      expect(c2.next).to eq '3'
+      expect(c1.next).to eq '2'
+      expect(c2.next).to eq '4'
+      expect(c1.next).to eq '5'
 
       channel1.close
       channel2.close

data/spec/lib/deadly_serious/engine/pipeline_spec.rb

@@ -137,11 +137,11 @@ describe Pipeline do
     create_file(test_file, (1..10_000).map { |i| [i] })
     pipeline = Pipeline.new do |p|
       p.from_file(test_file)
-      p.spawn_process(Converter.new, writers: ['>{localhost:5555'])
+      p.spawn_process(Identity.new, writers: ['>{localhost:5555'])
       p.spawn_process(TestComponentMultiplier.new(10), readers: ['<{localhost:5555'], writers: ['>}localhost:5556'])
       p.spawn_process(TestComponentMultiplier.new(100), readers: ['<{localhost:5555'], writers: ['>}localhost:5556'])
       p.spawn_process(TestComponentMultiplier.new(1000), readers: ['<{localhost:5555'], writers: ['>}localhost:5556'])
-      p.spawn_process(Converter.new, readers: ['<}localhost:5556'])
+      p.spawn_process(Identity.new, readers: ['<}localhost:5556'])
       p.to_file(result_file)
     end
     pipeline.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadly_serious
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc3
+  version: 2.0.0.pre.rc4
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,10 +155,8 @@ files:
 - lib/deadly_serious/engine/pipeline.rb
 - lib/deadly_serious/engine/ruby_object_container.rb
 - lib/deadly_serious/engine/so_command_container.rb
-- lib/deadly_serious/processes/converter.rb
+- lib/deadly_serious/processes/identity.rb
 - lib/deadly_serious/processes/lambda.rb
-- lib/deadly_serious/processes/resilient_splitter.rb
-- lib/deadly_serious/processes/splitter.rb
 - lib/deadly_serious/version.rb
 - spec/lib/deadly_serious/engine/auto_pipe_spec.rb
 - spec/lib/deadly_serious/engine/channel/socket_channel_spec.rb

data/lib/deadly_serious/processes/resilient_splitter.rb

@@ -1,34 +0,0 @@
-module DeadlySerious
-  module Processes
-    class ResilientSplitter
-      def initialize
-        @reallocate = false
-        Signal.trap('USR1') do
-          @reallocate = true
-        end
-      end
-
-      def run(readers: [], writers: [])
-        reader = readers.first
-        outputs = writers.dup
-        current = nil
-        reader.each do |line|
-          begin
-            if @reallocate
-              @reallocate = false
-              outputs = writers.dup
-            end
-            current = outputs.first
-            current << line << "\n"
-            outputs.rotate!
-          rescue Errno::EPIPE => e
-            puts e.inspect
-            outputs.delete(current)
-            raise e if outputs.empty?
-            redo
-          end
-        end
-      end
-    end
-  end
-end

data/lib/deadly_serious/processes/splitter.rb

@@ -1,26 +0,0 @@
-module DeadlySerious
-  module Processes
-    class Splitter
-      def initialize
-        Signal.trap('USR1') { @outputs = @writers.dup }
-      end
-      def run(readers: [], writers: [])
-        @writers ||= writers
-        reader = readers.first
-        @outputs = @writers.dup
-        begin
-          reader.each do |line|
-            @current = @outputs.first
-            @current << line
-            @outputs.rotate!
-          end
-        rescue => e
-          puts e.inspect
-          @outputs.delete(@current)
-          raise e if @outputs.empty?
-          retry
-        end
-      end
-    end
-  end
-end