netsoul 0.5.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c63a4a266613cfd391300dc3b956822ee76fd66
-  data.tar.gz: 3186372ef1119950c82d7484f70e81819a097060
+  metadata.gz: fc986dc3e21a355d48e3e08494dc8f8e20f8e10b
+  data.tar.gz: 11cfd33d73a5aa6ce747a6d6366d527d5dd390cc
 SHA512:
-  metadata.gz: 4811496fc6e71bc5557485592e9ee4fa198b142a148f9498cf92419904f4fd60641c6fa7b94607b8f251cdcbee390f113d2002fe2d34eb3185623e8a20c5a84b
-  data.tar.gz: 1700b440b9c802256d3949ff56473bfc7044c0e5ccbac251da46d7d24faa7494eaf647b05a55d4ca1277adf44971e8b8088db1ce3f658eaef23c4d7c4edd9930
+  metadata.gz: 538ccf6b1c16631a498b33c9f9b8b1dc97f16e04808d522a1b9b8872d8bf3dde24648d3bbcd4f23b3c2c76f58762860adc859130f7a99abfaf37d35d622ff956
+  data.tar.gz: f6f9e1d42043ec7c64215a0827f65e2b5d3ccdc76d97306b50bf1ad4b4f2293527e04d00dbda16c78c539ee01a9f6fce99ff195422f85ecc8f3627a0b087cf89

data/bin/netsoul-ruby

@@ -112,12 +112,30 @@ unless options.include?(:config)
   exit
 end
 
-c = Netsoul::Client.new options[:user_opts]
-c.connect
-if c.started
-  loop do
-    res = c.sock_get
-    c.sock_send res if res.to_s.match(/^ping.*/)
-    sleep 1
+retry_count = 10
+retry_wait_time = 1.0
+RETRY_WAIT_FACTOR = 1.25 # Each time retry is called 'retry_wait_time' is increased with this factor
+begin
+  c = Netsoul::Client.new options[:user_opts]
+  c.connect
+  if c.started
+    retry_count = 10
+    retry_wait_time = 1.0
+    loop do
+      res = c.sock_get
+      c.sock_send res if res.to_s.match(/^ping.*/)
+      sleep 1
+    end
+  end
+rescue => e
+  puts "[ERROR]: #{e}"
+  puts "[RETRY_COUNT]: #{retry_count}"
+  c.disconnect
+  c = nil
+  if retry_count > 0
+    retry_count -= 1
+    retry_wait_time *= RETRY_WAIT_FACTOR
+    sleep retry_count
+    retry
   end
 end

data/lib/netsoul/message.rb

@@ -21,6 +21,7 @@ module Netsoul
         "ext_user_log #{config.login} #{_standard_auth_string(config)} #{client_name} #{location}"
       end
 
+      # :nocov:
       def _kerberos_get
         @netsoul_kerberos ||= NetsoulKerberos.new
       rescue LoadError => e
@@ -42,6 +43,7 @@ module Netsoul
         end
         _kerberos_auth_klog(config)
       end
+      # :nocov:
 
       def auth_ag
         'auth_ag ext_user none none'.freeze
@@ -84,35 +86,19 @@ module Netsoul
       end
 
       def xfer(user, id, filename, size, desc)
-        "user_cmd msg_user #{user} desoul_ns_xfer #{Message._escape("#{id} #{filename} #{size} #{desc}")}"
-      end
-
-      def desoul_ns_xfer(user, id, filename, size, desc)
-        xfer(user, id, filename, size, desc)
+        "user_cmd msg_user #{user} xfer #{Message._escape("#{id} #{filename} #{size} #{desc}")}"
       end
 
       def xfer_accept(user, id)
-        "user_cmd msg_user #{user} desoul_ns_xfer_accept #{id}"
-      end
-
-      def desoul_ns_xfer_accept(user, id)
-        xfer_accept(user, id)
+        "user_cmd msg_user #{user} xfer_accept #{id}"
       end
 
       def xfer_data(user, id, data)
-        "user_cmd msg_user #{user} desoul_ns_xfer_data #{Message._escape("#{id} #{Base64.b64encode(data.to_s, data.to_s.length)}")}"
-      end
-
-      def desoul_ns_xfer_data(user, id, data)
-        xfer_data(user, id, data)
+        "user_cmd msg_user #{user} xfer_data #{Message._escape("#{id} #{Base64.encode64(data.to_s)}")}"
       end
 
       def xfer_cancel(user, id)
-        "user_cmd msg_user #{user} desoul_ns_xfer_cancel #{id}"
-      end
-
-      def desoul_ns_xfer_cancel(user, id)
-        xfer_cancel(user, id)
+        "user_cmd msg_user #{user} xfer_cancel #{id}"
       end
 
       def ping

data/lib/netsoul/version.rb

@@ -1,3 +1,3 @@
 module Netsoul
-  VERSION = '0.5.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netsoul
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Christian Kakesa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler