helper_classes 0.3.5 → 1.9.13.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae65be85ffe47f9f08c0454d77b14a9cb65c1ec
-  data.tar.gz: f3391e02c3bb88c9d30ab6539f68dfd33ec5b1e4
+  metadata.gz: 96a715987ec443ba019a87e2894095b3e1506ed9
+  data.tar.gz: db222b62513305e232cfd1bfceeb70096e490527
 SHA512:
-  metadata.gz: 945c14738b13388cbe87c9b0f1fa31579d4b34c52fded06710b8deea1112fa31ff2111eae18be4332114c411e60f1cb0e7e3bbf97657cc8627d9238bf37de64e
-  data.tar.gz: 047748387d592edb99ce9e40885ff6bf0c9687106e11f459eb7b1658f77df168aed8baf06700bbbd95e39fea37e8e71ee1468c506b9bbf1d9391033aa8bc3a99
+  metadata.gz: d6cacdbb88c73871991dc541a06ed4201fe5d119c33cc7781d89450963d45939225c4f22fc338a9c151dade50e0bbe8d42b043d03414a137fd09e6c40ff60eb8
+  data.tar.gz: 39244111e0e56a3c769251f42070389d446ed5019a4b30a9a155a2c696d83985b2df3914eaec7e2f051d11c32c9ed810869f4c962982bd148e0344e94570db5c

data/Gemfile.lock

@@ -0,0 +1,7 @@
+GEM
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES

data/helper_classes.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'helper_classes'
-  s.version = '0.3.5'
-  s.date = '2015-06-20'
+  s.version = '1.9.13-10'
+  s.date = '2017-10-30'
   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.email = 'ineiti.blue'
 
   s.files         = `if [ -d '.git' ]; then git ls-files -z; fi`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.homepage =
       'https://github.com/ineiti/HelperClasses'
-  s.license = 'GPLv3'
+  s.license = 'GPL-3.0'
 end

data/lib/helper_classes.rb

@@ -1,3 +1,3 @@
-Dir.glob('helper_classes/*.rb').each { |d|
+Dir.glob(__dir__ + '/helper_classes/*.rb').each { |d|
   require d
 }

data/lib/helper_classes/dputs.rb

@@ -50,11 +50,11 @@ module HelperClasses
       end
       DPuts.mutex.synchronize do
         width = DPuts.terminal_width.to_i || 160
-        width = [width - 30.0, 10].max
+        width = [width - 40.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])
+        file = file[/^.*\/(.*):in/, 1]
+        who = (':' + n.to_s + ':' + file.to_s + "--" +
+            func.to_s).ljust(40, ['X', 'x', '*', '-', '.', ' '][n])
         lines = []
         pos = 0
         # Don't show enormous strings

data/lib/helper_classes/{service.rb → platform.rb}

@@ -2,7 +2,7 @@ require 'helper_classes/dputs'
 require 'helper_classes/system'
 
 module HelperClasses
-  module Service
+  module Platform
     attr_accessor :system, :services
 
     extend self
@@ -20,7 +20,9 @@ module HelperClasses
 
     @services = {
         samba: {ArchLinux: %w( smbd nmbd ), Ubuntu: %w(smbd nmbd)},
-        cups: {ArchLinux: 'org.cups.cupsd', Ubuntu: 'cupsd'}
+        cups: {ArchLinux: 'org.cups.cupsd', Ubuntu: 'cupsd'},
+        net_start: {ArchLinux: '/usr/bin/netctl start', Ubuntu: 'ifup'},
+        net_stop: {ArchLinux: '/usr/bin/netctl stop', Ubuntu: 'ifdown'},
     }
 
     def service_get(service)
@@ -58,35 +60,35 @@ module HelperClasses
 
     def start(service)
       service_run(service, {ArchLinux: 'systemctl start ##',
-                            Ubuntu: '/etc/init.d/## start',
+                            Ubuntu: 'systemctl start ##',
                             MacOSX: nil}
       )
     end
 
     def stop(service)
       service_run(service, {ArchLinux: 'systemctl stop ##',
-                            Ubuntu: '/etc/init.d/## stop',
+                            Ubuntu: 'systemctl stop ##',
                             MacOSX: nil}
       )
     end
 
     def restart(service)
       service_run(service, {ArchLinux: 'systemctl restart ##',
-                            Ubuntu: '/etc/init.d/## restart',
+                            Ubuntu: 'systemctl restart ##',
                             MacOSX: nil}
       )
     end
 
     def enable(service)
       service_run(service, {ArchLinux: 'systemctl enable ##',
-                            Ubuntu: nil,
+                            Ubuntu: 'systemctl enable ##',
                             MacOSX: nil}
       )
     end
 
     def disable(service)
       service_run(service, {ArchLinux: 'systemctl disable ##',
-                            Ubuntu: nil,
+                            Ubuntu: 'systemctl disable ##',
                             MacOSX: nil}
       )
     end
@@ -109,5 +111,39 @@ module HelperClasses
       disable(service)
       stop(service)
     end
+
+    def net_start(iface)
+      c = "#{@services[:net_start][@system]} #{iface}"
+      if !System.run_bool(c)
+        log_msg :Services, "Command #{c} failed"
+        return false
+      end
+      return true
+    end
+
+    def net_stop(iface)
+      c = "#{@services[:net_stop][@system]} #{iface}"
+      if !System.run_bool(c)
+        log_msg :Services, "Command #{c} failed"
+        return false
+      end
+      return true
+    end
+
+    def net_restart(iface)
+      net_stop(iface)
+      net_start(iface)
+    end
+
+    def net_status(iface, dev)
+      case @system
+        when :ArchLinux
+          return System.run_str("netctl status #{iface} | grep Active") =~ /: active/
+        when :Ubuntu
+          return System.run_str("ifconfig | grep #{dev}") != ''
+        else
+          return false
+      end
+    end
   end
-end
+end

data/lib/helper_classes/system.rb

@@ -34,7 +34,7 @@ module HelperClasses
       end
     end
 
-    def iptables(*args)
+    def iptables(*args, check: false)
       if !@iptables_cmd
         if System.exists?('iptables')
           @iptables_cmd = 'iptables'
@@ -45,7 +45,11 @@ module HelperClasses
       end
 
       if @iptables_cmd != ''
-        System.run_str("#{@iptables_cmd} #{@iptables_wait} #{args.join(' ')}")
+        if check
+          System.run_bool("#{@iptables_cmd} #{@iptables_wait} #{args.join(' ')} 2>/dev/null")
+        else
+          System.run_str("#{@iptables_cmd} #{@iptables_wait} #{args.join(' ')}")
+        end
       else
         return ''
       end
@@ -58,17 +62,19 @@ module HelperClasses
       ret = System.run_str('ntpq -c "rv 0 stratum"')
       return 16 if ret =~ /connection refused/i
       stratum = ret.gsub(/.*=/, '')
-      return stratum
+      return stratum.to_i
     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
+        System.rescue_all do
+          (1..n).each {
+            break if System.ntpdoffset
+            sleep 1
+          }
+          yield
+        end
       }
     end
 
@@ -79,8 +85,8 @@ module HelperClasses
       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
+      #return nil if stratum == '16'
+      return offset.to_f
     end
   end
-end
+end

data/test/hc_hashaccessor.rb

@@ -0,0 +1,25 @@
+require 'test/unit'
+
+class TC_Arraysym < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_simple
+    a = {}
+    a._hi = 'there'
+    assert_equal 'there', a[:hi]
+  end
+
+  def test_replace
+    a = {'one' => 1, two: 2}
+    assert_equal 1, a._one
+    assert_equal 2, a._two
+
+    a._one = 3
+    a._two = 4
+    assert_equal 3, a._one
+    assert_equal 4, a._two
+    assert_equal ['one', :two], a.keys
+  end
+end

data/test/hc_service.rb

@@ -7,9 +7,9 @@ class TC_Service < Test::Unit::TestCase
   end
 
   def test_service_get
-    Service.system = :ArchLinux
+    Platform.system = :ArchLinux
 
-    assert_equal %w(smbd nmbd), Service.service_get(:samba)
-    assert_equal 'dnsmasq', Service.service_get(:dnsmasq)
+    assert_equal %w(smbd nmbd), Platform.service_get(:samba)
+    assert_equal 'dnsmasq', Platform.service_get(:dnsmasq)
   end
 end

data/test/test.rb

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.push '../lib', '.'
+require 'bundler/setup'
+$LOAD_PATH.push '.', '../lib'
 
 require 'test/unit'
 require 'helper_classes'
 include HelperClasses
 
 tests = Dir.glob( 'hc_*.rb' )
-#tests = %w(  )
+tests = %w( hashaccessor )
 
 tests.each{|t|
   begin

metadata

@@ -1,23 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: helper_classes
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 1.9.13.pre.10
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies: []
 description: Added accessors to Hash, to_sym to Array and a nice debugging-interface
   called DPuts
-email: ineiti@linusetviviane.ch
+email: ineiti.blue
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - helper_classes.gemspec
@@ -25,11 +27,12 @@ files:
 - lib/helper_classes/arraysym.rb
 - lib/helper_classes/dputs.rb
 - lib/helper_classes/hashaccessor.rb
+- lib/helper_classes/platform.rb
 - lib/helper_classes/readconfig.rb
-- lib/helper_classes/service.rb
 - lib/helper_classes/system.rb
 - lib/helper_classes/timing.rb
 - lib/helper_classes/virtual.rb
+- test/hc_hashaccessor.rb
 - test/hc_service.rb
 - test/test.rb
 - test/test_arraysym.rb
@@ -39,7 +42,7 @@ files:
 - test/test_system.rb
 homepage: https://github.com/ineiti/HelperClasses
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -52,16 +55,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Hash._accessor Array.to_sym and DPuts
 test_files:
+- test/hc_hashaccessor.rb
 - test/hc_service.rb
 - test/test.rb
 - test/test_arraysym.rb