deadly_serious 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835ccef3d84a0bbe1cbcfd6ad4a78ccbea6709f8
-  data.tar.gz: d330508f3b852e4ac98c99b9fc679386bdd75f1d
+  metadata.gz: b91d01c54129f8158a8f1a949e21b52d938edc11
+  data.tar.gz: a02ba9c6fbc11c1a1310b76877ba8af122591374
 SHA512:
-  metadata.gz: aad544ea7468318303460244dae5db32074317027509b3f84d512f7011667f78a47868e86c39817779c249223d425076f525626d9a0402ba21723992e83487a0
-  data.tar.gz: 717bf292b278dd7d41e5e3ffec05e931a7bc69f6de8a143e0ff4a17f414cd3c8238e1cdb5dc8e867b6db1d744cacc63b903eda1f8b910c35015e87f5009e5ef5
+  metadata.gz: fffa36bdf4a5e981f79de9e6c0e3c55d30ef40a6e71e5951d9b66098d5f18e7b87bc2907db40cd97c23601fc1aefc698d237329c3542a040aaad8df127d70fae
+  data.tar.gz: d28eb902110fea51d82f95a68f5682051e27e251540b6cc3d469058b7b578dca96bf268c55953a5be6572b37a9ffad83c1085546d60df587a10afe7fbd69544c

data/.gitignore

@@ -3,9 +3,6 @@
 .idea/
 coverage
 doc/
-examples/connected_by_files/data/result
-examples/connected_by_files/data/temp1
-examples/connected_by_files/data/temp2
 *.gem
 Gemfile.lock
 InstalledFiles

data/deadly_serious.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.5', '>= 1.5.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rb-inotify', '~> 0.9'
-  spec.add_dependency 'json', '~> 1.8'
+  spec.add_dependency 'json'
 end

data/lib/deadly_serious/engine/auto_pipe.rb

@@ -0,0 +1,39 @@
+class DeadlySerious::Engine::AutoPipe
+  TEMPLATE = '%s.connection.%04d'
+
+  def initialize
+    @net_id = 0
+    @connection_stack = []
+    @counter = Hash.new { |h, k| h[k.to_sym] = 0}
+  end
+
+  def on_subnet
+    @net_id += 1
+    @connection_stack << sprintf('%04d', @net_id)
+    yield
+  ensure
+    @connection_stack.pop
+  end
+
+  def net_id
+    (@connection_stack.last || 'top').to_sym
+  end
+
+  def counter
+    @counter[net_id]
+  end
+
+  def next
+    advance_counter
+    last
+  end
+
+  def last
+    sprintf(TEMPLATE, net_id, counter)
+  end
+
+  private
+  def advance_counter
+    @counter[net_id] += 1
+  end
+end

data/lib/deadly_serious/engine/channel.rb

@@ -4,15 +4,11 @@ require 'deadly_serious/engine/lazy_io'
 module DeadlySerious
   module Engine
     # Fake class, it's actually a factory ¬¬
-    # Creates a pipe, file or socket, depending on the name informed:
-    # xyz      # create a pipe
-    # >xyz     # create a file
-    # xyz:8080 # create a socket
     module Channel
       def self.new(name)
         matcher = name.match(/^(>)?(.*?)(?:(:)(\d{1,5}))?$/)
         if matcher[1] == '>'
-          FileChannel.new(matcher[2], @data_dir, @pipe_dir)
+          FileChannel.new(matcher[2], @data_dir)
         elsif matcher[3] == ':'
           SocketChannel.new(matcher[2], matcher[4].to_i)
         else
@@ -20,26 +16,20 @@ module DeadlySerious
         end
       end
 
-      def self.config(data_dir, pipe_dir, lock_dir, preserve_pipe_dir, preserve_lock_dir)
+      def self.config(data_dir, pipe_dir, preserve_pipe_dir)
         @data_dir = data_dir
         @pipe_dir = pipe_dir
-        @lock_dir = lock_dir
         @preserve_pipe_dir = preserve_pipe_dir
-        @preserve_lock_dir = preserve_lock_dir
       end
 
       def self.setup
         FileUtils.mkdir_p(@pipe_dir) unless File.exist?(@pipe_dir)
-        FileUtils.mkdir_p(@lock_dir) unless File.exist?(@lock_dir)
       end
 
       def self.teardown
         if !@preserve_pipe_dir && File.exist?(@pipe_dir)
           FileUtils.rm_r(@pipe_dir, force: true, secure: true)
         end
-        if !@preserve_lock_dir && File.exist?(@lock_dir)
-          FileUtils.rm_r(@lock_dir, force: true, secure: true)
-        end
       end
 
       def self.create_pipe(pipe_name)
@@ -48,40 +38,19 @@ module DeadlySerious
     end
 
     class FileChannel
-      def initialize(name, directory, temp_dir)
+      attr_reader :io_name
+
+      def initialize(name, directory)
         @io_name = File.join(directory, name)
-        @readlock_file = "#{temp_dir}/#{name}.readlock"
       end
 
       def create
-        unless File.exist?(@io_name)
-          `touch #{@io_name} && touch #{@readlock_file}`
-        end
+        `touch #{@io_name}` unless File.exist?(@io_name)
         @io_name
       end
 
-      def on_close
-        FileUtils.rm_f(@readlock_file)
-      end
-
-      # If the file has a "readlock", blocks the opening
-      # until the readlock be removed.
       def open_reader
         fail %(File "#{@io_name}" not found) unless File.exist?(@io_name)
-        return open(@io_name, 'r') unless File.exist?(@readlock_file)
-
-        notifier = INotify::Notifier.new
-        file = nil
-        notifier.watch(@readlock_file, :delete) do
-          file = open(@io_name, 'r')
-        end
-        notifier.process
-        file
-
-      rescue Errno::ENOENT
-        # Should occur ONLY if we deleted the
-        # readlock file after the guard clause
-        # and before the Notifier initialization.
         open(@io_name, 'r')
       end
 
@@ -96,6 +65,8 @@ module DeadlySerious
     end
 
     class PipeChannel
+      attr_reader :io_name
+
       def initialize(name, directory)
         @io_name = File.join(directory, name)
       end
@@ -105,10 +76,6 @@ module DeadlySerious
         @io_name
       end
 
-      def on_close
-        # Do nothing
-      end
-
       def open_reader
         fail %(Pipe "#{@io_name}" not found) unless File.exist?(@io_name)
         open(@io_name, 'r')
@@ -130,11 +97,11 @@ module DeadlySerious
         @retry_counter = 3
       end
 
-      def create
-        # Do nothing
+      def io_name
+        "#{@host}@#{@port}"
       end
 
-      def on_close
+      def create
         # Do nothing
       end
 

data/lib/deadly_serious/engine/lazy_io.rb

@@ -2,18 +2,12 @@ module DeadlySerious
   module Engine
 
     # Restrict IO class that opens ONLY
-    # when trying to read or write something.
-    # This way, the channel is opened during
-    # the shortest time possible.
+    # when trying to read something.
     #
-    # We also can be used it to reopen channels
-    # when they are closed.
+    # Also, used to reopend lost connections.
     #
-    # By "restrict IO", I mean it implements
+    # By "restrict", I mean it implements
     # just a few IO operations.
-    #
-    # Note: Maybe it can be completely removed.
-    # for the sake of simplicity
     class LazyIo
       def initialize(channel)
         @channel = channel
@@ -54,8 +48,7 @@ module DeadlySerious
       end
 
       def close
-        @io.close
-        @channel.on_close
+        @io.close unless closed?
         @io = nil
       end
 

data/lib/deadly_serious/engine/spawner.rb

@@ -1,17 +1,29 @@
 require 'deadly_serious/engine/channel'
 require 'deadly_serious/engine/open_io'
+require 'deadly_serious/engine/auto_pipe'
 require 'deadly_serious/processes/splitter'
 
 module DeadlySerious
   module Engine
     class Spawner
       def initialize(data_dir: './data',
-                     pipe_dir: "/tmp/deadly_serious/#{Process.pid}/pipes",
-                     lock_dir: "/tmp/deadly_serious/#{Process.pid}/locks",
-                     preserve_pipe_dir: false,
-                     preserve_lock_dir: false)
+                     pipe_dir: "/tmp/deadly_serious/#{Process.pid}",
+                     preserve_pipe_dir: false)
         @ids = []
-        Channel.config(data_dir, pipe_dir, lock_dir, preserve_pipe_dir, preserve_lock_dir)
+        @auto_pipe = AutoPipe.new
+        Channel.config(data_dir, pipe_dir, preserve_pipe_dir)
+      end
+
+      def on_subnet(&block)
+        @auto_pipe.on_subnet &block
+      end
+
+      def next_pipe
+        @auto_pipe.next
+      end
+
+      def last_pipe
+        @auto_pipe.last
       end
 
       def run
@@ -33,13 +45,14 @@ module DeadlySerious
         writers.each { |writer| create_pipe(writer) }
         fork_it do
           begin
-            set_process_name(process_name)
+            set_process_name(process_name, readers, writers)
             append_open_io_if_needed(a_class)
             the_object = a_class.new
             the_object.run(*args, readers: readers, writers: writers)
-          rescue => e
+          rescue Errno::EPIPE # Broken Pipe, no problem
+            # Ignore
+          ensure
             the_object.finalize if the_object.respond_to?(:finalize)
-            raise e
           end
         end
       end
@@ -117,8 +130,8 @@ module DeadlySerious
         wait_children
       end
 
-      def set_process_name(name)
-        $0 = "ruby #{self.class.dasherize(name)}"
+      def set_process_name(name, readers, writers)
+        $0 = "ruby #{self.class.dasherize(name)} <(#{readers.join(' ')}) >(#{writers.join(' ')})"
       end
 
       # @!endgroup

data/lib/deadly_serious/processes/splitter.rb

@@ -6,7 +6,7 @@ module DeadlySerious
       end
       def run(readers: [], writers: [])
         @writers ||= writers
-	reader = readers.first
+        reader = readers.first
         @outputs = @writers.dup
         begin
           reader.each do |line|

data/lib/deadly_serious/version.rb

@@ -1,3 +1,3 @@
 module DeadlySerious
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/deadly_serious.rb

@@ -1,4 +1,3 @@
-require 'rb-inotify'
 require 'deadly_serious/version'
 require 'deadly_serious/engine/spawner'
 require 'deadly_serious/engine/base_process'

metadata

@@ -1,77 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: deadly_serious
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 description: Flow Based Programming Engine mechanically sympathetic to *nix.
 email:
 - ronie.uliana@gmail.com
@@ -79,13 +59,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - deadly_serious.gemspec
 - lib/deadly_serious.rb
+- lib/deadly_serious/engine/auto_pipe.rb
 - lib/deadly_serious/engine/base_process.rb
 - lib/deadly_serious/engine/channel.rb
 - lib/deadly_serious/engine/json_io.rb
@@ -112,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Flow Based Programming engine that relies on named pipes and Linux processes