netsoul 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18956ab4765a66c693fc499b6d138470c59ac880
-  data.tar.gz: 4b2b2b798f9b1dc064fcf13bf3d638d4842f581a
+  metadata.gz: b99b928d22287e2b32f8072fdc80c950dd8212f5
+  data.tar.gz: e8f00b15db4357d483e8a31d2a23876bd9ae0558
 SHA512:
-  metadata.gz: 7ed7f9ab024602be28b0a5ddd898821d6854ae9c43776a70f792cb1171b7a9243f63fcd3a558f79c92cb4963351a08c19cd9fc15cf13fb3729ebd4cab08874e0
-  data.tar.gz: 79511f1c3e8789e4f8cfde8772a3b7f3b5555f60deca93195d9fffff928152faf6dcbafb0ea713ff14cdf52db00f52649d084f1f5b052690477ba4095e663ba0
+  metadata.gz: 1ee9895ef54494577f0245efb436ef9bc430110898f7f6ecf8a3b53ddb3a7063beeb2ee4052234933002602f4c52c7cd2811e02dff20a410d5628520a869c170
+  data.tar.gz: 07fc1f812a9c2655ad1fb052da3d27b58bbeb5615b98f0f20d9deb6da9ff4958d4e175dd9ae5b8d2864899971dda484a974773d3d54bfb64b7381722e8258efe

data/bin/netsoul-ruby

@@ -2,8 +2,8 @@
 # encoding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../../lib', __FILE__)
-$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+lib = File.join(File.dirname(File.realpath(__FILE__)), '..', 'lib')
+$LOAD_PATH.unshift File.expand_path(lib)
 
 require 'netsoul/client'
 
@@ -37,6 +37,15 @@ if options.empty? || options[:user_opts].size == 0
   end
 end
 
+def trap_interrupt(client)
+  Signal.trap('INT'.freeze) do
+    exit 42 unless client.started
+    begin client.disconnect; end
+    puts '!!! [SIGINT] !!!'.freeze
+    exit 42
+  end
+end
+
 retry_count = 10
 retry_wait_time = 1.0
 RETRY_WAIT_FACTOR = 2.0 # Each time retry is called in Exception block, current 'retry_wait_time' is increased with this factor
@@ -44,6 +53,7 @@ begin
   c = Netsoul::Client.new options[:user_opts]
   c.connect
   if c.started
+    trap_interrupt c
     retry_count = 10
     retry_wait_time = 1.0
     loop do
@@ -52,10 +62,6 @@ begin
       sleep 1
     end
   end
-rescue Interrupt
-  begin c.disconnect; end
-  puts '!!! [SIGINT] !!!'.freeze
-  exit 42
 rescue => e
   puts "[ERROR]: #{e}"
   puts "[RETRY_COUNT]: #{retry_count}"

data/lib/netsoul/client.rb

@@ -68,9 +68,6 @@ module Netsoul
         s.flush
       end
       log :info, "[send] #{str.chomp}"
-    rescue Errno::EPIPE
-      disconnect
-      connect
     end
 
     def get
@@ -83,16 +80,12 @@ module Netsoul
       else
         'nothing'.freeze # Send some string and permit IO.select to thrown exception if something goes wrong.
       end
-    rescue Errno::EPIPE
-      disconnect
-      connect
     end
 
     def close
-      @started = false
       @socket.close
-    rescue
-      nil
+    ensure
+      @started = false
     end
   end
 end

data/lib/netsoul/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Netsoul
-  VERSION = '2.3.5'.freeze
+  VERSION = '2.3.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netsoul
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Christian Kakesa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler