akabei 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f24e73ac4a8f8c23310d5efca6ec404bd917304
-  data.tar.gz: 899db05e8f86421ec1424df696f047880f8381f0
+  metadata.gz: 6ff61e094ee27a7589de8368cc62e21e1648f4ee
+  data.tar.gz: 5f990365218e0e03da0008e4cf4d50a1daf8fdaa
 SHA512:
-  metadata.gz: 35242fb745b91cb11fc7f4be3522b42fc4f87cfe2e88d9607e312ee8980f5c8dbd1921f411da7e407fb7ec162424ee447ce22f7147adfaecf150a9005b099077
-  data.tar.gz: 779a9bd2c6c594c41f94f2f4f0bcf229a043a7e7e8dca40a6dfbd4063cda34d86d2418b6e7a16ee3446a8ecc2016048e7d80f9ef79e2ecaa24599313f92c0406
+  metadata.gz: 7bd26621baee54f6b5058c6428104b44f5220a4a7546533cc87c542155bbb9757ea651d8dd1142cbebffa00fbc517a9a4d3878bb10de9f3bc8fe17fc9322f7c6
+  data.tar.gz: 8afedf18973b1486c4175abedf436239d234b72edc01d4a18483abfb233af4de33e0d1e8577ab3ed9e936ab52cc3329ee8bda79aa768c3c9e675e2c986f7c87e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.3.4 (2014-03-09)
+- Improve signal handling
+
 # 0.3.3 (2014-03-07)
 - Fix gpg-agent check
 

data/lib/akabei/system.rb

@@ -43,9 +43,20 @@ module Akabei
         args = args.dup
         args.unshift('setarch', a)
       end
-      unless Kernel.system(env, *args.map(&:to_s), opts)
+
+      pid = Kernel.spawn(env, *args.map(&:to_s), opts)
+      begin
+        _, status = Process.waitpid2(pid)
+        unless status.success?
+          raise CommandFailed.new(env, args, opts)
+        end
+      rescue SignalException => e
+        # Always raise an error because mkarchroot exits with 0 even if it is
+        # interrupted.
+        Process.waitpid2(pid)
         raise CommandFailed.new(env, args, opts)
       end
+      status
     end
   end
 end

data/lib/akabei/version.rb

@@ -1,3 +1,3 @@
 module Akabei
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/akabei/system_spec.rb

@@ -38,7 +38,11 @@ describe Akabei::System do
 
       context 'with command failure' do
         before do
-          allow(Kernel).to receive(:system).and_return(false)
+          status = double('Process::Status with failure')
+          allow(status).to receive(:success?).and_return(false)
+          pid = double('process id')
+          allow(Process).to receive(:waitpid2).with(pid).and_return([pid, status])
+          allow(Kernel).to receive(:spawn).and_return(pid, status)
         end
 
         it 'raises an error' do
@@ -53,13 +57,18 @@ describe Akabei::System do
       let(:arch) { 'armv7h' }
 
       it 'executes sudo and setarch' do
-        expect(Kernel).to receive(:system) { |*args|
+        expect(Kernel).to receive(:spawn) { |*args|
           args = args.dup
           env = args.shift
           opts = args.pop
           expect(args).to eq(%W[setarch #{arch}] + command)
           expect(opts).to_not have_key(:arch)
-          true
+
+          status = double('Process::Status with success')
+          allow(status).to receive(:success?).and_return(true)
+          pid = double('process id')
+          allow(Process).to receive(:waitpid2).with(pid).and_return([pid, status])
+          pid
         }
 
         options.merge!(arch: arch)
@@ -69,13 +78,43 @@ describe Akabei::System do
 
       context 'with command failure' do
         before do
-          allow(Kernel).to receive(:system).and_return(false)
+          status = double('Process::Status with failure')
+          allow(status).to receive(:success?).and_return(false)
+          pid = double('process id')
+          allow(Process).to receive(:waitpid2).with(pid).and_return([pid, status])
+          allow(Kernel).to receive(:spawn).and_return(pid, status)
         end
 
         it 'raises an error' do
           expect { described_class.system(command, options) }.to raise_error(Akabei::System::CommandFailed)
         end
       end
+
+      context 'with signal' do
+        before do
+          status = double('Process::Status with success')
+          allow(status).to receive(:success?).and_return(true)
+          pid = double('process id')
+          allow(Kernel).to receive(:spawn).and_return(pid, status)
+
+          cnt = 0
+          allow(Process).to receive(:waitpid2).with(pid) {
+            cnt += 1
+            case cnt
+            when 1
+              raise SignalException.new(2)
+            when 2
+              [pid, status]
+            else
+              raise 'Process receives waitpid2 too many times'
+            end
+          }
+        end
+
+        it 'raises an error even if the process exit code is 0' do
+          expect { described_class.system(command, options) }.to raise_error(Akabei::System::CommandFailed)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akabei
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Kohei Suzuki