deadly_serious 1.0.2 → 2.0.0.pre.rc1

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

@@ -0,0 +1,69 @@
+require 'spec_helper'
+include DeadlySerious::Engine
+
+describe FileMonitor do
+  let(:test_file) { '/tmp/deadly_serious_test/test_file' }
+  let(:test_file2) { '/tmp/deadly_serious_test/test_file2' }
+
+  before do
+    FileUtils.makedirs('/tmp/deadly_serious_test')
+  end
+
+  after do
+    FileUtils.rm_rf('/tmp/deadly_serious_test')
+  end
+
+  subject { FileMonitor.new(test_file) }
+
+  it 'blocks until file created' do
+    t = Thread.new { subject.wait_creation }
+
+    sleep 0.1
+    expect(t.alive?).to be_truthy
+
+    `touch #{test_file}`
+
+    sleep 0.1
+    expect(t.alive?).to be_falsey
+
+    t.join(1)
+  end
+
+  it "don't block if file already exists" do
+    `touch #{test_file}`
+    t = Thread.new { subject.wait_creation }
+
+    sleep 0.1
+    expect(t.alive?).to be_falsey
+
+    t.join(1)
+  end
+
+  it 'blocks until file change' do
+    `touch #{test_file}`
+    t = Thread.new { subject.wait_modification }
+
+    sleep 0.1
+    expect(t.alive?).to be_truthy
+
+    File.write(test_file, "test\n")
+
+    sleep 0.1
+    expect(t.alive?).to be_falsey
+
+    t.join(1)
+  end
+
+  it 'returns modified file' do
+    `touch #{test_file}`
+    `touch #{test_file2}`
+    t = Thread.new { FileMonitor.new(test_file, test_file2).wait_modification }
+
+    sleep 0.1
+    expect(t.alive?).to be_truthy
+
+    File.write(test_file2, "test\n")
+    t.join(1)
+    expect(t.value).to eq test_file2
+  end
+end

data/spec/{deadly_serious → lib/deadly_serious}/engine/pipeline_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'fileutils'
 include DeadlySerious::Engine
+include DeadlySerious::Processes
 
 describe Pipeline do
   DELAY = 0.5 # seconds
@@ -13,15 +14,23 @@ describe Pipeline do
     end
   end
 
-  class TestComponentMultiplyBy2
+  class TestComponentMultiplier
+    def initialize(multi)
+      @multi = multi
+    end
+
     def run(readers:, writers:)
       reader = JsonIo.new(readers.first)
       writer = JsonIo.new(writers.first)
 
       reader.each do |(number)|
-        writer << [number * 2]
+        writer << [number * @multi]
       end
     end
+
+    def inspect
+      format '%s[%d]', self.class.name, Process.pid
+    end
   end
 
   before do
@@ -63,37 +72,6 @@ describe Pipeline do
     expect(finish - start).to be >= DELAY
   end
 
-  it 'kills all children on SIGTERM' do
-    pending 'unpredictable'
-    start = Time.now
-
-    reader, writer = IO.pipe
-    pipeline_id = fork do
-      reader.close
-      pipeline = Pipeline.new do |p|
-        p.spawn_process(TestComponentTime, DELAY)
-        p.spawn_process(TestComponentTime, DELAY)
-        p.spawn_process(TestComponentTime, DELAY)
-        p.spawn_process(TestComponentTime, DELAY)
-        writer << p.pids
-        writer.close
-      end
-      pipeline.run
-    end
-    writer.close
-    c1, c2, c3, c4 = eval(reader.readlines.first)
-    reader.close
-    expect(c1).to be_running
-    expect(c2).to be_running
-    expect(c3).to be_running
-    expect(c4).to be_running
-    Process.kill('SIGTERM', pipeline_id)
-    Process.wait(pipeline_id)
-    finish = Time.now
-    expect { Process.wait2(pipeline_id, Process::WNOHANG) }.to raise_error Errno::ECHILD
-    expect(finish - start).to be < (DELAY / 4)
-  end
-
   it 'spawns children in parallel' do
     pipeline = Pipeline.new do |p|
       p.spawn_process(TestComponentTime, DELAY)
@@ -111,29 +89,30 @@ describe Pipeline do
   end
 
   it 'spawns linux commands' do
+    open(test_file, 'w') { |f| f.puts('line 1'); f.puts('line 2')}
     pipeline = Pipeline.new do |p|
       p.from_file(test_file)
       p.spawn_command('cat')
       p.to_file(result_file)
     end
-    expect(test_file).to_not exists
     pipeline.run
-    expect(test_file).to exists
+    expect(result_file).to exists
+    expect(File.readlines(result_file)).to eq ["line 1\n", "line 2\n"]
   end
 
   it 'connects pipes with Component Classes' do
-    create_file(test_file, [[1], [2], [3]])
+    create_file(test_file, [[1], [3], [5]])
     pipeline = Pipeline.new do |p|
       p.from_file(test_file)
-      p.spawn_process(TestComponentMultiplyBy2)
-      p.spawn_process(TestComponentMultiplyBy2)
+      p.spawn_process(TestComponentMultiplier.new(2))
+      p.spawn_process(TestComponentMultiplier.new(2))
       p.to_file(result_file)
     end
     pipeline.run
-    expect(result_file).to have_content [[4], [8], [12]]
+    expect(result_file).to have_content [[4], [12], [20]]
   end
 
-  it 'connects pipes with shell commands' do
+  it 'connects pipes with shell commands'do
     create_file(test_file, [[1], [2], [3]])
     pipeline = Pipeline.new do |p|
       p.from_file(test_file)
@@ -144,4 +123,22 @@ describe Pipeline do
     pipeline.run
     expect(result_file).to have_content [['_1_'], ['_2_'], ['_3_']]
   end
+
+  it 'parallelize things' 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(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.to_file(result_file)
+    end
+    pipeline.run
+    lines = IO.readlines(result_file)
+    expect(lines.size).to eq 10_000
+    expect(lines).to include("[10]\n") | include("[100]\n") | include("[1000]\n")
+    expect(lines).to include("[100000]\n") | include("[1000000]\n") | include("[10000000]\n")
+  end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 require 'deadly_serious'
 require 'fileutils'
-
 RSpec.configure do |config|
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+
   config.before(:each) do
     FileUtils.mkdir_p '/tmp/deadly_serious/'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadly_serious
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0.pre.rc1
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rbczmq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.9
 description: Flow Based Programming Maestro
 email:
 - ronie.uliana@gmail.com
@@ -113,19 +133,33 @@ files:
 - lib/deadly_serious.rb
 - lib/deadly_serious/engine/auto_pipe.rb
 - lib/deadly_serious/engine/channel.rb
+- lib/deadly_serious/engine/channel/file_channel.rb
+- lib/deadly_serious/engine/channel/pipe_channel.rb
+- lib/deadly_serious/engine/channel/socket/master_mind.rb
+- lib/deadly_serious/engine/channel/socket/minion.rb
+- lib/deadly_serious/engine/channel/socket/socket_sink_recvr.rb
+- lib/deadly_serious/engine/channel/socket/socket_sink_sendr.rb
+- lib/deadly_serious/engine/channel/socket/socket_vent_recvr.rb
+- lib/deadly_serious/engine/channel/socket/socket_vent_sendr.rb
+- lib/deadly_serious/engine/channel/socket_channel.rb
 - lib/deadly_serious/engine/commands.rb
+- lib/deadly_serious/engine/config.rb
+- lib/deadly_serious/engine/file_monitor.rb
 - lib/deadly_serious/engine/json_io.rb
-- lib/deadly_serious/engine/lazy_io.rb
-- lib/deadly_serious/engine/open_io.rb
 - lib/deadly_serious/engine/pipeline.rb
-- lib/deadly_serious/processes/joiner.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/lambda.rb
 - lib/deadly_serious/processes/resilient_splitter.rb
 - lib/deadly_serious/processes/splitter.rb
 - lib/deadly_serious/version.rb
-- spec/deadly_serious/engine/commands_spec.rb
-- spec/deadly_serious/engine/json_io_spec.rb
-- spec/deadly_serious/engine/pipeline_spec.rb
+- spec/lib/deadly_serious/engine/auto_pipe_spec.rb
+- spec/lib/deadly_serious/engine/channel/socket_channel_spec.rb
+- spec/lib/deadly_serious/engine/commands_spec.rb
+- spec/lib/deadly_serious/engine/file_monitor_spec.rb
+- spec/lib/deadly_serious/engine/json_io_spec.rb
+- spec/lib/deadly_serious/engine/pipeline_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ruliana/deadly_serious
 licenses:
@@ -142,19 +176,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Flow Based Programming maestro that relies on named pipes and Linux processes
   (sorry, no Windows here). That means it uses 'mechanical sympathy' with the Operating
   System, i.e., the S.O. is *part* of the program, it's not something *under* it.
 test_files:
-- spec/deadly_serious/engine/commands_spec.rb
-- spec/deadly_serious/engine/json_io_spec.rb
-- spec/deadly_serious/engine/pipeline_spec.rb
+- spec/lib/deadly_serious/engine/auto_pipe_spec.rb
+- spec/lib/deadly_serious/engine/channel/socket_channel_spec.rb
+- spec/lib/deadly_serious/engine/commands_spec.rb
+- spec/lib/deadly_serious/engine/file_monitor_spec.rb
+- spec/lib/deadly_serious/engine/json_io_spec.rb
+- spec/lib/deadly_serious/engine/pipeline_spec.rb
 - spec/spec_helper.rb

data/lib/deadly_serious/engine/lazy_io.rb

@@ -1,82 +0,0 @@
-module DeadlySerious
-  module Engine
-
-    # Restrict IO class that opens ONLY
-    # when trying to read something.
-    #
-    # *This is the object passed to Components.*
-    #
-    # Also, used to reopen lost connections.
-    #
-    # By "restrict", I mean it implements
-    # just a few IO operations.
-    class LazyIo
-      def initialize(channel)
-        @channel = channel
-      end
-
-      # @return [String, nil] the name of the file or pipe,
-      #         nil if it's a socket
-      def filename
-        @channel.io_name if @channel.respond_to?(:io_name)
-      end
-
-      def gets
-        open_reader
-        @io.gets
-      end
-
-      def each(&block)
-        open_reader
-        @io.each &block
-      end
-
-      def each_cons(qty, &block)
-        open_reader
-        @io.each_cons(qty, &block)
-      end
-
-      def each_with_object(object, &block)
-        open_reader
-        @io.each_with_object(object, &block)
-      end
-
-      def <<(element)
-        open_writer
-        @io << element
-      end
-
-      def eof?
-        open_reader
-        @io.eof?
-      end
-
-      def closed?
-        @io.nil? || @io.closed?
-      end
-
-      def close
-        @io.close unless closed?
-        @io = nil
-      end
-
-      def flush
-        @io.flush unless closed?
-      end
-
-      private
-
-      def open_reader
-        if closed?
-          @io = @channel.open_reader
-        end
-      end
-
-      def open_writer
-        if closed?
-          @io = @channel.open_writer
-        end
-      end
-    end
-  end
-end

data/lib/deadly_serious/engine/open_io.rb

@@ -1,39 +0,0 @@
-require 'fileutils'
-
-module DeadlySerious
-  module Engine
-    # Wraps the channels with a {LazyIO} before pass
-    # them to the component.
-    module OpenIo
-      def run(*args, readers: [], writers:[])
-        opened_readers = readers.map { |reader| wrap_io(reader) }
-        opened_writers = writers.map { |writer| wrap_io(writer) }
-        super(*args, readers: opened_readers, writers: opened_writers)
-      ensure
-        if opened_writers
-          opened_writers.each { |writer| close_io(writer) }
-        end
-        if opened_readers
-          opened_readers.each { |reader| close_io(reader) }
-        end
-      end
-
-      private
-
-      def close_io(io)
-        return unless io
-        return if io.closed?
-        io.close
-      rescue => e
-        # Intentionally eat the error
-        # because it's being used inside
-        # an "ensure" block
-        puts e.inspect
-      end
-
-      def wrap_io(pipe_name)
-        Channel.new(pipe_name).io
-      end
-    end
-  end
-end