phonehome 0.0.15 → 0.0.18

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in phonehome-gem.gemspec
 gemspec
 
-gem 'excon'    # For HTTP request
+gem 'excon'    # For HTTP request
+gem 'json'

data/lib/phonehome/gem/version.rb

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

data/lib/phonehome.rb

@@ -1,5 +1,6 @@
 require 'phonehome/gem/version'
 require 'excon'
+require 'json'
 
 module Phonehome
   #module Gem
@@ -33,11 +34,11 @@ module Phonehome
         p 'You try to run not your event!'                 #  Write error to console
         raise 'It is not your event id!'                   #
       end
-      retuned_id = start(secret_key, id)  # id - from job, Event
+      start(secret_key, id)  # id - from job, Event
       yield
-      stop(retuned_id)    # @id - from API, CurrentEvent
+      stop(@id)    # @id - from API, CurrentEvent
     rescue => e
-      send_error(retuned_id, e)  # @id - from API, CurrentEvent
+      send_error(@id, e)  # @id - from API, CurrentEvent
     end
   end
 
@@ -45,17 +46,25 @@ module Phonehome
     @begin = Time.now
     app_name = get_app_name(id)
     response = Excon.post("http://#{@@phonehomeURL}/query/#{secret_key}/#{get_status(1)}/#{id}", :headers => { "Content-Type" => "application/json" })
-    if response.data[:body].to_i == 0
-      p "#{id}: #{response.data[:body]}"
-      raise response.data[:body]
+    if JSON.parse(response.body).status == 'All events are completed'
+      p "#{id}: All events are completed"
+      raise JSON.parse(response.body).status
     end
-    return response.data[:body].to_i
+    @id = JSON.parse(response.body).id
+    @status = JSON.parse(response.body).status
+
   end
 
   def self.stop(id)   # @id - from API, CurrentEvent
     finish = Time.now
+    status = 'completed'
+    if @status == 'late'
+      status = 'late_completed'
+    end
+
+
     text = "#{finish.to_i - @begin.to_i} seconds"
-    Excon.post("http://#{@@phonehomeURL}/query_update/#{id}/completed/#{URI.encode_www_form('result' => text)}")
+    Excon.post("http://#{@@phonehomeURL}/query_update/#{id}/#{status}/#{URI.encode_www_form('result' => text)}")
   end
 
   def self.send_error(id, e)  # @id - from API, CurrentEvent

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: phonehome
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.18
+  prerelease: 
 platform: ruby
 authors:
 - dark-def
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,15 +30,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Connet to PhoneHome.io database
@@ -56,25 +61,26 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Write a gem summary
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cddc0419d2138d454a921436a1af822ae30120b7
-  data.tar.gz: 0b654027d02a3b6d9b10cfb0d02a9240d1c3582d
-SHA512:
-  metadata.gz: 110cbea089b9a8f592b1a5c449b31e0e6406d9e9f7d600867941857251c4bb411a927b5f35723b49b4ba53e6e29034d96387568481c9ef2f321667cdc00e7097
-  data.tar.gz: 5fd3ff3fa7359670512c12e14600ee81802b1109247a54c2d8ba6407f44e320945783f771c94fde04a487c68fa5ee2be4c3e7e7e975cc303c3ca9926d086676c