ra-bluepill 0.0.45 → 0.0.46

data/VERSION

@@ -1 +1 @@
-0.0.45
+0.0.46

data/lib/bluepill/socket.rb

@@ -2,12 +2,6 @@ require 'socket'
 
 module Bluepill
   module Socket
-<<<<<<< HEAD
-    TIMEOUT = 10
-    RETRY = 5
-    @@timeout = 0
-=======
->>>>>>> akzhan
 
     extend self
 
@@ -15,11 +9,7 @@ module Bluepill
       UNIXSocket.open(socket_path(base_dir, name), &b)
     end
 
-<<<<<<< HEAD
-    def client_command(base_dir, name, command)
-=======
     def client_command(base_dir, name, command, timeout)
->>>>>>> akzhan
       client(base_dir, name) do |socket|
         Timeout.timeout(timeout) do
           socket.puts command
@@ -27,15 +17,7 @@ module Bluepill
         end
       end
     rescue EOFError, Timeout::Error
-      @@timeout += 1
-      puts "Retry #{@@timeout} of #{RETRY}"
-      if @@timeout <= RETRY
-        client_command(base_dir, name, command)
-      else
-        abort("Socket Timeout: Server may not be responding")
-      end
-    ensure
-      @@timeout = 0
+      abort("Socket Timeout: Server may not be responding")
     end
 
     def server(base_dir, name)
@@ -60,8 +42,4 @@ module Bluepill
       File.join(base_dir, 'socks', name + ".sock")
     end
   end
-end
-<<<<<<< HEAD
-=======
-
->>>>>>> akzhan
+end

data/ra-bluepill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ra-bluepill}
-  s.version = "0.0.45"
+  s.version = "0.0.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ra-bluepill
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 67
   prerelease: 
   segments: 
   - 0
   - 0
-  - 45
-  version: 0.0.45
+  - 46
+  version: 0.0.46
 platform: ruby
 authors: 
 - Arya Asemanfar