downtime 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTdlODVlYzBjNzY0ZWU0NjFlMjUwOWNkOGVlZjc3MTgyMDQyYzJiNA==
-  data.tar.gz: !binary |-
-    ZDM1MGM3MDA5MTJhNTc2OTVjNDNhMjIxM2FkYjllMDdkZDEwYWVhYg==
+SHA1:
+  metadata.gz: e98457b64dba43ca15dabec94cf3020542e19760
+  data.tar.gz: 3d36aeafe269ea93ead1aa77e960043e2fd4bb76
 SHA512:
-  metadata.gz: !binary |-
-    MmQ1YzQzYjc1ODgzNGI4NGNiOGNjZDk5ZDkyN2IzZGY2NWE3MDllNzE0MWY3
-    ZGNjZjRiNjA1ZWQ2ZDg0MzJmZWU3ZDUwMTE5MmM3NjVkNmUxNmE1OTI5YzM3
-    ZjZkMzNjMWZhYTJhOTM3ZmQ0NmU4ZTE1MTFlMTc2OGUxOTFlZDQ=
-  data.tar.gz: !binary |-
-    NDZkODQwOGU3YmVjMTJkZmFhYmJlZDY0YTFjNTc1NTEzYzZjN2QxNTZkNzEy
-    MTViYTU2YzVkZTkwMmFmNDJiZTUxOTkwZDBiMWI0NTIwMDE4NmJlMmQ0Mzli
-    ZjZjZWNkMzAzYmNlNjhhYjYxZGQ1YjdjMDFkY2E3OWJhMmM1MGE=
+  metadata.gz: 982921b1f752759e99d3e4e763b67e8d0b267d9ee34d9d33ea844696a732fa9f06e094a197eef206291ecded511eaa0afe8440ad6b21197c5243ecfdef5bde3b
+  data.tar.gz: 816122b302e54164f33a23c2fbd737b93b3311ee180e33805846a4516f12008d3a1bd93bc62b981d2c02f99f410d7fd493723964eafb7c9bcb92d4fe430e8cf1

data/README.md

@@ -1,6 +1,6 @@
 # Downtime
 
-`downtime` checks your connection to a host (`8.8.8.8`) and aggregates the up- or downtimes (connection or no connection) in  a file in a human readable format.  Connection is made via a call to `dig +time=1 +tries=1 8.8.8.8`, so your ruby process needs to be able to call that command - although it would be really easy to change which tool is used.
+`downtime` checks your connection to a host (`8.8.8.8`) and aggregates the up- or downtimes (connection or no connection) in  a file in a human readable format.  Connection is made via a call to `dig +time=1 +tries=1 8.8.8.8` and `wget -q -t 1 --timeout 1 --spider http://siebenlinden.de`, so your ruby process needs to be able to call that command - although it would be really easy to change which tool is used.
 
 It was made to track e.g. outages of your ISP.
 
@@ -25,9 +25,9 @@ Or install it yourself as:
 ## Usage
 
 Call as `downtime`.
-It will create a `downtime.log` file in the current working directory.
+It will create a `downtime_wget.log` and a `downtime_dig.log` file in the current working directory.
 
-The file (`downtime.log`) will look like this:
+The files (`downtime_*.log`) will look like this:
 
     # This file was generated by the downtime ruby gem.
     2015-01-01-10-22 up till 2015-01-02-08-10 (1000 minutes)

data/lib/downtime.rb

@@ -3,26 +3,34 @@ require "downtime/timestamp"
 
 module Downtime
   class DowntimeCheck
+    attr_accessor :ip
     attr_accessor :host
     attr_accessor :log_file
 
     def initialize
-      @host = "8.8.8.8"
-      @log_file = "downtime.log"
+      @ip = "8.8.8.8"
+      @host = "http://siebenlinden.de"
+      @log_file_dig = "downtime_dig.log"
+      @log_file_wget = "downtime_wget.log"
     end
 
     def perform
-      ensure_logfile
+      ensure_logfiles
       timestamp!
-      check_and_update_file
+      check_and_update_files
     end
 
     private
 
-    def check_and_update_file
-      lines = File.readlines @log_file
+    def check_and_update_files
+      check_and_update_file(@log_file_dig, &method(:is_up_dig?))
+      check_and_update_file(@log_file_wget, &method(:is_up_wget?))
+    end
+
+    def check_and_update_file(log_file, &check_mthd)
+      lines = File.readlines log_file
       was_down = lines[-1] =~ /down/
-      up = is_up?
+      up = check_mthd.call
       minutes = 0
       if lines.length > 1
         first_timestamp = lines[-1][/^[0-9-]*/]
@@ -50,29 +58,38 @@ module Downtime
           lines << "#{@timestamp} down till #{@timestamp}"
         end
       end
-      File.open(@log_file, 'w') do |f|
+      File.open(log_file, 'w') do |f|
         f.puts lines
       end
       up
     end
 
-    def is_up? host=nil
-      host = @host if host.nil?
-      dig = `dig +time=1 +tries=1 #{host}`
+    def is_up_dig? ip=nil
+      ip = @ip if ip.nil?
+      dig = `dig +time=1 +tries=1 #{ip}`
       dig.lines.find {|l| l =~ /time.*ms/}
     end
 
-    def ensure_logfile
-      return if File.exist? @log_file
-      append_to_logfile "# This file is created by the downtime #{Downtime::VERSION} ruby gem."
+    def is_up_wget? host=nil
+      host = @host if host.nil?
+      wget = `wget -q -t 1 --timeout 1 --spider #{host}`
+      return $?.exitstatus
+    end
+
+    def ensure_logfiles
+      return if(File.exist?(@log_file_dig) && File.exist?(@log_file_wget))
+      append_to_logfiles "# This file is created by the downtime #{Downtime::VERSION} ruby gem."
     end
 
     def timestamp!
       @timestamp = Timestamp.new
     end
 
-    def append_to_logfile text
-      File.open(@log_file, 'a') do |f|
+    def append_to_logfiles text
+      File.open(@log_file_wget, 'a') do |f|
+        f.puts text
+      end
+      File.open(@log_file_dig, 'a') do |f|
         f.puts text
       end
     end

data/lib/downtime/version.rb

@@ -1,3 +1,3 @@
 module Downtime
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: downtime
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Calls dig and updates up- and downtime information
@@ -46,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,17 +67,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.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Monitors your internet connection