phonehome 0.0.14 → 0.0.15

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ae88ed1894ff2c8034cbd2f747c4aa596661182e
4
- data.tar.gz: 9cd63e1f42b1f931c46ba4ac89a505f883139589
3
+ metadata.gz: cddc0419d2138d454a921436a1af822ae30120b7
4
+ data.tar.gz: 0b654027d02a3b6d9b10cfb0d02a9240d1c3582d
5
5
  SHA512:
6
- metadata.gz: 803a6247e3ddbb94bef916a830fdb64f976e9b653c72d2ded132855d226cf2dc31d076d172643cfa5abee2444db0fe3c5d75185af20195bbcc8ac12cc57e310b
7
- data.tar.gz: 1a8563dc8a9597d61827c31d8bd7a3496778a951b8623dde5f17e231828c6c25b3e61fe6eabbe13ab29e7bb3e44fb93f78f4ff491fb3df13a285f03e72ae4e15
6
+ metadata.gz: 110cbea089b9a8f592b1a5c449b31e0e6406d9e9f7d600867941857251c4bb411a927b5f35723b49b4ba53e6e29034d96387568481c9ef2f321667cdc00e7097
7
+ data.tar.gz: 5fd3ff3fa7359670512c12e14600ee81802b1109247a54c2d8ba6407f44e320945783f771c94fde04a487c68fa5ee2be4c3e7e7e975cc303c3ca9926d086676c
@@ -1,5 +1,5 @@
1
1
  module Phonehome
2
2
  module Gem
3
- VERSION = "0.0.14"
3
+ VERSION = "0.0.15"
4
4
  end
5
5
  end
data/lib/phonehome.rb CHANGED
@@ -13,7 +13,11 @@ module Phonehome
13
13
 
14
14
  def self.call(secret_key, id) # id - from job, Event
15
15
  begin
16
- check_connection
16
+ result = check_connection?{yield}
17
+ if result == false
18
+ p 'Something goes wrong. Server not responding'
19
+ return false
20
+ end
17
21
  check_secret_key(secret_key)
18
22
  user_events = get_user_events(secret_key).split
19
23
  status = 0
@@ -31,7 +35,6 @@ module Phonehome
31
35
  end
32
36
  retuned_id = start(secret_key, id) # id - from job, Event
33
37
  yield
34
- #raise 'ATATATA'
35
38
  stop(retuned_id) # @id - from API, CurrentEvent
36
39
  rescue => e
37
40
  send_error(retuned_id, e) # @id - from API, CurrentEvent
@@ -88,6 +91,20 @@ module Phonehome
88
91
  end
89
92
  end
90
93
 
94
+ def self.check_connection? # check connection with server
95
+ begin
96
+ response = Excon.get("http://#{@@phonehomeURL}") # if all ok, return true
97
+ return true # and continue run code
98
+ rescue Excon::Errors::SocketError => error # if server is offline
99
+ begin # don't know why, but here got exception
100
+ yield # and fix it by rescue
101
+ rescue
102
+ return false
103
+ end
104
+ return false # return false and stop running code
105
+ end
106
+ end
107
+
91
108
  def self.get_status(type)
92
109
  if type == 1
93
110
  return 'working'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phonehome
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - dark-def
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-23 00:00:00.000000000 Z
11
+ date: 2014-01-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
73
73
  version: '0'
74
74
  requirements: []
75
75
  rubyforge_project:
76
- rubygems_version: 2.1.11
76
+ rubygems_version: 2.0.0
77
77
  signing_key:
78
78
  specification_version: 4
79
79
  summary: Write a gem summary