phonehome 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae88ed1894ff2c8034cbd2f747c4aa596661182e
-  data.tar.gz: 9cd63e1f42b1f931c46ba4ac89a505f883139589
+  metadata.gz: cddc0419d2138d454a921436a1af822ae30120b7
+  data.tar.gz: 0b654027d02a3b6d9b10cfb0d02a9240d1c3582d
 SHA512:
-  metadata.gz: 803a6247e3ddbb94bef916a830fdb64f976e9b653c72d2ded132855d226cf2dc31d076d172643cfa5abee2444db0fe3c5d75185af20195bbcc8ac12cc57e310b
-  data.tar.gz: 1a8563dc8a9597d61827c31d8bd7a3496778a951b8623dde5f17e231828c6c25b3e61fe6eabbe13ab29e7bb3e44fb93f78f4ff491fb3df13a285f03e72ae4e15
+  metadata.gz: 110cbea089b9a8f592b1a5c449b31e0e6406d9e9f7d600867941857251c4bb411a927b5f35723b49b4ba53e6e29034d96387568481c9ef2f321667cdc00e7097
+  data.tar.gz: 5fd3ff3fa7359670512c12e14600ee81802b1109247a54c2d8ba6407f44e320945783f771c94fde04a487c68fa5ee2be4c3e7e7e975cc303c3ca9926d086676c

data/lib/phonehome/gem/version.rb

@@ -1,5 +1,5 @@
 module Phonehome
   module Gem
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
   end
 end

data/lib/phonehome.rb

@@ -13,7 +13,11 @@ module Phonehome
 
   def self.call(secret_key, id)   # id - from job, Event
     begin
-      check_connection
+      result = check_connection?{yield}
+      if result == false
+        p 'Something goes wrong. Server not responding'
+        return false
+      end
       check_secret_key(secret_key)
       user_events = get_user_events(secret_key).split
       status = 0
@@ -31,7 +35,6 @@ module Phonehome
       end
       retuned_id = start(secret_key, id)  # id - from job, Event
       yield
-      #raise 'ATATATA'
       stop(retuned_id)    # @id - from API, CurrentEvent
     rescue => e
       send_error(retuned_id, e)  # @id - from API, CurrentEvent
@@ -88,6 +91,20 @@ module Phonehome
     end
   end
 
+  def self.check_connection?                                   # check connection with server
+    begin
+      response = Excon.get("http://#{@@phonehomeURL}")         # if all ok, return true
+      return true                                              # and continue run code
+    rescue Excon::Errors::SocketError => error                 # if server is offline
+      begin                                                    # don't know why, but here got exception
+        yield                                                  # and fix it by rescue
+      rescue
+        return false
+      end
+      return false                                             # return false and stop running code
+    end
+  end
+
   def self.get_status(type)
     if type == 1
       return 'working'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonehome
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - dark-def
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Write a gem summary