phonehome 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cd5c2086cd234c4391bb81093686ceae9558443
-  data.tar.gz: 55f5929b7b4c2cb51d9b15ca7d6852de9441cc69
+  metadata.gz: d840a6b929ac6c798bc898818de84bd93f2a387c
+  data.tar.gz: 9e31de432f8cc6d9b550ead94ddf1e072ee27b92
 SHA512:
-  metadata.gz: 23dd0d7d8ae38e67cd4e9d8c1340c1d849ddd62507226c04c66005f8773165e24a71ea728bc19c8d1d0e80dccd7d834edf229d94ae1e165d64c63a07d2900b70
-  data.tar.gz: b205ea056c5a81e8cc52f934edd6f3eda820e641f8fe48db978ab8775c960cc779de9fd4f7cdba6081ef16bb1291a7294b806c295bcd33a68db2add77f7b192d
+  metadata.gz: 83bd87d18b375223a41fbb3dd0397711fdc23fac9e05a4f60838b8ab0d510dca73ae03865b1f7d2f00b6939f617bae744e45637617dd46601a60ad62ffa596aa
+  data.tar.gz: ce8b098dff15356a115a77c20983e15da8babad2003b863354cf82daa6e3e8305cbeecd6ebe0f39ea85b7dbb432bf41fb2a8f6a6f924b3506ffaf31ac1a7d8db

data/.gitignore

@@ -1,18 +1,18 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-/.idea
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+/.idea

data/Gemfile

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

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2013 dark-def
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2013 dark-def
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,29 +1,29 @@
-# Phonehome::Gem
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'phonehome-gem'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install phonehome-gem
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# Phonehome::Gem
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'phonehome-gem'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install phonehome-gem
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/lib/phonehome/gem/version.rb

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

data/lib/phonehome.rb

@@ -1,119 +1,137 @@
-require 'phonehome/gem/version'
-require 'excon'
-require 'json'
-
-module Phonehome
-
-  @@phonehomeURL = 'phonehome.io'
-  def self.set_url(url)
-    @@phonehomeURL = url
-  end
-
-  def self.call(secret_key, id)   # id - from job, Event
-    begin
-      result = check_connection?{yield}
-      if result == false
-        p 'Something goes wrong. Server not responding'
-        return false
-      end
-      check_secret_key(secret_key){yield}
-      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
-        yield
-        exit
-      end
-      start(secret_key, id){yield}  # id - from job, Event
-      yield
-      stop(@id)    # @id - from API, CurrentEvent
-    rescue => e
-      if e.class == RuntimeError && e.to_s =~ /All events are completed/
-        return false
-      else
-        send_error(@id, e)  # @id - from API, CurrentEvent
-      end
-    end
-  end
-
-  def self.start(secret_key, id)  # id - from job, Event
-    @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 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']
-    @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}/#{status}/#{URI.encode_www_form('result' => text)}")
-  end
-
-  def self.send_error(id, e)  # @id - from API, CurrentEvent
-    Excon.post("http://#{@@phonehomeURL}/query_update/#{id}/failed/#{URI.encode_www_form('error' => e)}")
-  end
-
-  def self.get_app_name(id)
-    response = Excon.post("http://#{@@phonehomeURL}/get_name/#{id}", :headers => { "Content-Type" => "application/json" })
-    return response.data[:body]
-  end
-
-  def self.get_user_events(secret_key)
-    response = Excon.post("http://#{@@phonehomeURL}/get_user_event/#{secret_key}")
-    response.data[:body]
-    return response.data[:body]
-  end
-
-  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!'
-      yield
-      exit
-    end
-  end
-
-  def self.check_connection
-    begin
-      response = Excon.get("http://#{@@phonehomeURL}")
-    rescue Excon::Errors::SocketError => error
-      p "#{error} - Server not responding"
-      sleep(5)
-      retry
-    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'
-    else
-      return 'completed'
-    end
-  end
-
-end
+require 'phonehome/gem/version'
+require 'excon'
+require 'json'
+
+module Phonehome
+
+  JobInfo = Struct.new(:api_job_id, :status, :begin_time)
+  @events_info = {} # {job_id, [JobInfo]}
+
+  @@phonehomeURL = "phonehome.io"
+  def self.set_url(url)
+    @@phonehomeURL = url
+  end
+
+  def self.call(secret_key, id)   # id - from job, Event
+    begin
+      result = check_connection?{yield}
+      if result == false
+        p 'Something goes wrong. Server not responding'
+        return false
+      end
+      check_secret_key(secret_key){yield}
+      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
+        yield
+        exit
+      end
+      start(secret_key, id){yield}  # id - from job, Event
+      yield
+      stop(id)
+    rescue => e
+      if e.class == RuntimeError && e.to_s =~ /All events are completed/
+        return false
+      else
+        send_error(id, e)  # id - from API, CurrentEvent
+        # Let the calling method know what happenned
+        raise e
+      end
+    end
+  end
+
+  def self.start(secret_key, id)  # id - from job, Event
+    begin_time = 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 JSON.parse(response.body)['status'] == 'All events are completed'
+      p "#{id}: All events are completed"
+      yield
+      raise "#{id}: All events are completed"
+    end
+    
+    job_info = JobInfo.new(JSON.parse(response.body)['id'], JSON.parse(response.body)['status'], begin_time)
+    @events_info[id] = job_info
+
+    job_info
+  end
+
+  def self.stop(id)
+    finish = Time.now
+    status = 'completed'
+
+    if @events_info.include?(id)
+      job_info = @events_info[id]
+      if job_info.status == 'late'
+        status = 'late_completed'
+      end
+
+      text = "#{finish.to_i - job_info.begin_time.to_i} seconds"
+      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"
+      pp events_info
+    end
+  end
+
+  def self.send_error(id, e) 
+    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)}")
+    end
+  end
+
+  def self.get_app_name(id)
+    response = Excon.post("http://#{@@phonehomeURL}/get_name/#{id}", :headers => { "Content-Type" => "application/json" })
+    return response.data[:body]
+  end
+
+  def self.get_user_events(secret_key)
+    response = Excon.post("http://#{@@phonehomeURL}/get_user_event/#{secret_key}")
+    response.data[:body]
+    return response.data[:body]
+  end
+
+  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!'
+      yield
+      exit
+    end
+  end
+
+  def self.check_connection
+    begin
+      response = Excon.get("http://#{@@phonehomeURL}")
+    rescue Excon::Errors::SocketError => error
+      p "#{error} - Server not responding"
+      sleep(5)
+      retry
+    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'
+    else
+      return 'completed'
+    end
+  end
+
+end

data/phonehome-gem.gemspec

@@ -1,23 +1,23 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'phonehome/gem/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "phonehome"
-  spec.version       = Phonehome::Gem::VERSION
-  spec.authors       = ["dark-def"]
-  spec.email         = ["drkmen@rambler.ru"]
-  spec.description   = 'Connet to PhoneHome.io database'
-  spec.summary       = 'Write a gem summary'
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'phonehome/gem/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "phonehome"
+  spec.version       = Phonehome::Gem::VERSION
+  spec.authors       = ["info@phonehome.io"]
+  spec.email         = ["info@phonehome.io"]
+  spec.description   = 'Connect to PhoneHome.io database'
+  spec.summary       = 'Write a gem summary'
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,51 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: phonehome
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
-- dark-def
+- info@phonehome.io
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Connet to PhoneHome.io database
+description: Connect to PhoneHome.io database
 email:
-- drkmen@rambler.ru
+- info@phonehome.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -63,17 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Write a gem summary