abalone 0.3.0 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/abalone.rb +6 -2
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ea051e4cf4c221ad17b102a504eff7a40452ad1e
4
- data.tar.gz: dba07d3f25fb3529a7bdf645587b7096fe5e6803
3
+ metadata.gz: a524ef1fcbe0ec97e8b07409dab7932f49e799fd
4
+ data.tar.gz: 3202484f435dbd3971aab113dbfd2a09510a0770
5
5
  SHA512:
6
- metadata.gz: 6342b905e0315d42a301fc0367d67c6a2a4481821669befb4f3044adf20def7cb804093f6aef0a1135f4d602137fb73e9b1f674cd48c49a67ea29f090cab24f8
7
- data.tar.gz: 13f2c302b13da357add6286a605f2cbb56ba2853ea82afc7fbafea698c987059bde51756410353e720ef766e47411d73164c91b50870e45da5f8ae6baded641e
6
+ metadata.gz: 0e779c1df6f062ba57ad3a9ad8fabd09d3a1bc75d5b7e5d2594fa499f417730ac04067af469626d4b1c3f3c93d7a3351299acf2c2b21817f23e78d57375e5709
7
+ data.tar.gz: 960f7bedb8f0b5acb187c461c58136338b938c72cc78a79d736b7f8e04a4a43ea49f3f37bc0eaedde08c7da7a10cb690d1136d313ae058183f26049ac5570a5f
@@ -34,6 +34,8 @@ class Abalone < Sinatra::Base
34
34
 
35
35
  ws.onopen do
36
36
  warn("websocket opened")
37
+ ENV['TERM'] ||= 'xterm' # make sure we've got a somewhat sane environment
38
+
37
39
  reader, @writer, @pid = PTY.spawn(*shell_command)
38
40
  @writer.winsize = [24,80]
39
41
 
@@ -76,7 +78,7 @@ class Abalone < Sinatra::Base
76
78
  warn('Terminal has exited!')
77
79
  ws.close_connection
78
80
 
79
- @timer.terminate
81
+ @timer.terminate rescue nil
80
82
  @timer.join rescue nil
81
83
  Thread.exit
82
84
  end
@@ -147,7 +149,9 @@ class Abalone < Sinatra::Base
147
149
 
148
150
  helpers do
149
151
  def stop_term()
150
- Process.kill('HUP', @pid) rescue nil
152
+ Process.kill('TERM', @pid) rescue nil
153
+ sleep 1
154
+ Process.kill('KILL', @pid) rescue nil
151
155
  @term.join rescue nil
152
156
  end
153
157
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: abalone
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Ford
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-27 00:00:00.000000000 Z
11
+ date: 2016-07-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sinatra