phonehome 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba6471963c33751e3050c5b722da8e108e97bbd
-  data.tar.gz: dbb644a75b130d8a73974691beba998823240472
+  metadata.gz: 3f598d6f5bf9e8632d5bd2150b6c8c9e02de2c60
+  data.tar.gz: 68e494dd4fa1a8de605ea45322d7eb4a0b78cb3f
 SHA512:
-  metadata.gz: d0889e3db18ce0a6fd1b71fc753b5bb43d40e987a667fac5e2e6068f070f0a5e9c5d2a692c5acbaee1705220623e94274c0d18510501383140e6c164d14b8d2f
-  data.tar.gz: 38e1ca75947077307e22207a2fdfdb790530123ef0a7660dc076cda5e99f719af9b39bad516145ee5324196d9a3ef7d3cb7922e156b6f9c7e64c31643ed7a125
+  metadata.gz: 46ca272e6fc1f1efbfad5435c6a92adb3cbf901ffae0566c92e428840d88226105cba4313ca5758bf3be8bbeb49a87887a9c4baaa58212248b73e44abb5b967f
+  data.tar.gz: f6a4526a5bef4e17248ae22bd50e2275311c30904dca311e96cb478c9edba33241bb628ef9c286d230a5ab4710eec4d2855ac940d3974cc234b0b5f4818114d0

data/lib/phonehome/gem/version.rb

@@ -1,5 +1,5 @@
 module Phonehome
   module Gem
-    VERSION = "0.0.27"
+    VERSION = "0.0.28"
   end
 end

data/lib/phonehome.rb

@@ -12,12 +12,18 @@ module Phonehome
     @@phonehomeURL = url
   end
 
-  def self.call(secret_key, id)   # id - from job, Event
+  #default debug to true for now
+  @@debugEnabled = true
+  def self.set_debug(debug)
+    @@debugEnabled = debug
+  end
+
+  def self.call(secret_key, id, )   # id - from job, Event
     begin
       debug("Checking connection")
       result = check_connection?{yield}
       if result == false
-        p 'Phonehome not responding'
+        puts('Phonehome not responding')
         return false
       end
       debug("Checking secret key")
@@ -26,7 +32,7 @@ module Phonehome
       user_events = get_user_events(secret_key).split
       status = user_events.include?(id.to_s) ? true : false
       if status == false
-        p 'You try to run not your event!'                 #  Write error to console
+        puts('You try to run not your event!')                 #  Write error to console
         yield
         exit
       end
@@ -48,11 +54,12 @@ module Phonehome
   end
 
   def self.start(secret_key, id)  # id - from job, Event
+    debug("Starting #{secret_key} #{id}")
     begin_time = Time.now
     app_name = get_app_name(id)
     response = excon_post_json("http://#{@@phonehomeURL}/query/#{secret_key}/#{get_status(1)}/#{id}")
     if JSON.parse(response.body)['status'] == 'All events are completed'
-      p "#{id}: All events are completed"
+      puts "#{id}: All events are completed"
       yield
       raise "#{id}: All events are completed"
     end
@@ -60,10 +67,12 @@ module Phonehome
     job_info = JobInfo.new(JSON.parse(response.body)['id'], JSON.parse(response.body)['status'], begin_time)
     @events_info[id] = job_info
 
+    debug("job info #{id} #{job_info}")
     job_info
   end
 
   def self.stop(id,result_of_work = nil)
+    debug("Stopping #{id}")
     finish = Time.now
     status = 'completed'
 
@@ -73,20 +82,24 @@ module Phonehome
         status = 'late_completed'
       end
 
+      debug("Stopping #{id} #{status}")
+
       text = "#{finish.to_i - job_info.begin_time.to_i} secs"
       if (result_of_work.nil?)
         # text = 
       else
         text = result_of_work.to_s + " (" + text + ")"
       end
+      debug("Stopping text.size #{text.size}")
       excon_post("http://#{@@phonehomeURL}/query_update/#{job_info.api_job_id}/#{status}/#{URI.encode_www_form('result' => text)}")
     else
-      puts "Event with id '#{id}' not found in events_info"
+      debug("Event with id '#{id}' not found in events_info")
       pp events_info
     end
   end
 
   def self.send_error(id, e) 
+    debug("Error #{id}")
     if @events_info.include?(id)
       job_info = @events_info[id]
       excon_post("http://#{@@phonehomeURL}/query_update/#{job_info.api_job_id}/failed/#{URI.encode_www_form('error' => e)}")
@@ -107,7 +120,7 @@ module Phonehome
   def self.check_secret_key(secret_key)
     response = excon_post("http://#{@@phonehomeURL}/check_secret_key/#{secret_key}")
     if response.data[:body] != 'true'
-      p 'Your secret key is invalid!'
+      puts 'Your secret key is invalid!'
       yield
       exit
     end
@@ -117,7 +130,7 @@ module Phonehome
     begin
       response = excon_get("http://#{@@phonehomeURL}")
     rescue Excon::Errors::SocketError => error
-      p "#{error} - Server not responding"
+      puts "#{error} - Server not responding"
       sleep(5)
       retry
     end
@@ -137,18 +150,21 @@ module Phonehome
     end
   end
 
+  #add retry logic
   def self.excon_post(url)
-    debug("Excon.post #{url}")
+    debug("POST #{url}")
     Excon.post(url)
   end
 
+  #add retry logic
   def self.excon_post_json(url)
-    debug("Excon.post JSON #{url}")
+    debug("POST JSON #{url}")
     Excon.post(url, :headers => { "Content-Type" => "application/json" })
   end
 
+  #add retry logic
   def self.excon_get(url)
-    debug("Excon.get #{url}")
+    debug("POST #{url}")
     Excon.get(url)
   end
 
@@ -161,7 +177,9 @@ module Phonehome
   end
 
   def self.debug(message)
-    # puts("DEBUG:"+message)
+    if @@debugEnabled
+      puts("PH:DEBUG:"+message)
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonehome
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - info@phonehome.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler