deadly_serious 2.0.0.pre.rc1 → 2.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ea6f0fb905d3b08feef450651add4e28b7ed69
-  data.tar.gz: 3bfb8bba7ca19b826ed1cfdefbb81cde2453eb33
+  metadata.gz: 674822fd44059d7b252f5083dcbc982f633472b4
+  data.tar.gz: 56612d70f7df34ec08bd9a6ecd795e8d58a17b60
 SHA512:
-  metadata.gz: 83cccbcf342d6e331f8bb050157446fef59a680e5968a8d00a1b21323d976d20f301a5844e899f1031d4cc1d0e049a04b47f7c11eef5214a58f1f552e8f05c6b
-  data.tar.gz: 3afb1d45bfc69a4721fb981949bb63e1b02f7a3765a417b8fe9eb2ad5adb9d60a4d81f51e3194d45a61466ebfd02e8040b5666e21768c4e10aca365b527901f2
+  metadata.gz: ca3933abc30d5f415bc5ac14fd01d93fbfdff61dd1f0e082bb9d1cae4d56f7ab83b3f25380c16ec6623de835079f95a805634a386b533cc598126c18d450a9c7
+  data.tar.gz: e46b9f206e57290d25dc5f9bdb8b8437bdcf085ed51d9be3722b34cd3593d54d09565ec42546238f25f5ab175d9a2131fbb0cb6d6d0439b85c5b50c98b13f02d

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2
+ruby-2.1

data/deadly_serious.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'guard-rspec', '~> 4.0'
+  spec.add_development_dependency 'guard-rspec', '~> 4.6', '>= 4.6.4'
 
   spec.add_dependency 'oj', '~> 2.0'
   spec.add_dependency 'multi_json', '~> 1.0'

data/lib/deadly_serious/engine/pipeline.rb

@@ -10,7 +10,9 @@ module DeadlySerious
                      preserve_pipe_dir: false,
                      &block)
 
-        @config = Config.new(data_dir: data_dir, pipe_dir: pipe_dir, preserve_pipe_dir: preserve_pipe_dir)
+        @config = DeadlySerious::Engine::Config.new(data_dir: data_dir,
+                                                    pipe_dir: pipe_dir,
+                                                    preserve_pipe_dir: preserve_pipe_dir)
         @block = block
         @pids = []
       end
@@ -19,9 +21,9 @@ module DeadlySerious
         @config.setup
         @block.call(self)
         wait_children
-      rescue => e
-        kill_children
-        raise e
+      rescue
+        clean_suicide
+        raise
       ensure
         @config.teardown if @config
       end
@@ -78,21 +80,22 @@ module DeadlySerious
         end
       end
 
+      def clean_suicide
+        @pids ||= [] # Avoid stupid errors
+        @pids.each { |pid| Process.kill('SIGTERM', pid) rescue nil }
+        Timeout::timeout(5) { wait_children }
+      rescue Timeout::Error
+        @pids.each { |pid| Process.kill('SIGKILL', pid) rescue nil }
+      ensure
+        @pids.clear
+      end
+
       private
 
       def wait_children
         Process.waitall
       end
 
-      def kill_children
-        gpid = Process.gid
-        Process.kill('SIGTERM', -gpid) rescue nil
-        Timeout::timeout(5) { wait_children }
-        @pids.clear
-      rescue Timeout::Error
-        Process.kill('SIGKILL', -gpid) rescue nil
-      end
-
       def set_process_name(name)
         $0 = name
       end

data/lib/deadly_serious/version.rb

@@ -1,3 +1,3 @@
 module DeadlySerious
-  VERSION = '2.0.0-rc1'
+  VERSION = '2.0.0-rc2'
 end

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

@@ -3,9 +3,10 @@ include DeadlySerious::Engine
 
 describe SocketChannel do
   let(:test_config) do
-    Config.new(data_dir: "/tmp/test_deadly_serious#{Process.pid}",
-               pipe_dir: "/tmp/test_deadly_serious#{Process.pid}",
-               preserve_pipe_dir: false)
+    # Conflicts with RbConfig in < 2.1
+    DeadlySerious::Engine::Config.new(data_dir: "/tmp/test_deadly_serious#{Process.pid}",
+                                      pipe_dir: "/tmp/test_deadly_serious#{Process.pid}",
+                                      preserve_pipe_dir: false)
   end
 
   matcher :produce_a do |expected|

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

@@ -72,6 +72,15 @@ describe Pipeline do
     expect(finish - start).to be >= DELAY
   end
 
+  it 'kills children' do
+    pipeline = Pipeline.new do |p|
+      p.spawn_process(TestComponentTime, DELAY)
+      p.clean_suicide
+      p.spawn_process(TestComponentTime, DELAY)
+    end
+    expect { pipeline.run }.not_to raise_error
+  end
+
   it 'spawns children in parallel' do
     pipeline = Pipeline.new do |p|
       p.spawn_process(TestComponentTime, DELAY)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadly_serious
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc1
+  version: 2.0.0.pre.rc2
 platform: ruby
 authors:
 - Ronie Uliana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.4
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement