arbi 1.0.8.4 → 1.0.8.6

data/lib/arbi/cli/server.rb

@@ -32,7 +32,9 @@ class Server
 
     self.parse_args
 
-    Arbi::Server.start(@address, @port)
+    EventMachine.run {
+      Arbi::Server.start(@address, @port)
+    }
   end
 
 protected

data/lib/arbi/client.rb

@@ -40,7 +40,7 @@ class Client
   def get(what = 'help')
     @sock.print "#{what.strip}\r\n"
     @sock.flush
-    JSON.parse(@sock.gets.strip)
+    JSON.parse(@sock.gets.strip, create_additions: true)
   rescue Errno::EPIPE
     self.connect
     retry

data/lib/arbi/config.rb

@@ -39,6 +39,9 @@ class Config < Hash
     config[:server] ||= {}
     config[:server][:address] ||= '127.0.0.1'
     config[:server][:port] ||= 6969
+    config[:server][:acpi] ||= {}
+    config[:server][:acpi][:listen] ||= '/var/run/acpid.socket'
+    config[:server][:acpi][:bind] ||= '/var/run/arbid.socket'
     config[:client] ||= {}
     config[:client][:address] ||= '127.0.0.1'
     config[:client][:port] ||= 6969
@@ -57,12 +60,29 @@ class Config < Hash
   end
 
   class << self
+    alias __method_missing__ method_missing
+    def method_missing(sym, *args, &blk)
+      if self.instance.respond_to?(sym)
+        self.instance.send(sym, *args, &blk)
+      else
+        self.__method_missing__(sym, *args, &blk)
+      end
+    end
+
     def [](*args)
-      self.instance.[](*args)
+      self.instance.send(:[], *args)
+    end
+
+    def []=(*args)
+      self.instance.send(:[]=, *args)
+    end
+
+    def inspect
+      self.instance.inspect
     end
 
-    def parse(*args)
-      self.instance.parse(*args)
+    def to_s
+      self.instance.to_s
     end
   end
 end

data/lib/arbi/modules/diskstat.rb

@@ -39,7 +39,7 @@ class Diskstat < Module
         diskstat = Sys::Filesystem.stat(device[:point])
         device.merge!({
           usage: "#{100 - (100.0 / diskstat.blocks  * diskstat.blocks_available).round}%",
-          space:  self.unitize(diskstat.blocks * diskstat.fragment_size)
+          space:  self.unitize(diskstat.blocks * diskstat.block_size)
         })
 
         @data << device
@@ -63,8 +63,8 @@ protected
   end
 
   def unitize misure
-    u = 'b'
-    %w(Kb Mb Gb Tb).each {|i|
+    u = 'B'
+    %w(kB MB GB TB).each {|i|
       if misure >= 1024
         misure /= 1024.0
         u = i

data/lib/arbi/modules/net.rb

@@ -19,6 +19,24 @@
 
 require 'socket'
 
+module Wireless
+  def self.quality(ifname)
+    File.read('/proc/net/wireless').match(/^\s*#{Regexp.escape(ifname)}:.*$/)[0].strip.split(/:?\s+/)[2].gsub('.', '') + "%"
+  rescue
+    nil
+  end
+
+  def self.essid (ifname)
+    iwreq = [ifname, " " * 32, 32, 0].pack("a16pII")
+    sock = ::Socket.new(:INET, :DGRAM, 0)
+    sock.ioctl(0x8B1B, iwreq)
+    return iwreq.unpack("a16pII")[1].strip
+  rescue Exception => e
+    Arbi.debug(e.backtrace[0] + ': ' + e.to_s + "\n" + e.backtrace[1..-1].join("\n"))
+    nil
+  end
+end
+
 module Arbi
 
 module Modules
@@ -72,8 +90,8 @@ protected
       }
 
       if stats[name][:state]
-        stats[name][:quality] = quality(name)
-        stats[name][ :essid ] = essid(name) if stats[name][:quality]
+        stats[name][:quality] = Wireless.quality(name)
+        stats[name][ :essid ] = Wireless.essid(name) if stats[name][:quality]
       end
 
       @prev[ :up ][name] = up
@@ -85,21 +103,6 @@ protected
     Arbi.debug(e.to_s)
   end
 
-  def quality(interface)
-    File.read('/proc/net/wireless').match(/^\s*#{Regexp.escape(interface)}:.*$/)[0].strip.split(/:?\s+/)[2].gsub('.', '') + "%"
-  rescue
-    nil
-  end
-
-  def essid(interface)
-    iwreq = [interface, " " * 32, 32, 0].pack("a16pII")
-    sock = Socket.new(Socket::AF_INET, Socket::SOCK_DGRAM, 0)
-    sock.ioctl(0x8B1B, iwreq)
-    return iwreq.unpack("a16pII")[1].strip
-  rescue
-    nil
-  end
-
   def datas=(stats)
     @mutex.synchronize {
       @datas = []

data/lib/arbi/modules/ram.rb

@@ -24,26 +24,67 @@ module Arbi
 module Modules
 
 class Ram < Arbi::Modules::Module
+begin
+  require 'Win32API'
+
+  class MEMORYSTATUS < Struct.new(:dwLength, :dwMemoryLoad, :dwTotalPhys, :dwAvailPhys, :dwTotalPageFile, :dwAvailPageFile, :dwTotalVirtual, :dwAvailVritualPhys)
+  end
+
+  def valid?
+    true
+  end
+
+  def usage
+    self.status.dwMemoryLoad
+  end
+
+  def total
+    self.status.dwTotalPageFile.to_i
+  end
+
+  def status
+    @__status__ ||= Win32API.new('kernel32', 'GlobalMemoryStatus', 'P', 'V')
+    x = ([1] * 8).pack('LLIIIIII')
+    @__status__.call(x)
+    x = MEMORYSTATUS.new(*x.unpack('LLIIIIII'))
+    x.dwMemoryLoad = 100.0 - 100.0 / x.dwTotalPageFile * x.dwAvailPageFile
+    x
+  end
+rescue LoadError
   include Arbi::Modules::Acpi::Utils
 
   def valid?
     File.exist?('/proc/meminfo')
   end
 
+  def usage
+    stat = self.status
+    100.0 - 100.0 / stat[:memtotal] * (stat[:memfree] + stat[:buffers] + stat[:cached])
+  end
+
+  def total
+    self.status[:memtotal].to_i
+  end
+
+  def status
+    hashize('/proc/meminfo')
+  end
+end
+
   def refresh
     @data = []
 
-    mem = hashize('/proc/meminfo')
-    perc = 100.0 / mem[:memtotal] * (mem[:memfree] + mem[:buffers] + mem[:cached])
+    usage = self.usage
 
     @data = [
-      ("%.1f%%" % [100.0 - perc]),
-      ("%.1f%%" % [perc])
+      ("%.1f%%" % [usage]),
+      ("%.1f%%" % [100.0 - usage]),
+      self.total
     ]
   end
 
   def format
-    tablize([['USED', 'FREE'], @data])
+    tablize([['USED', 'FREE', 'SIZE'], @data])
   end
 end
 

data/lib/arbi/modules/version.rb

@@ -29,7 +29,7 @@ class Version < Module
   end
 
   def refresh
-    @data = Arbi::VERSION
+    @data ||= Arbi::VERSION
   end
 
   def format

data/lib/arbi/server.rb

@@ -52,15 +52,18 @@ class Server
   end
 
   def start
-    EventMachine.run {
-      TimeLine.run
-      EventMachine.start_server(@address, @port, Arbi::Server::Server)
-      Arbi.debug("Starting server on #{@address}:#{@port}")
-    }
+    EventMachine.epoll = true if EventMachine.epoll?
+    EventMachine.kqueue = true if EventMachine.kqueue?
+    TimeLine.run
+    EventMachine.start_server(@address, @port, Arbi::Server::Server)
+    Arbi.debug("Starting server on #{@address}:#{@port}")
+    nil
   end
 
   def self.start(address = '127.0.0.1', port = 6969)
-    self.new(address, port).start
+    self.new(address, port).tap {|s|
+      s.start
+    }
   end
 end
 

data/lib/arbi/timeline.rb

@@ -46,24 +46,34 @@ module TimeLine
       raise ArgumentError, "proc must be a Proc" unless blk.is_a?(Proc)
       @proc = blk
     end
+
+    def run
+      EventMachine::PeriodicTimer.new(self.every) {
+        ::Timeout.timeout(self.timeout) {
+          self.proc.call
+        }
+      }
+    end
   end
 
   class << self
+    def running?
+      @running ||= false
+    end
+
     def register(job)
       raise ArgumentError, "job must be a TimeLine::Job" unless job.is_a?(TimeLine::Job)
       @@jobs ||= []
+      job.run if running?
       @@jobs << job
     end
 
     def run
       @@jobs ||= []
       @@jobs.each {|job|
-        EventMachine::PeriodicTimer.new(job.every) do
-          timeout(job.timeout) {
-            job.proc.call
-          }
-        end
+        job.run
       }
+      @running = true
       self
     end
   end

data/lib/arbi/version.rb

@@ -19,5 +19,5 @@
 
 
 module Arbi
-  VERSION = '1.0.8.4'
+  VERSION = '1.0.8.6'
 end

metadata

@@ -1,131 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arbi
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 8
-  - 4
-  version: 1.0.8.4
+version: !ruby/object:Gem::Version
+  version: 1.0.8.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - shura
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-14 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sys-filesystem
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: ""
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
 email: shura1991@gmail.com
-executables: 
+executables:
 - arbid
 - arbi
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/arbi.rb
-- lib/arbi/modules.rb
-- lib/arbi/timeline.rb
-- lib/arbi/server.rb
-- lib/arbi/cli/server.rb
+files:
 - lib/arbi/cli/client.rb
-- lib/arbi/utils/table.rb
-- lib/arbi/utils/numeric.rb
+- lib/arbi/cli/server.rb
 - lib/arbi/client.rb
+- lib/arbi/modules.rb
 - lib/arbi/version.rb
-- lib/arbi/modules/adapter.rb
+- lib/arbi/config.rb
+- lib/arbi/server.rb
+- lib/arbi/timeline.rb
 - lib/arbi/modules/net.rb
-- lib/arbi/modules/ram.rb
-- lib/arbi/modules/cpu.rb
-- lib/arbi/modules/sys/adapter.rb
-- lib/arbi/modules/sys/thermal.rb
-- lib/arbi/modules/sys/battery.rb
-- lib/arbi/modules/thermal.rb
 - lib/arbi/modules/version.rb
-- lib/arbi/modules/help.rb
-- lib/arbi/modules/battery.rb
+- lib/arbi/modules/thermal.rb
 - lib/arbi/modules/diskstat.rb
+- lib/arbi/modules/adapter.rb
 - lib/arbi/modules/acpi/adapter.rb
 - lib/arbi/modules/acpi/utils.rb
 - lib/arbi/modules/acpi/battery.rb
-- lib/arbi/config.rb
+- lib/arbi/modules/help.rb
+- lib/arbi/modules/sys/thermal.rb
+- lib/arbi/modules/sys/adapter.rb
+- lib/arbi/modules/sys/battery.rb
+- lib/arbi/modules/cpu.rb
+- lib/arbi/modules/battery.rb
+- lib/arbi/modules/ram.rb
+- lib/arbi/utils/numeric.rb
+- lib/arbi/utils/table.rb
+- lib/arbi.rb
 - bin/arbid
 - bin/arbi
-has_rdoc: true
 homepage: http://github.com/shurizzle/arbi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ""
+summary: ''
 test_files: []
-
+has_rdoc: true