phonehome 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41184947514780cf27a87d13b48703fc36b238a
-  data.tar.gz: e9c63a043e3aede39a5e562ff9da9159342f49f7
+  metadata.gz: 5cd5c2086cd234c4391bb81093686ceae9558443
+  data.tar.gz: 55f5929b7b4c2cb51d9b15ca7d6852de9441cc69
 SHA512:
-  metadata.gz: 479f095f523fa12b2b5db5828baf8164cf6c3bb149ec4538255586fe4a445e39253213bd58a848cbeba80d23b3e7c767526d38e1cae9ef2300fbe2209ce76379
-  data.tar.gz: 6387714f5b459c9e89d6d242502ee36d4497337ac45dac4bb76d28346e74fa5354ed2be12f3e079f024d9dca3d44139255230a996b2f0a023927a2d1e984c32a
+  metadata.gz: 23dd0d7d8ae38e67cd4e9d8c1340c1d849ddd62507226c04c66005f8773165e24a71ea728bc19c8d1d0e80dccd7d834edf229d94ae1e165d64c63a07d2900b70
+  data.tar.gz: b205ea056c5a81e8cc52f934edd6f3eda820e641f8fe48db978ab8775c960cc779de9fd4f7cdba6081ef16bb1291a7294b806c295bcd33a68db2add77f7b192d

data/lib/phonehome/gem/version.rb

@@ -1,5 +1,5 @@
 module Phonehome
   module Gem
-    VERSION = "0.0.24"
+    VERSION = "0.0.25"
   end
 end

data/lib/phonehome.rb

@@ -16,22 +16,15 @@ module Phonehome
         p 'Something goes wrong. Server not responding'
         return false
       end
-      check_secret_key(secret_key)
+      check_secret_key(secret_key){yield}
       user_events = get_user_events(secret_key).split
-      status = 0
-      user_events.each do |val|
-        if id.to_i != val.to_i
-          status += 1   # make +1 for status var if event IT not him
-        else
-          status = 0    # if find correct id break this
-          break
-        end
-      end
-      if status > 0
+      status = user_events.include?(id.to_s) ? true : false
+      if status == false
         p 'You try to run not your event!'                 #  Write error to console
+        yield
         exit
       end
-      start(secret_key, id)  # id - from job, Event
+      start(secret_key, id){yield}  # id - from job, Event
       yield
       stop(@id)    # @id - from API, CurrentEvent
     rescue => e
@@ -49,6 +42,7 @@ module Phonehome
     response = Excon.post("http://#{@@phonehomeURL}/query/#{secret_key}/#{get_status(1)}/#{id}", :headers => { "Content-Type" => "application/json" })
     if JSON.parse(response.body)['status'] == 'All events are completed'
       p "#{id}: All events are completed"
+      yield
       raise "#{id}: All events are completed"
     end
     @id = JSON.parse(response.body)['id']
@@ -85,6 +79,7 @@ module Phonehome
     response = Excon.post("http://#{@@phonehomeURL}/check_secret_key/#{secret_key}")
     if response.data[:body] != 'true'
       p 'Your secret key is invalid!'
+      yield
       exit
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonehome
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - dark-def