ra-bluepill 0.0.45 → 0.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/bluepill/socket.rb +2 -24
- data/ra-bluepill.gemspec +1 -1
- metadata +3 -3
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.0.
|
|
1
|
+
0.0.46
|
data/lib/bluepill/socket.rb
CHANGED
|
@@ -2,12 +2,6 @@ require 'socket'
|
|
|
2
2
|
|
|
3
3
|
module Bluepill
|
|
4
4
|
module Socket
|
|
5
|
-
<<<<<<< HEAD
|
|
6
|
-
TIMEOUT = 10
|
|
7
|
-
RETRY = 5
|
|
8
|
-
@@timeout = 0
|
|
9
|
-
=======
|
|
10
|
-
>>>>>>> akzhan
|
|
11
5
|
|
|
12
6
|
extend self
|
|
13
7
|
|
|
@@ -15,11 +9,7 @@ module Bluepill
|
|
|
15
9
|
UNIXSocket.open(socket_path(base_dir, name), &b)
|
|
16
10
|
end
|
|
17
11
|
|
|
18
|
-
<<<<<<< HEAD
|
|
19
|
-
def client_command(base_dir, name, command)
|
|
20
|
-
=======
|
|
21
12
|
def client_command(base_dir, name, command, timeout)
|
|
22
|
-
>>>>>>> akzhan
|
|
23
13
|
client(base_dir, name) do |socket|
|
|
24
14
|
Timeout.timeout(timeout) do
|
|
25
15
|
socket.puts command
|
|
@@ -27,15 +17,7 @@ module Bluepill
|
|
|
27
17
|
end
|
|
28
18
|
end
|
|
29
19
|
rescue EOFError, Timeout::Error
|
|
30
|
-
|
|
31
|
-
puts "Retry #{@@timeout} of #{RETRY}"
|
|
32
|
-
if @@timeout <= RETRY
|
|
33
|
-
client_command(base_dir, name, command)
|
|
34
|
-
else
|
|
35
|
-
abort("Socket Timeout: Server may not be responding")
|
|
36
|
-
end
|
|
37
|
-
ensure
|
|
38
|
-
@@timeout = 0
|
|
20
|
+
abort("Socket Timeout: Server may not be responding")
|
|
39
21
|
end
|
|
40
22
|
|
|
41
23
|
def server(base_dir, name)
|
|
@@ -60,8 +42,4 @@ module Bluepill
|
|
|
60
42
|
File.join(base_dir, 'socks', name + ".sock")
|
|
61
43
|
end
|
|
62
44
|
end
|
|
63
|
-
end
|
|
64
|
-
<<<<<<< HEAD
|
|
65
|
-
=======
|
|
66
|
-
|
|
67
|
-
>>>>>>> akzhan
|
|
45
|
+
end
|
data/ra-bluepill.gemspec
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{ra-bluepill}
|
|
8
|
-
s.version = "0.0.
|
|
8
|
+
s.version = "0.0.46"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ra-bluepill
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 67
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 0.0.
|
|
9
|
+
- 46
|
|
10
|
+
version: 0.0.46
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Arya Asemanfar
|