deadly_serious 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a30b61e936eb33f5cb91c10f88d76d9e5cd4af32
-  data.tar.gz: 136f091a820f42adc1def958f18deddf46ba9adb
+  metadata.gz: 835ccef3d84a0bbe1cbcfd6ad4a78ccbea6709f8
+  data.tar.gz: d330508f3b852e4ac98c99b9fc679386bdd75f1d
 SHA512:
-  metadata.gz: e906728b97a32698a5c0275e4d09bda031fba5cfaa95ae409a987d2fa9088205352bfffcbd17621215c161706147198374b478032cc92ad4910631fc185d72ff
-  data.tar.gz: 079c0bceba60c84b166174420ea1e7a347806c1328e8f4151c98f89be267c7afda4812ac3511d275c56066fa47a227dd8fa9ccb5bb7d9ce1d769b5edf9b7c933
+  metadata.gz: aad544ea7468318303460244dae5db32074317027509b3f84d512f7011667f78a47868e86c39817779c249223d425076f525626d9a0402ba21723992e83487a0
+  data.tar.gz: 717bf292b278dd7d41e5e3ffec05e931a7bc69f6de8a143e0ff4a17f414cd3c8238e1cdb5dc8e867b6db1d744cacc63b903eda1f8b910c35015e87f5009e5ef5

data/.gitignore

@@ -3,6 +3,9 @@
 .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/lib/deadly_serious/engine/channel.rb

@@ -12,7 +12,7 @@ module DeadlySerious
       def self.new(name)
         matcher = name.match(/^(>)?(.*?)(?:(:)(\d{1,5}))?$/)
         if matcher[1] == '>'
-          FileChannel.new(matcher[2], @data_dir)
+          FileChannel.new(matcher[2], @data_dir, @pipe_dir)
         elsif matcher[3] == ':'
           SocketChannel.new(matcher[2], matcher[4].to_i)
         else
@@ -20,20 +20,26 @@ module DeadlySerious
         end
       end
 
-      def self.config(data_dir, pipe_dir, preserve_pipe_dir)
+      def self.config(data_dir, pipe_dir, lock_dir, preserve_pipe_dir, preserve_lock_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)
@@ -42,28 +48,41 @@ module DeadlySerious
     end
 
     class FileChannel
-      def initialize(name, directory)
+      def initialize(name, directory, temp_dir)
         @io_name = File.join(directory, name)
+        @readlock_file = "#{temp_dir}/#{name}.readlock"
       end
 
       def create
-        `touch #{@io_name}` unless File.exist?(@io_name)
+        unless File.exist?(@io_name)
+          `touch #{@io_name} && touch #{@readlock_file}`
+        end
         @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)
-        if File.size(@io_name) > 0 && `lsof #{@io_name}` == ''
-          open(@io_name, 'r')
-        else
-          notifier = INotify::Notifier.new
-          file = nil
-          notifier.watch(@io_name, :close_write, :close_nowrite) do
-            file = open(@io_name, 'r')
-          end
-          notifier.process
-          file
+        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
 
       def open_writer
@@ -86,6 +105,10 @@ 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')
@@ -111,6 +134,10 @@ module DeadlySerious
         # Do nothing
       end
 
+      def on_close
+        # Do nothing
+      end
+
       def open_reader
         TCPSocket.new(@host, @port)
       rescue Exception => e

data/lib/deadly_serious/engine/lazy_io.rb

@@ -2,12 +2,18 @@ module DeadlySerious
   module Engine
 
     # Restrict IO class that opens ONLY
-    # when trying to read something.
+    # when trying to read or write something.
+    # This way, the channel is opened during
+    # the shortest time possible.
     #
-    # Also, used to reopend lost connections.
+    # We also can be used it to reopen channels
+    # when they are closed.
     #
-    # By "restrict", I mean it implements
+    # By "restrict IO", 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
@@ -49,6 +55,7 @@ module DeadlySerious
 
       def close
         @io.close
+        @channel.on_close
         @io = nil
       end
 

data/lib/deadly_serious/engine/spawner.rb

@@ -6,10 +6,12 @@ module DeadlySerious
   module Engine
     class Spawner
       def initialize(data_dir: './data',
-                     pipe_dir: "/tmp/deadly_serious/#{Process.pid}",
-                     preserve_pipe_dir: false)
+                     pipe_dir: "/tmp/deadly_serious/#{Process.pid}/pipes",
+                     lock_dir: "/tmp/deadly_serious/#{Process.pid}/locks",
+                     preserve_pipe_dir: false,
+                     preserve_lock_dir: false)
         @ids = []
-        Channel.config(data_dir, pipe_dir, preserve_pipe_dir)
+        Channel.config(data_dir, pipe_dir, lock_dir, preserve_pipe_dir, preserve_lock_dir)
       end
 
       def run

data/lib/deadly_serious/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadly_serious
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler