linux_stat 0.7.5 → 1.0.1

data/exe/linuxstat.rb

@@ -76,17 +76,23 @@ MARKDOWN, HTML = hash[:markdown], hash[:html]
 
 # Print time each method takes unless --no-time or -nt option is passed
 PRINT_TIME = (MARKDOWN || HTML) ? false : !ARGV.any? { |x| x[/^\-\-no-time$/] || x[/^\-nt$/] }
-
-%w(--markdown -md --no-time -nt --html -html).each(&ARGV.method(:delete))
+PRINT_TYPE = ARGV.any? { |x| x[/^\-(\-show\-type|t)$/] }
+%w(--markdown -md --no-time -nt --html -html --show-type -t).each(&ARGV.method(:delete))
 
 # Run only desired classes / modules
 constants = LinuxStat.constants
 
+# Modules to delete from documentation and testing
+%i(
+	Nproc
+).each(&constants.method(:delete))
+
 execute = constants.map(&:downcase).map.with_index { |x, i|
 	constants[i] if ARGV.find { |y| y.downcase.to_sym == x }
 }.compact
 
 execute.replace(constants) if execute.empty?
+HEXAGONS = %W(\u2b22 \u2b23 \u2B53 \u2B1F)
 
 execute.sort.each do |c|
 	e = eval("LinuxStat::#{c}")
@@ -138,36 +144,51 @@ execute.sort.each do |c|
 		disp_meth.concat(arg ? "(#{param} = #{arg.inspect})" : "(#{param})")
 
 		time = Time.now
-		v = arg ? e.send(meth, arg) : e.send(meth)
+		ret = arg ? e.send(meth, arg) : e.send(meth)
 		time2 = Time.now
 		time = time2.-(time).*(1_000_000).round(3)
 
-		v = v.inspect
+		v = ret.inspect
 		dis = v.length > 253 ? v[0..250].strip + '...'.freeze : v
 
 		source = e.singleton_method(meth).source_location.to_a
-		src, src_meth = '', ''
+		src, src_meth, src_ret = '', '', ''
 
 		unless source.empty?
-			src << " File: #{File.split(source[0])[-1]} | Line: #{source[1]}\n"
-			src_meth << " Definition: #{IO.foreach(source[0]).first(source[1])[-1].strip}\n"
+			src << " File:\t\t#{File.split(source[0])[-1]} | Line: #{source[1]}\n"
+			src_meth << " Definition:\t#{IO.foreach(source[0]).first(source[1])[-1].strip}\n"
+
+			src_ret << " Returns:\t" << case ret
+				when Array then 'Array | Empty Array'
+				when Complex then 'Complex | nil'
+				when Float then 'Float | nil'
+				when Hash then 'Hash | Empty Hash'
+				when Integer then 'Integer | nil'
+				when Rational then 'Rational | nil'
+				when String then "String | (Frozen) Empty String"
+				when Time then 'Time | nil'
+				when true, false then 'True or False | nil'
+				when nil then 'nil'
+				else ''
+			end << ?\n.freeze if PRINT_TYPE
 
 			if MARKDOWN || HTML
 				src.prepend('#'.freeze)
 				src_meth.prepend('#'.freeze)
+				src_ret.prepend(?#.freeze) if PRINT_TYPE
 			else
-				src.prepend(?\u2B23.freeze)
-				src_meth.prepend(?\u2B23.freeze)
+				src.prepend(HEXAGONS.rotate![0].freeze)
+				src_meth.prepend(HEXAGONS.rotate![0].freeze)
+				src_ret.prepend(HEXAGONS.rotate![0].freeze) if PRINT_TYPE
 			end
 		end
 
-
 		if MARKDOWN
-			puts "#{src}#{src_meth}#{e}.#{disp_meth}\n=> #{dis}"
+			puts "#{src}#{src_meth}#{src_ret}#{e}.#{disp_meth}\n=> #{dis}"
 		elsif HTML
-			puts "#{src}#{src_meth}#{e}.#{disp_meth}\n=> #{dis}"
+			puts "#{src}#{src_meth}#{src_ret}#{e}.#{disp_meth}\n=> #{dis}"
 		else
-			puts "\e[1m#{src.colourize}\e[1m#{src_meth.colourize(4)}\e[0m\e[1;38;2;80;80;255m#{e}.#{disp_meth}\e[0m\n=> #{dis}"
+			puts "\e[1m#{src.colourize}\e[1m#{src_meth.colourize(6)}\e[1m#{src_ret.colourize(1)}\e[0m\e[1;38;2;80;80;255m#{e}.#{disp_meth}\e[0m\n=> #{dis}"
 		end
 
 		puts( "(" +

data/ext/fs_stat/fs_stat.c

@@ -1,8 +1,15 @@
 #include <sys/statvfs.h>
 #include "ruby.h"
 
-#pragma GCC optimize ("O3")
-#pragma clang optimize on
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+	#pragma GCC optimize ("O3")
+	#pragma GCC diagnostic warning "-Wall"
+#elif defined(__clang__)
+	#pragma clang optimize on
+	#pragma clang diagnostic warning "-Wall"
+#elif defined(__INTEL_COMPILER)
+	#pragma intel optimization_level 3
+#endif
 
 static VALUE statfs(VALUE obj, VALUE dir) {
 	struct statvfs buf ;

data/ext/nproc/extconf.rb

@@ -0,0 +1,11 @@
+require 'mkmf'
+
+unless have_const('linux') || RbConfig::CONFIG['arch'].to_s[/linux/]
+	abort('Platform is not linux')
+end
+
+unless have_header('sched.h') && have_header('ruby.h')
+	abort('Missing header')
+end
+
+create_makefile 'linux_stat/nproc'

data/ext/nproc/nproc.c

@@ -0,0 +1,31 @@
+#ifndef _GNU_SOURCE
+	#define _GNU_SOURCE
+#endif
+
+#include <sched.h>
+#include "ruby.h"
+
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+	#pragma GCC optimize ("O3")
+	#pragma GCC diagnostic warning "-Wall"
+#elif defined(__clang__)
+	#pragma clang optimize on
+	#pragma clang diagnostic warning "-Wall"
+#elif defined(__INTEL_COMPILER)
+	#pragma intel optimization_level 3
+#endif
+
+static VALUE count_cpu_for_pid(VALUE obj, VALUE pid) {
+	cpu_set_t set ;
+	CPU_ZERO(&set) ;
+	short int stat = sched_getaffinity(FIX2INT(pid), sizeof(set), &set) ;
+
+	if (stat < 0) return Qnil ;
+	return INT2FIX(CPU_COUNT(&set)) ;
+}
+
+void Init_nproc() {
+	VALUE _linux_stat = rb_define_module("LinuxStat") ;
+	VALUE _nproc = rb_define_module_under(_linux_stat, "Nproc") ;
+	rb_define_module_function(_nproc, "count_cpu_for_pid", count_cpu_for_pid, 1) ;
+}

data/ext/sysconf/sysconf.c

@@ -1,43 +1,105 @@
 #include <unistd.h>
 #include "ruby.h"
 
-#pragma GCC optimize ("O3")
-#pragma clang optimize on
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+	#pragma GCC optimize ("O3")
+	#pragma GCC diagnostic warning "-Wall"
+#elif defined(__clang__)
+	#pragma clang optimize on
+	#pragma clang diagnostic warning "-Wall"
+#elif defined(__INTEL_COMPILER)
+	#pragma intel optimization_level 3
+#endif
 
 static VALUE getTick(VALUE obj) {
-	return INT2FIX(sysconf(_SC_CLK_TCK)) ;
+	short int val = sysconf(_SC_CLK_TCK) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getChildMax(VALUE obj) {
-	return INT2FIX(sysconf(_SC_CHILD_MAX)) ;
+	short int val = sysconf(_SC_CHILD_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getHostnameMax(VALUE obj) {
-	return INT2FIX(sysconf(_SC_HOST_NAME_MAX)) ;
+	short int val = sysconf(_SC_HOST_NAME_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getLoginNameMax(VALUE obj) {
-	return INT2FIX(sysconf(_SC_LOGIN_NAME_MAX)) ;
+	short int val = sysconf(_SC_LOGIN_NAME_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getOpenMax(VALUE obj) {
-	return INT2FIX(sysconf(_SC_OPEN_MAX)) ;
+	short int val = sysconf(_SC_OPEN_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getPageSize(VALUE obj) {
-	return INT2FIX(sysconf(_SC_PAGESIZE)) ;
+	short int val = sysconf(_SC_PAGESIZE) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getStreamMax(VALUE obj) {
-	return INT2FIX(sysconf(_SC_STREAM_MAX)) ;
+	short int val = sysconf(_SC_STREAM_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getTTYNameMax(VALUE obj) {
-	return INT2FIX(sysconf(_SC_TTY_NAME_MAX)) ;
+	short int val = sysconf(_SC_TTY_NAME_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getPosixVersion(VALUE obj) {
-	return INT2FIX(sysconf(_SC_VERSION)) ;
+	short int val = sysconf(_SC_VERSION) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
+}
+
+static VALUE getLineMax(VALUE obj) {
+	short int val = sysconf(_SC_LINE_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
+}
+
+static VALUE getExprNestMax(VALUE obj) {
+	short int val = sysconf(_SC_EXPR_NEST_MAX) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
+}
+
+static VALUE getProcessorConfigured(VALUE obj) {
+	short int val = sysconf(_SC_NPROCESSORS_CONF) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
+}
+
+static VALUE getProcessorOnline(VALUE obj) {
+	short int val = sysconf(_SC_NPROCESSORS_ONLN) ;
+	if (val < 0) return Qnil ;
+
+	return INT2FIX(val) ;
 }
 
 static VALUE getUser(VALUE obj) {
@@ -70,6 +132,11 @@ void Init_sysconf() {
 	rb_define_module_function(_sysconf, "stream_max", getStreamMax, 0) ;
 	rb_define_module_function(_sysconf, "tty_name_max", getTTYNameMax, 0) ;
 	rb_define_module_function(_sysconf, "posix_version", getPosixVersion, 0) ;
+	rb_define_module_function(_sysconf, "line_max", getLineMax, 0) ;
+	rb_define_module_function(_sysconf, "expr_nest_max", getExprNestMax, 0) ;
+
+	rb_define_module_function(_sysconf, "processor_online", getProcessorOnline, 0) ;
+	rb_define_module_function(_sysconf, "processor_configured", getProcessorConfigured, 0) ;
 
 	rb_define_module_function(_sysconf, "get_uid", getUID, 0) ;
 	rb_define_module_function(_sysconf, "get_gid", getGID, 0) ;

data/ext/utsname/utsname.c

@@ -1,39 +1,51 @@
 #include <sys/utsname.h>
 #include "ruby.h"
 
-#pragma GCC optimize ("O3")
-#pragma clang optimize on
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
+	#pragma GCC optimize ("O3")
+	#pragma GCC diagnostic warning "-Wall"
+#elif defined(__clang__)
+	#pragma clang optimize on
+	#pragma clang diagnostic warning "-Wall"
+#elif defined(__INTEL_COMPILER)
+	#pragma intel optimization_level 3
+#endif
 
 static struct utsname buf ;
-static short status ;
+
+static char *sysname = "", *nodename = "" ;
+static char *release = "", *version = "", *machine = "" ;
 
 void init_buf() {
-	status = uname(&buf) ;
+	short status = uname(&buf) ;
+
+	if (status > -1) {
+		sysname = buf.sysname ;
+		nodename = buf.nodename ;
+		release = buf.release ;
+		version = buf.version ;
+		machine = buf.machine ;
+	}
 }
 
 static VALUE getSysname(VALUE obj) {
-	VALUE sysname = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.sysname) ;
-	return sysname ;
+	return rb_str_new_cstr(sysname) ;
 }
 
 static VALUE getNodename(VALUE obj) {
-	VALUE nodename = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.nodename) ;
-	return nodename ;
+	return rb_str_new_cstr(nodename) ;
 }
 
 static VALUE getRelease(VALUE obj) {
-	VALUE release = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.release) ;
-	return release ;
+	return rb_str_new_cstr(release) ;
 }
 
 static VALUE getVersion(VALUE obj) {
-	VALUE version = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.version) ;
-	return version ;
+	return rb_str_new_cstr(version) ;
 }
 
 static VALUE getMachine(VALUE obj) {
-	VALUE machine = status < 0 ? rb_str_new_cstr("") : rb_str_new_cstr(buf.machine) ;
-	return machine ;
+	return rb_str_new_cstr(machine) ;
 }
 
 void Init_utsname() {

data/lib/linux_stat.rb

@@ -23,15 +23,19 @@ require 'linux_stat/prettify_bytes'
 # But might be required by other module functions in "Dependent Modules" section
 require "linux_stat/battery"
 require "linux_stat/bios"
-require "linux_stat/cpu"
 require "linux_stat/memory"
 require "linux_stat/net"
 require "linux_stat/process"
 require "linux_stat/swap"
+require "linux_stat/usb"
 
 # Dependent Modules
 # Modules that can have reverse dependency
 
+# LinuxStat::CPU.nproc dependent modules
+require "linux_stat/cpu"
+require "linux_stat/nproc"
+
 # LinuxStat::Uname dependent modules
 require 'linux_stat/utsname'
 require "linux_stat/os"
@@ -46,3 +50,6 @@ require "linux_stat/sysconf"
 require "linux_stat/kernel"
 require 'linux_stat/user'
 require "linux_stat/process_info"
+
+# A short alias to LinuxStat
+LS = LinuxStat

data/lib/linux_stat/battery.rb

@@ -1,6 +1,6 @@
 module LinuxStat
 	module Battery
-		PATH = "/sys/class/power_supply/BAT0"
+		PATH = "/sys/class/power_supply/BAT0".freeze
 
 		class << self
 			##
@@ -34,8 +34,10 @@ module LinuxStat
 			#
 			# If the battery is not present or the information isn't available it will return an empty String.
 			def model
-				return ''.freeze unless model_readable?
-				IO.read(File.join(PATH, 'model_name')).tap(&:strip!)
+				@@mn_file = File.join(PATH, 'model_name')
+				return ''.freeze unless File.readable?(@@mn_file)
+
+				IO.read(@@mn_file).tap(&:strip!)
 			end
 
 			##
@@ -43,8 +45,9 @@ module LinuxStat
 			#
 			# If the battery is not present or the information is not available, it will return an empty String.
 			def manufacturer
+				@@manufacturer_file ||= File.join(PATH, 'manufacturer')
 				return ''.freeze unless manufacturer_readable?
-				IO.read(File.join(PATH, 'manufacturer')).tap(&:strip!)
+				IO.read(@@manufacturer_file).tap(&:strip!)
 			end
 
 			##
@@ -52,8 +55,9 @@ module LinuxStat
 			#
 			# If the battery is not present or the information is not available, it will return an empty String.
 			def technology
+				@@technology_file ||= File.join(PATH, 'technology')
 				return ''.freeze unless tech_readable?
-				IO.read(File.join(PATH, 'technology')).tap(&:strip!)
+				IO.read(@@technology_file).tap(&:strip!)
 			end
 
 			##
@@ -62,8 +66,9 @@ module LinuxStat
 			#
 			# If the battery is not present or the information is not available, it will return an empty frozen String.
 			def status
+				@@status_file ||= File.join(PATH, 'status'.freeze)
 				return ''.freeze unless status_readable?
-				IO.read(File.join(PATH, 'status')).tap(&:strip!)
+				IO.read(@@status_file).tap(&:strip!)
 			end
 
 			##
@@ -81,7 +86,7 @@ module LinuxStat
 			# If the battery is not present or the information is not available, it will return nil.
 			def discharging?
 				return nil if status.empty?
-				status.downcase == 'discharging'
+				status.downcase == 'discharging'.freeze
 			end
 
 			##
@@ -90,7 +95,7 @@ module LinuxStat
 			# If the battery is not present or the information is not available, it will return nil.
 			def full?
 				return nil if status.empty?
-				status.downcase == 'full'
+				status.downcase == 'full'.freeze
 			end
 
 			##
@@ -98,19 +103,182 @@ module LinuxStat
 			#
 			# If the battery is not present or the information is not available, it will return nil.
 			def charge
-				return nil unless charge_now_readable?
-				charge_now = IO.read(File.join(PATH, 'charge_now')).to_i
-				charge_full = IO.read(File.join(PATH, 'charge_full')).to_i
+				@@charge_now_file ||= File.join(PATH, 'charge_now')
+				@@charge_full_file ||= File.join(PATH, 'charge_full')
+
+				@@charge_now_readable ||= File.readable?(@@charge_now_file) && File.readable?(@@charge_full_file)
+				return nil unless @@charge_now_readable
+
+				charge_now = IO.read(@@charge_now_file).to_i
+				charge_full = IO.read(@@charge_full_file).to_i
 
 				percentage = charge_now.*(100).fdiv(charge_full)
-				percentage = percentage > 100 ? 100.0 : percentage < 0 ? 0.0 : percentage
+				percentage > 100 ? 100.0 : percentage < 0 ? 0.0 : percentage
 			end
 
-			private
-			def model_readable?
-				@@model_readable ||= File.readable?(File.join(PATH, 'model_name'))
+			##
+			# Returns the charge full design WH of the battery as Integer
+			# However if the info isn't available or there's no BAT0 in the system, this will return nil
+			def charge_full_design_wh
+					# voltage min design
+					@@vmd_f ||= File.join(PATH, 'voltage_min_design'.freeze)
+					v_m_d = File.readable?(@@vmd_f) ? IO.read(@@vmd_f).to_i : nil
+
+					# charge full design
+					@@cfd_f ||= File.join(PATH, 'charge_full_design'.freeze)
+					c_f_d = File.readable?(@@cfd_f) ? IO.read(@@cfd_f).to_i : nil
+
+					if v_m_d && c_f_d
+						v_m_d.fdiv(1_000_000).*(c_f_d.fdiv(1_000_000)).round(2)
+					else
+						nil
+					end
+			end
+
+			##
+			# Returns the charge full WH of the battery as Integer
+			# However if the info isn't available or there's no BAT0 in the system, this will return nil
+			def charge_full_wh
+					# voltage min design
+					@@vmd_f ||= File.join(PATH, 'voltage_min_design'.freeze)
+					v_m_d = File.readable?(@@vmd_f) ? IO.read(@@vmd_f).to_i : nil
+
+					# charge full
+					@@cf_f ||= File.join(PATH, 'charge_full'.freeze)
+					c_f = File.readable?(@@cf_f) ? IO.read(@@cf_f).to_i : nil
+
+					if v_m_d && c_f
+						v_m_d.fdiv(1_000_000).*(c_f.fdiv(1_000_000)).round(2)
+					else
+						nil
+					end
+			end
+
+			##
+			# Returns the voltage of the battery as Integer
+			# However if the info isn't available or there's no BAT0 in the system, this will return nil
+			def voltage_now
+				@@voltage_file ||= File.join(PATH, 'voltage_now'.freeze)
+				@@voltage_readable ||= File.readable?(@@voltage_file)
+				return nil unless @@voltage_readable
+
+				IO.read(@@voltage_file, 16).to_f.fdiv(1000000)
+			end
+
+			##
+			# A linux system can have multiple batteries. This method attempts to
+			# find all of them and return a Hash based on the availibility of the
+			# information.
+			#
+			# This method is somewhat slower than other Battery module singleton methods.
+			# Because it does various checks and opens various files from /sys/
+			#
+			# For example, a sample output can be like this (taken on a test system):
+			#
+			#    LinuxStat::Battery.devices_stat
+			#    => {:AC=>{:type=>"Mains", :online=>1}, :BAT0=>{:model=>"DELL CYMGM77", :manufacturer=>"Samsung SDI", :type=>"Battery", :status=>"Full", :capacity=>100, :voltage_min_design=>11.4, :charge_full_design=>3.684, :charge_full_design_wh=>42.0, :voltage_now=>12.558, :charge_now=>2.087, :charge_now_wh=>26.21, :charge_full_wh=>23.79, :charge_percentage=>100.0}, :hidpp_battery_0=>{:model=>"Wireless Keyboard", :manufacturer=>"Logitech", :type=>"Battery", :status=>"Discharging", :online=>1}}
+			#
+			# If you need info about lots of batteries, use this method.
+			# If the informations are not available, it will return empty Hash for each devices.
+			# If the system has no batteries, it will return an empty Hash.
+			def devices_stat
+				h = {}
+				Dir["/sys/class/power_supply/*/".freeze].tap(&:sort!).each do |x|
+					# model name
+					mn_file = File.join(x, 'model_name'.freeze).freeze
+					model_name = File.readable?(mn_file) ? IO.read(mn_file).strip : nil
+
+					# manufacturer
+					m_f = File.join(x, 'manufacturer'.freeze).freeze
+					manufacturer = File.readable?(m_f) ? IO.read(m_f).strip : nil
+
+					# type
+					t_f = File.join(x, 'type'.freeze).freeze
+					type = File.readable?(t_f) ? IO.read(t_f).strip : nil
+
+					# capacity
+					c_file = File.join(x, 'capacity'.freeze).freeze
+					capacity = File.readable?(c_file) ? IO.read(c_file).to_i : nil
+
+					# voltage now
+					vn_f = File.join(x, 'voltage_now'.freeze).freeze
+					voltage_now = File.readable?(vn_f) ? IO.read(vn_f).to_i.fdiv(1_000_000) : nil
+
+					# charge now
+					cn_f = File.join(x, 'charge_now'.freeze).freeze
+					charge_now = File.readable?(cn_f) ? IO.read(cn_f).to_i.fdiv(1_000_000) : nil
+
+					# voltage min design
+					vmd_f = File.join(x, 'voltage_min_design'.freeze).freeze
+					v_m_d = File.readable?(vmd_f) ? IO.read(vmd_f).to_i.fdiv(1_000_000) : nil
+
+					# charge full design
+					cfd_f = File.join(x, 'charge_full_design'.freeze).freeze
+					c_f_d = File.readable?(cfd_f) ? IO.read(cfd_f).to_i.fdiv(1_000_000) : nil
+
+					# charge full
+					cf_f = File.join(x, 'charge_full'.freeze).freeze
+					charge_full = File.readable?(cf_f) ? IO.read(cf_f).to_i.fdiv(1_000_000) : nil
+
+					# status
+					s_f = File.join(x, 'status'.freeze).freeze
+					status = File.readable?(s_f) ? IO.read(s_f).strip : nil
+
+					# online
+					o_f = File.join(x, 'online'.freeze).freeze
+					online = File.readable?(o_f) ? IO.read(o_f).to_i : nil
+
+					charge_percentage = if charge_now && charge_full
+						charge_now.*(100).fdiv(charge_full).round(2)
+					else
+						nil
+					end
+
+					# full_charge_design (WH)
+					c_f_d_wh =  if c_f_d && v_m_d
+						v_m_d.*(c_f_d).round(2)
+					else
+						nil
+					end
+
+					c_n_wh = if voltage_now && charge_now
+						voltage_now.*(charge_now).round(2)
+					else
+						nil
+					end
+
+					c_f_wh = if v_m_d && charge_full
+						v_m_d.*(charge_full).round(2)
+					else
+						nil
+					end
+
+					ret = {}
+					ret[:model] = model_name if model_name
+					ret[:manufacturer] = manufacturer if manufacturer
+					ret[:type] = type if type
+
+					ret[:status] = status if status
+					ret[:online] = online if online
+					ret[:capacity] = capacity if capacity
+
+					ret[:voltage_min_design] = v_m_d if v_m_d
+					ret[:charge_full_design] = c_f_d if c_f_d
+					ret[:charge_full_design_wh] = c_f_d_wh if c_f_d_wh
+
+					ret[:voltage_now] = voltage_now if voltage_now
+					ret[:charge_now] = charge_now if charge_now
+
+					ret[:charge_now_wh] = c_n_wh if c_n_wh
+					ret[:charge_full_wh] = c_f_wh if c_f_wh
+					ret[:charge_percentage] = charge_percentage if charge_percentage
+
+					h.merge!(File.split(x)[-1].to_sym => ret)
+				end
+				h
 			end
 
+			private
 			def manufacturer_readable?
 				@@manufacturer_readable ||= File.readable?(File.join(PATH, 'manufacturer'))
 			end
@@ -122,11 +290,6 @@ module LinuxStat
 			def status_readable?
 				@@status_readable ||= File.readable?(File.join(PATH, 'status'))
 			end
-
-			def charge_now_readable?
-				@@charge_now_readable ||= File.readable?(File.join(PATH, 'charge_now')) &&
-					File.readable?(File.join(PATH, 'charge_full'))
-			end
 		end
 	end
 end