masamune 0.18.7 → 0.18.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e886df417cffdf88380ab29c2bf209f12ae2fa5e
-  data.tar.gz: d94a89c271bd19c15d8a368e2e5a2e40a7def4e6
+  metadata.gz: 4998b7e77e19d79c880eee83917f6f16f764e6b3
+  data.tar.gz: 1b4a618c2981277813c470b8340b8e606767fd29
 SHA512:
-  metadata.gz: c6b60f88135189d1bf95f88123f371f0f082fe7be93612e40ddf90d32c15e7b4a1cc76eb4a827164826c3cc66a73413192ea60af97ca94bf6eaa8c2aa7a3ce54
-  data.tar.gz: 34c1cb0aa9a851f06157046a1f9de8f71b1d686e175d1bf9751353fe21a961e948a38e63071c872f360fa7982d72522580b7d49437a7c63cc6e55da9105cecff
+  metadata.gz: 630c9fe4a18665a88bc836b5f52930cbe6d3ceca3d4c30b26e9b2be51629383e8bf3b35fe56f96c3f947e444d0cea3b3014ceda3ab77afc095872d2fbf704127
+  data.tar.gz: d926af20492b4c945058d5e6be69d1ea998977f5d1fe13a7e2b29134152cb829dc1dfea56e634ac77bcfffc188e3c084fcb46322f1fae3190355e6bdae4a0383

data/lib/masamune/commands/shell.rb

@@ -47,8 +47,14 @@ module Masamune::Commands
       around_execute do
         pid = Process.fork
         if pid
-          detach if opts.fetch(:detach, true)
-          Process.waitpid(pid)
+          Signal.trap('INT') {} # Ensure SIGINT is handled by child process exec
+          if opts.fetch(:detach, true)
+            detach do
+              Process.waitpid(pid)
+            end
+          else
+            Process.waitpid(pid)
+          end
           exit
         else
           exec(command_env, *command_args)
@@ -143,7 +149,6 @@ module Masamune::Commands
 
         [t_stderr, t_stdout, t_stdin].compact.each(&:join)
         logger.debug("status: #{t_stdin.value}")
-        `stty sane -F /dev/tty` if RUBY_PLATFORM =~ /linux/
         t_stdin.value
       end
     end
@@ -191,9 +196,33 @@ module Masamune::Commands
     end
 
     def detach
-      STDIN.close
-      STDOUT.close
-      STDERR.close
+      old_stdin = $stdin.dup
+      new_stdin = File.open('/dev/null', 'r')
+      $stdin.reopen(new_stdin)
+      new_stdin.close
+
+      old_stdout = $stdout.dup
+      new_stdout = File.open('/dev/null', 'w+')
+      $stdout.reopen(new_stdout)
+      new_stdout.close
+
+      old_stderr = $stderr.dup
+      new_stderr = File.open('/dev/null', 'w+')
+      $stderr.reopen(new_stderr)
+      new_stderr.close
+
+      yield
+    ensure
+      $stdin.reopen(old_stdin)
+      old_stdin.close
+
+      $stdout.reopen(old_stdout)
+      old_stdout.close
+
+      $stderr.reopen(old_stderr)
+      old_stderr.close
+
+      `stty sane -F /dev/tty` if RUBY_PLATFORM =~ /linux/
     end
 
     def command_info

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.7'.freeze
+  VERSION = '0.18.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.7
+  version: 0.18.8
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor