zombie_check 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da130e4c71bccc19171d3c39de7aaffa673bb31b
-  data.tar.gz: 2638fd4b6a1327b88db32ad533bf20f54390cac3
+  metadata.gz: 374bf645f5a31e6318793a994e89349b76882741
+  data.tar.gz: 3b43fc59457bede9cc2944cf72b6953f3a4edadb
 SHA512:
-  metadata.gz: fec0d2135d0c1033f7d7c806c0a958004243351ead9935032d2c172e72f6b7b4083d72fb7505449297a214dbeb1ce1c4902526ec9f2e718be4acd09720561564
-  data.tar.gz: 020caad88071704c47982ff2cd5a46fdee7bc774d80840f73748afa7a1fe45e9a906e2c92e1c57d49fdf2f28f86c98cf78ea7333779bf3ef2e81bdb428a880f1
+  metadata.gz: 93edb259e776a4a114f39f0180fac2a34a330883738fcf43ad90ca6db9104a5c9f5a5caa2d9f4cab5467c9ea7d1f59d9bb0e5a4c71b01332031c555739d35974
+  data.tar.gz: b022d2c72a2a18f93baf453a1a1a4450d0ada188abfc9dbe53fae7c2a087c28614f75c66f11a3424b469f69b80d5b6a6fe7a26c7c03bf87809486bb08c626c6c

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /tmp/*
 /.idea/
+*.gem

data/README.md

@@ -43,3 +43,16 @@ Password: xxx
  В данном виде, на бесконечном отрезке времени прога сожрет всю память. Я вкурсе, если это важно- поправлю.
 
  Если нужны тесты- приделаю. 
+
+ Ввиду net-ping тесты придется стартовать под `sudo -i`. 
+
+## UPDATED
+
+Приделал тесты. Прошу учесть, что feature спеки хотят `sudo -i`. Unit тесты sudo не требуют.
+
+## UPDATED 2
+
+Тк провера затянулось, а меня давно подмывало избавиться в ТЗ от sudo, приделал адаптер для обычного ping из Unix.
+Старый функционал так же оставил, переключается через опцию `tool:unix_ping` или `tool:net_ping`. Тесты не менял, 
+ибо акцептанс живут также, а тестить в юнит тестах тут нечего имхо (хотя, если это противит политике партии, 
+то это лечится, без эвтаназии :)

data/bin/zombie_check

@@ -11,8 +11,10 @@ if ['-v', '--version'].include? ARGV[0]
   exit 0
 elsif ['-h', '--help'].include? ARGV[0]
   puts 'You can specify options with syntax like option_name:value'
-  puts 'hosts_file   - file with list of all hosts'
-  puts "delay        - delay between pings in ms, default 1000 \n\n"
+  puts 'hosts_file      - file with list of all hosts'
+  puts "delay           - delay between pings in ms, default 1000"
+  puts "tool:unix_ping  - use Unix ping, do not require sudo (default)"
+  puts "tool:net_ping   - use NET::Ping, require sudo \n\n"
   exit 0
 end
 

data/hosts.txt

@@ -3,3 +3,5 @@
 mail.ru
 google.ru
 ya.ru
+1.1.1.1
+bbc.com

data/lib/zombie_check.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 require "zombie_check/core_ext/ennumerable"
+require "zombie_check/core_ext/string"
 require "zombie_check/version"
 require "zombie_check/ping"
 require "zombie_check/ping/checker"
 require "zombie_check/ping/checker_report"
 require "zombie_check/ping/host_stat"
+require "zombie_check/ping/ping_sender"
+require "zombie_check/ping/ping_sender/net_ping"
+require "zombie_check/ping/ping_sender/unix_ping"
 require "net/ping"
 
 module ZombieCheck

data/lib/zombie_check/core_ext/string.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class String
+  def camel_case
+    split("_").map(&:capitalize).join
+  end
+end

data/lib/zombie_check/ping/checker.rb

@@ -3,12 +3,14 @@ module ZombieCheck
   module Ping
     class Checker
       attr_accessor :hosts_file, :delay, :hosts, :report, :interrupted
+      attr_reader :tool
 
       def initialize(options = {})
         @hosts_file ||= options[:hosts_file] || "hosts.txt"
         @delay ||= (options[:delay] || 1000).to_i
         @hosts ||= []
-        @report = CheckerReport.new
+        @report ||= CheckerReport.new
+        @tool ||= options[:tool] || "unix_ping"
         setup_interruptor
       end
 
@@ -23,13 +25,16 @@ module ZombieCheck
       end
 
       def ping(host)
-        icmp = Net::Ping::ICMP.new(host)
-        icmp.ping
-        @report << icmp
+        response = sender_class.send(:new, host).send
+        @report << response
       end
 
       private
 
+        def sender_class
+          Object.const_get "ZombieCheck::Ping::#{tool.camel_case}"
+        end
+
         def update_hosts!
           check_file_exists! hosts_file_path
           result = File.open(hosts_file_path, "r") { |f| f.readlines.map(&:chomp) }
@@ -62,9 +67,9 @@ module ZombieCheck
         end
 
         def interrupted_exit!
-           exit_all_threads!
-            puts @report.generate
-            exit 0
+          exit_all_threads!
+          puts @report.generate
+          exit 0
         end
     end
   end

data/lib/zombie_check/ping/checker_report.rb

@@ -1,18 +1,31 @@
 # frozen_string_literal: true
-require 'pry'
 module ZombieCheck
   module Ping
     class CheckerReport
+      @nodes = {}
+
+      class<<self
+        attr_accessor :nodes
+
+        def store(ping)
+          if ping.stored?
+            nodes[ping.host].durations += ping.durations
+            nodes[ping.host].lost += ping.lost
+          else
+            nodes[ping.host] = ping
+          end
+        end
+      end
 
       def <<(ping)
-        HostStat.new(ping).store
+        store(HostStat.new(ping))
       end
 
       def generate
         [].tap do |result|
-          HostStat.nodes.each_pair do |host, node|
+          nodes.each_pair do |host, node|
             total = node.durations.size + node.lost
-            percentage = total > 0 ? node.lost / total : 0
+            percentage = total > 0 ? (node.lost.to_f / total * 100).round(PRECISION) : 0
             result << <<-REPORT
 
 To #{host} total sent #{total} pings, lost #{node.lost} (#{percentage}%). Time(ms):
@@ -23,6 +36,16 @@ median #{node.durations.median.round(PRECISION)}
           end
         end.join "\n"
       end
+
+      private
+
+        def store(*args)
+          self.class.store(*args)
+        end
+
+        def nodes
+          self.class.nodes
+        end
     end
   end
 end

data/lib/zombie_check/ping/host_stat.rb

@@ -2,12 +2,6 @@
 module ZombieCheck
   module Ping
     class HostStat
-      @nodes = {}
-
-      class<<self
-        attr_accessor :nodes
-      end
-
       attr_accessor :durations, :lost, :host
 
       def initialize(ping)
@@ -21,25 +15,12 @@ module ZombieCheck
         end
       end
 
-      def store
-        if stored?
-          stored.durations += durations
-          stored.lost += lost
-        else
-          self.class.nodes[host] = self
-        end
-      end
-
       def stored?
         stored ? true : false
       end
 
       def stored
-        self.class.nodes[host]
-      end
-
-      def hash
-        host.hash
+        CheckerReport.nodes[host]
       end
     end
   end

data/lib/zombie_check/ping/ping_sender.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module ZombieCheck
+  module Ping
+    class PingSender
+      attr_accessor :duration, :host
+
+      def initialize(host)
+        @host = host
+        @duration = nil
+      end
+
+      def send
+        raise "Not implemented"
+      end
+    end
+  end
+end

data/lib/zombie_check/ping/ping_sender/net_ping.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module ZombieCheck
+  module Ping
+    class NetPing < PingSender
+      def initialize(host)
+        super host
+      end
+
+      def send
+        icmp = Net::Ping::ICMP.new(host)
+        icmp.ping
+        self.duration = icmp.duration
+        self
+      end
+    end
+  end
+end

data/lib/zombie_check/ping/ping_sender/unix_ping.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module ZombieCheck
+  module Ping
+    class UnixPing < PingSender
+      def initialize(host)
+        super host
+      end
+
+      def send
+        result = `ping -c 1 -W 5 #{host}`.match(/time=(\d+\.?\d*)/)
+        self.duration = result[1].to_f / 1000 if result
+        self
+      end
+    end
+  end
+end

data/lib/zombie_check/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ZombieCheck
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zombie_check
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Kvokka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,10 +89,14 @@ files:
 - hosts.txt
 - lib/zombie_check.rb
 - lib/zombie_check/core_ext/ennumerable.rb
+- lib/zombie_check/core_ext/string.rb
 - lib/zombie_check/ping.rb
 - lib/zombie_check/ping/checker.rb
 - lib/zombie_check/ping/checker_report.rb
 - lib/zombie_check/ping/host_stat.rb
+- lib/zombie_check/ping/ping_sender.rb
+- lib/zombie_check/ping/ping_sender/net_ping.rb
+- lib/zombie_check/ping/ping_sender/unix_ping.rb
 - lib/zombie_check/version.rb
 - zombie_check.gemspec
 homepage: https://github.com/kvokka/zombie_check