HelperClasses 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e502dfc1275307448cbb1a400fb2e9f66cc9bb
-  data.tar.gz: 9a11df7ce26d9d05413b1fc26c56943adec234b7
+  metadata.gz: 3b208cc914a604115d2fc6d6d3f9b7d76ed5c0aa
+  data.tar.gz: b2d52052bceeeba6bfcdbda794f1c706cf8529ab
 SHA512:
-  metadata.gz: 8dc8b0468193eb16e9b776b17951f9cfd353b6f84624edb65817bb9ec0b1ae3f9a84a58d7de96f9ecb9e784983e592b49fe55928579e33bc6fb4a5b69594aa15
-  data.tar.gz: 93af48558a982873408929fd5a57ac57e633ee5180dcd22aa461d8b44db3d61723bdeb88f52e15e163240a92fd13542d634597d58d1a8ed8d97cf29b0fdb3dcf
+  metadata.gz: 17553d25124e09719b439fc8febb3d51c6b1d4dd86349a9c1797f180221809ae25ac9695fb100da8b926bbf21fde8b7d332f0ae0408364967dfa07b618b872cb
+  data.tar.gz: d56495c03e90a4ab551ea9ad80d99625cde1d41673c11db234bca4b41720509a68d66c1e0646b9b4c5b6f2aea01a0acb5ecf2733d82314a331dbec69c621e6f5

data/helperclasses.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'HelperClasses'
-  s.version = '0.2.0'
-  s.date = '2015-04-06'
+  s.version = '0.2.1'
+  s.date = '2015-05-12'
   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']

data/lib/helperclasses/dputs.rb

@@ -8,7 +8,7 @@ module HelperClasses
 
     @mutex = Mutex.new
     @silent = false
-    @show_time = 60
+    @show_time = false
     @terminal_width = 160
     @log_file = false
 
@@ -23,25 +23,29 @@ module HelperClasses
             show = now.to_i != $dputs_time.to_i
           when /min/
             show = (now.to_i / 60).floor != ($dputs_time.to_i / 60).floor
+          when /hour/
+            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')
+          $dputs_time = now
         end
-        show and puts "\n   *** It is now: " +
-                          Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        $dputs_time = now
       end
       DPuts.mutex.synchronize do
-        width = DPuts.terminal_width
-        width -= 30.0
-        file, func = call.split(" ")
+        width = DPuts.terminal_width.to_i || 160
+        width = [width - 30.0, 10].max
+        file, func = call.split(' ')
         file = file[/^.*\/([^.]*)/, 1]
-        who = (":" + n.to_s + ":" + file.to_s +
-            func.to_s).ljust(30, ["X", "x", "*", "-", ".", " "][n])
+        who = (':' + n.to_s + ':' + file.to_s +
+            func.to_s).ljust(30, ['X', 'x', '*', '-', '.', ' '][n])
         lines = []
         pos = 0
         while (pos < s.length)
           len = width
           if s.length - pos > width
             len = s.rindex(/[, .;=&>]/, pos + width)
-            len and len = len - pos + 1
+            len = len ? len - pos + 1 : width
             if len < width / 2
               len = width
             end
@@ -49,9 +53,9 @@ module HelperClasses
           lines.push s.slice(pos, len)
           pos += len
         end
-        puts who + " " + lines.shift.to_s
+        puts who + ' ' + lines.shift.to_s
         lines.each { |l|
-          puts " " * (32) + l
+          puts ' ' * (32) + l
         }
       end
     end
@@ -73,7 +77,7 @@ module HelperClasses
 
     def dputs(n, &s)
       n *= -1 if ($DPUTS_FUNCS and $DPUTS_FUNCS.index(dputs_getcaller))
-      if  !self.class.const_defined?(:DEBUG_LVL) or
+      if !self.class.const_defined?(:DEBUG_LVL) or
           self.class.const_get(:DEBUG_LVL) >= n
         s = yield s
         dputs_out(n, s, caller(0)[1])
@@ -94,11 +98,14 @@ 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|
+      File.open(DPuts.log_file, 'a') { |f|
         str = Time.now.strftime("%a %y.%m.%d-%H:%M:%S #{mod}: #{msg}")
         f.puts str
       }
     end
 
+    def dlog_msg(mod, msg)
+      ddputs(1){"Info from #{mod}: #{msg}"}
+    end
   end
 end

data/lib/helperclasses/system.rb

@@ -22,15 +22,32 @@ module HelperClasses
       run_bool("which #{cmd} > /dev/null 2>&1")
     end
 
-    def rescue_all(msg = nil)
+    def rescue_all(msg = 'Error')
       begin
         yield
       rescue Exception => e
-        msg and dputs(0) { msg }
+        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 } }
       end
     end
+
+    def iptables(*args)
+      if !@iptables_cmd
+        if System.exists?('iptables')
+          @iptables_cmd = 'iptables'
+          @iptables_wait = (System.run_str('iptables --help') =~ /\s-w\s/) ? '-w' : ''
+        else
+          @iptables_cmd = ''
+        end
+      end
+
+      if @iptables_cmd != ''
+        System.run_str("#{@iptables_cmd} #{@iptables_wait} #{args.join(' ')}")
+      else
+        return ''
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HelperClasses
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies: []
 description: Added accessors to Hash, to_sym to Array and a nice debugging-interface
   called DPuts