arbi 1.0.8.3 → 1.0.8.4

data/lib/arbi/modules/acpi/battery.rb

@@ -47,8 +47,9 @@ class Battery < Arbi::Modules::Module
   end
 
   def format
-    tablize([['NAME', 'PERCENT', 'STATE', 'SANITY']] + @data.map {|x|
-      [x[:name] || x['name'], x[:percent] || x['percent'], x[:state] || x['state'], x[:sanity] || x['sanity']]
+    tablize([['NAME', 'PERCENT', 'STATE', 'SANITY', 'REMAINING']] + @data.map {|x|
+      [x[:name] || x['name'], x[:percent] || x['percent'], x[:state] || x['state'],
+        x[:sanity] || x['sanity'], x[:remain] || x['remain']]
     })
   end
 
@@ -58,11 +59,21 @@ protected
     # Return if battery isn't present
     return not_present(File.basename(dir)) unless {yes: true, no: false}[(raw[:present].to_sym rescue nil)]
 
+    # time remaining
+    remain =  if raw[:charging_state] == 'discharging'
+                total = raw[:remaining_capacity].to_f / raw[:present_rate]
+                hours = total.floor
+                "%dh%dm" % [hours, ((total - hours) * 60).floor]
+              else
+                false
+              end
+
     {
       name:     File.basename(dir),
       sanity:   ("%.1f%%" % [100.0 / raw[:design_capacity] * raw[:last_full_capacity]]),
       state:    raw[:charging_state],
-      percent:  ("%.1f%%" % [100.0 / raw[:last_full_capacity] * raw[:remaining_capacity]])
+      percent:  ("%.1f%%" % [100.0 / raw[:last_full_capacity] * raw[:remaining_capacity]]),
+      remain:   remain
     }
   end
 
@@ -78,6 +89,7 @@ protected
       name:     'AVERAGE',
       sanity:   false,
       state:    false,
+      remain:   false,
       percent:  avg
     }
   end
@@ -87,7 +99,8 @@ protected
       name:     name,
       sanity:   false,
       state:    false,
-      percent:  false
+      percent:  false,
+      remain:   false
     }
   end
 end

data/lib/arbi/modules/adapter.rb

@@ -17,6 +17,6 @@
 # along with arbi. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'arbi/modules/acpi/adapter'
+#require 'arbi/modules/acpi/adapter'
 
-require 'arbi/modules/sys/adapter' unless Arbi::Modules::Acpi::Adapter.valid?
+require 'arbi/modules/sys/adapter' #unless Arbi::Modules::Acpi::Adapter.valid?

data/lib/arbi/modules/sys/battery.rb

@@ -55,16 +55,27 @@ protected
       last_full_capacity: File.read("#{dir}/energy_full").strip.to_i,
       remaining_capacity: File.read("#{dir}/energy_now").strip.to_i,
       present:            (File.read("#{dir}/present").strip.to_i.zero? ? false : true),
-      charging_state:     File.read("#{dir}/status").strip.downcase.gsub(/^full$/, 'charged')
+      charging_state:     File.read("#{dir}/status").strip.downcase.gsub(/^full$/, 'charged'),
+      present_rate:       File.read("#{dir}/power_now").strip.to_i
     }
 
     return not_present(File.basename(dir)) unless raw[:present]
 
+    # time remaining
+    remain =  if raw[:charging_state] == 'discharging'
+                total = raw[:remaining_capacity].to_f / raw[:present_rate]
+                hours = total.floor
+                "%dh%dm" % [hours, ((total - hours) * 60).floor]
+              else
+                false
+              end
+
     {
       name:     File.basename(dir),
       sanity:   ("%.1f%%" % [100.0 / raw[:design_capacity] * raw[:last_full_capacity]]),
       state:    raw[:charging_state],
-      percent:  ("%.1f%%" % [100.0 / raw[:last_full_capacity] * raw[:remaining_capacity]])
+      percent:  ("%.1f%%" % [100.0 / raw[:last_full_capacity] * raw[:remaining_capacity]]),
+      remain:   remain
     }
   end
 
@@ -80,7 +91,8 @@ protected
       name:     'AVERAGE',
       sanity:   false,
       state:    false,
-      percent:  avg
+      percent:  avg,
+      remain:   false
     }
   end
 
@@ -89,7 +101,8 @@ protected
       name:     name,
       sanity:   false,
       state:    false,
-      percent:  false
+      percent:  false,
+      remain:   false
     }
   end
 end

data/lib/arbi/utils/numeric.rb

@@ -32,14 +32,13 @@ module Scalar
     ?u => 10 ** -9, ?m => 10 ** -3, ?c => 10 ** -2, ?d => 10 ** -1
   }
 
-  alias __method_missing__ method_missing
-  def method_missing(sym, *args, &blk)
-    if MULTIPLIERS.include?(sym.to_s)
-      self / MULTIPLIERS[sym.to_s]
-    else
-      self.__method_missing__(sym, *args, &blk) if sym != :to_str
-    end
-  end
+  MULTIPLIERS.keys.each {|key|
+    (class << self; self; end).__send__(:define_method, key) {
+      self / MULTIPLIERS[key]
+    }
+  }
+
+  alias to_str to_s
 end
 
   def self.parse(str)

data/lib/arbi/version.rb

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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 8
-  - 3
-  version: 1.0.8.3
+  - 4
+  version: 1.0.8.4
 platform: ruby
 authors: 
 - shura
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +01:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency