helper_classes 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97717fc8635b0abbbd5f199f5cdf4859c6beb0a8
-  data.tar.gz: e70548a8c8ac0facbcef3b4885a4da12ba8fcd58
+  metadata.gz: fae65be85ffe47f9f08c0454d77b14a9cb65c1ec
+  data.tar.gz: f3391e02c3bb88c9d30ab6539f68dfd33ec5b1e4
 SHA512:
-  metadata.gz: 3bf51d94db7ffadd84521dfe4e5e884a906966ab8c7aa387b846d13e5c8fbee16ec2fe2ab67eb82c82cba0b7fe412628e6106663443ad0e82bea03be6a88eaba
-  data.tar.gz: dd1deac10b92dfacbcd6aad3dc409712b08daabc05edb1a312655d8c56e4b14391fd3eb3ba5a8aa8b1c1196b99603c31aa515bf063c373d7b2bc6b1156ab92c4
+  metadata.gz: 945c14738b13388cbe87c9b0f1fa31579d4b34c52fded06710b8deea1112fa31ff2111eae18be4332114c411e60f1cb0e7e3bbf97657cc8627d9238bf37de64e
+  data.tar.gz: 047748387d592edb99ce9e40885ff6bf0c9687106e11f459eb7b1658f77df168aed8baf06700bbbd95e39fea37e8e71ee1468c506b9bbf1d9391033aa8bc3a99

data/helper_classes.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = 'helper_classes'
-  s.version = '0.3.1'
-  s.date = '2015-05-12'
+  s.version = '0.3.5'
+  s.date = '2015-06-20'
   s.summary = 'Hash._accessor Array.to_sym and DPuts'
   s.description = 'Added accessors to Hash, to_sym to Array and a nice debugging-interface called DPuts'
   s.authors = ['Linus Gasser']
   s.email = 'ineiti@linusetviviane.ch'
 
-  s.files         = `git ls-files -z`.split("\x0")
+  s.files         = `if [ -d '.git' ]; then git ls-files -z; fi`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']

data/lib/helper_classes/dputs.rb

@@ -4,13 +4,28 @@ module HelperClasses
 
   module DPuts
     extend self
-    attr_accessor :mutex, :silent, :show_time, :terminal_width, :log_file
+    attr_accessor :mutex, :silent, :show_time, :terminal_width, :log_file,
+                  :logall_file, :max_msg_len
 
     @mutex = Mutex.new
     @silent = false
     @show_time = false
     @terminal_width = 160
+    @max_msg_len = 8192
     @log_file = false
+    @logall_file = false
+
+    def logfile_valid(f)
+      return f && f.to_s.length > 0 && File.exists?(File.dirname(f))
+    end
+
+    def dputs_write(str)
+      if logfile_valid(DPuts.logall_file)
+        IO.write(DPuts.logall_file, str, mode: 'a')
+      else
+        puts str
+      end
+    end
 
     def dputs_out(n, s, call)
       return if DPuts.silent
@@ -27,8 +42,9 @@ module HelperClasses
             show = (now.to_i / 3600).floor != ($dputs_time.to_i / 3600).floor
         end
         if show
-          puts "\n   *** It is now: " +
-                   Time.now.strftime('%Y-%m-%d %H:%M:%S')
+          str = "\n   *** It is now: " +
+                   Time.now.strftime('%Y-%m-%d %H:%M:%S') + "\n"
+          dputs_write(str)
           $dputs_time = now
         end
       end
@@ -41,22 +57,25 @@ module HelperClasses
             func.to_s).ljust(30, ['X', 'x', '*', '-', '.', ' '][n])
         lines = []
         pos = 0
-        while (pos < s.length)
+        # Don't show enormous strings
+        s_trunc = s[0..DPuts.max_msg_len]
+        while (pos < s_trunc.length)
           len = width
-          if s.length - pos > width
-            len = s.rindex(/[, .;=&>]/, pos + width)
+          if s_trunc.length - pos > width
+            len = s_trunc.rindex(/[, .;=&>]/, pos + width)
             len = len ? len - pos + 1 : width
             if len < width / 2
               len = width
             end
           end
-          lines.push s.slice(pos, len)
+          lines.push s_trunc.slice(pos, len)
           pos += len
         end
-        puts who + ' ' + lines.shift.to_s
+        str = who + ' ' + lines.shift.to_s + "\n"
         lines.each { |l|
-          puts ' ' * (32) + l
+          str += ' ' * (32) + l + "\n"
         }
+        dputs_write(str)
       end
     end
 
@@ -97,15 +116,16 @@ module HelperClasses
 
     def log_msg(mod, msg)
       dputs(1) { "Info from #{mod}: #{msg}" }
-      return if not DPuts.log_file
-      File.open(DPuts.log_file, 'a') { |f|
-        str = Time.now.strftime("%a %y.%m.%d-%H:%M:%S #{mod}: #{msg}")
-        f.puts str
-      }
+      if logfile_valid(DPuts.log_file)
+        File.open(DPuts.log_file, 'a') { |f|
+          str = Time.now.strftime("%a %y.%m.%d-%H:%M:%S #{mod}: #{msg}")
+          f.puts str
+        }
+      end
     end
 
     def dlog_msg(mod, msg)
-      ddputs(1){"Info from #{mod}: #{msg}"}
+      ddputs(1) { "Info from #{mod}: #{msg}" }
     end
   end
 end

data/lib/helper_classes/service.rb

@@ -91,6 +91,15 @@ module HelperClasses
       )
     end
 
+    def reload
+      return unless @system == :ArchLinux
+      System.run_bool('/usr/bin/systemctl daemon-reload')
+    end
+
+    def daemon_reload
+      reload
+    end
+
     def enable_start(service)
       enable(service)
       start(service)

data/lib/helper_classes/system.rb

@@ -25,11 +25,12 @@ module HelperClasses
     def rescue_all(msg = 'Error')
       begin
         yield
-      rescue Exception => e
+      rescue StandardError => e
         dputs(0) { "#{Time.now.strftime('%a %y.%m.%d-%H:%M:%S')} - #{msg}" }
         dputs(0) { "#{e.inspect}" }
         dputs(0) { "#{e.to_s}" }
         e.backtrace.each { |l| dputs(0) { l } }
+        return false
       end
     end
 
@@ -49,5 +50,37 @@ module HelperClasses
         return ''
       end
     end
+
+    # Returns the stratum of the ntpd-synchronization:
+    # 16 -> not synchronized
+    # 2..15 -> synchronized
+    def ntpdstratum
+      ret = System.run_str('ntpq -c "rv 0 stratum"')
+      return 16 if ret =~ /connection refused/i
+      stratum = ret.gsub(/.*=/, '')
+      return stratum
+    end
+
+    # Waits for NTP to be synchronized or for _n_ seconds
+    def ntpd_wait(n = 60)
+      Thread.new {
+        (1..n).each {
+          break if System.ntpdstratum < 16
+          sleep 1
+        }
+        yield
+      }
+    end
+
+    # Returns the offset of the ntpd-synchronization:
+    # nil -> not synchronized
+    # else -> synchronization in ms
+    def ntpdoffset
+      ret = System.run_str('ntpq -c "rv 0 stratum,offset"')
+      return nil if ret =~ /connection refused/i
+      stratum, offset = ret.split(/, /).collect { |s| s.gsub(/.*=/, '') }
+      return nil if stratum == '16'
+      return offset
+    end
   end
 end

data/lib/helper_classes/virtual.rb

@@ -0,0 +1,17 @@
+class VirtualMethodCalledError < RuntimeError
+  attr :name
+  def initialize(name)
+    super("Virtual function '#{name}' called")
+    @name = name
+  end
+end
+
+class Module
+  def virtual(*methods)
+    methods.each do |m|
+      define_method(m) {
+        raise VirtualMethodCalledError, m
+      }
+    end
+  end
+end

data/lib/helper_classes.rb

@@ -1,7 +1,3 @@
-require 'helper_classes/arraysym'
-require 'helper_classes/dputs'
-require 'helper_classes/hashaccessor'
-require 'helper_classes/readconfig'
-require 'helper_classes/service'
-require 'helper_classes/system'
-require 'helper_classes/timing'
+Dir.glob('helper_classes/*.rb').each { |d|
+  require d
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helper_classes
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies: []
 description: Added accessors to Hash, to_sym to Array and a nice debugging-interface
   called DPuts
@@ -29,6 +29,7 @@ files:
 - lib/helper_classes/service.rb
 - lib/helper_classes/system.rb
 - lib/helper_classes/timing.rb
+- lib/helper_classes/virtual.rb
 - test/hc_service.rb
 - test/test.rb
 - test/test_arraysym.rb