sensors 0.0.1 → 0.0.1.1

data/lib/sensors.rb

@@ -38,13 +38,13 @@ module Sensors
 
   def self.chips (match=nil)
     Enumerator.new do |e|
-			number = FFI::MemoryPointer.new :int
+      number = FFI::MemoryPointer.new :int
       match  = Chip.new(match.to_s) if match
 
       until (chip = C::sensors_get_detected_chips(match.to_ffi, number)).null?
         e << Chip.new(chip)
       end
-		end
+    end
   end
 end
 

data/lib/sensors/c/types.rb

@@ -31,19 +31,19 @@ module Sensors; module C
 # :string, :libsensors_version # TODO: look how to get an extern var
 
 BusType = FFI::Enum.new([
-	:any, -1,
-	:i2c,
-	:isa,
-	:pci,
-	:spi,
-	:virtual,
-	:acpi,
-	:hid
+  :any, -1,
+  :i2c,
+  :isa,
+  :pci,
+  :spi,
+  :virtual,
+  :acpi,
+  :hid
 ])
 
 module BusNumber
-	Any    = -1
-	Ignore = -2
+  Any    = -1
+  Ignore = -2
 end
 
 class BusId < FFI::Struct
@@ -62,7 +62,7 @@ end
 
 FeatureType = FFI::Enum.new([
   :in,          0x00,
-	:fan,         0x01,
+  :fan,         0x01,
   :temp,        0x02,
   :power,       0x03,
   :energy,      0x04,
@@ -77,102 +77,102 @@ FeatureType = FFI::Enum.new([
 ])
 
 SubfeatureType = FFI::Enum.new([
-	:in_input, FeatureType[:in] << 8,
-	:in_min,
-	:in_max,
-	:in_lcrit,
-	:in_crit,
-	:in_alarm, (FeatureType[:in] << 8) | 0x80,
-	:in_min_alarm,
-	:in_max_alarm,
-	:in_beep,
-	:in_lcrit_alarm,
-	:in_crit_alarm,
-
-	:fan_input, FeatureType[:fan] << 8,
-	:fan_min,
-	:fan_alarm, (FeatureType[:fan] << 8) | 0x80,
-	:fan_fault,
-	:fan_div,
-	:fan_beep,
-	:fan_pulses,
-
-	:temp_input, FeatureType[:temp] << 8,
-	:temp_max,
-	:temp_max_hyst,
-	:temp_min,
-	:temp_crit,
-	:temp_crit_hyst,
-	:temp_lcrit,
-	:temp_emergency,
-	:temp_emergency_hist,
-	:temp_alarm, (FeatureType[:temp] << 8) | 0x80,
-	:temp_max_alarm,
-	:temp_min_alarm,
-	:temp_crit_alarm,
-	:temp_fault,
-	:temp_type,
-	:temp_offset,
-	:temp_beep,
-	:temp_emergency_alarm,
-	:temp_lcrit_alarm,
-
-	:power_average, FeatureType[:power] << 8,
-	:power_average_highest,
-	:power_average_lowest,
-	:power_input,
-	:power_input_highest,
-	:power_input_lowest,
-	:power_cap,
-	:power_cap_hyst,
-	:power_max,
-	:power_crit,
-	:power_average_interval, (FeatureType[:power] << 8) | 0x80,
-	:power_alarm,
-	:power_cap_alarm,
-	:power_max_alarm,
-	:power_crit_alarm,
-
-	:energy_input, FeatureType[:energy] << 8,
-
-	:curr_input, FeatureType[:curr] << 8,
-	:curr_min,
-	:curr_max,
-	:curr_lcrit,
-	:curr_crit,
-	:curr_alarm, (FeatureType[:curr] << 8) | 0x80,
-	:curr_min_alarm,
-	:curr_max_alarm,
-	:curr_beep,
-	:curr_lcrit_alarm,
-	:curr_crit_alarm,
-
-	:humidity_input, FeatureType[:humidity] << 8,
-
-	:vid, FeatureType[:vid] << 8,
-
-	:intrusion_alarm, FeatureType[:intrusion] << 8,
-	:intrusion_beep
-
-#	:unknown, INT_MAX
+  :in_input, FeatureType[:in] << 8,
+  :in_min,
+  :in_max,
+  :in_lcrit,
+  :in_crit,
+  :in_alarm, (FeatureType[:in] << 8) | 0x80,
+  :in_min_alarm,
+  :in_max_alarm,
+  :in_beep,
+  :in_lcrit_alarm,
+  :in_crit_alarm,
+
+  :fan_input, FeatureType[:fan] << 8,
+  :fan_min,
+  :fan_alarm, (FeatureType[:fan] << 8) | 0x80,
+  :fan_fault,
+  :fan_div,
+  :fan_beep,
+  :fan_pulses,
+
+  :temp_input, FeatureType[:temp] << 8,
+  :temp_max,
+  :temp_max_hyst,
+  :temp_min,
+  :temp_crit,
+  :temp_crit_hyst,
+  :temp_lcrit,
+  :temp_emergency,
+  :temp_emergency_hist,
+  :temp_alarm, (FeatureType[:temp] << 8) | 0x80,
+  :temp_max_alarm,
+  :temp_min_alarm,
+  :temp_crit_alarm,
+  :temp_fault,
+  :temp_type,
+  :temp_offset,
+  :temp_beep,
+  :temp_emergency_alarm,
+  :temp_lcrit_alarm,
+
+  :power_average, FeatureType[:power] << 8,
+  :power_average_highest,
+  :power_average_lowest,
+  :power_input,
+  :power_input_highest,
+  :power_input_lowest,
+  :power_cap,
+  :power_cap_hyst,
+  :power_max,
+  :power_crit,
+  :power_average_interval, (FeatureType[:power] << 8) | 0x80,
+  :power_alarm,
+  :power_cap_alarm,
+  :power_max_alarm,
+  :power_crit_alarm,
+
+  :energy_input, FeatureType[:energy] << 8,
+
+  :curr_input, FeatureType[:curr] << 8,
+  :curr_min,
+  :curr_max,
+  :curr_lcrit,
+  :curr_crit,
+  :curr_alarm, (FeatureType[:curr] << 8) | 0x80,
+  :curr_min_alarm,
+  :curr_max_alarm,
+  :curr_beep,
+  :curr_lcrit_alarm,
+  :curr_crit_alarm,
+
+  :humidity_input, FeatureType[:humidity] << 8,
+
+  :vid, FeatureType[:vid] << 8,
+
+  :intrusion_alarm, FeatureType[:intrusion] << 8,
+  :intrusion_beep
+
+#  :unknown, INT_MAX
 ])
 
 class Feature < FFI::Struct
-	layout \
-		:name,    :string,
-		:number,  :int,
-		:type,    FeatureType,
-		:mapping, :int,
-		:flags,   :uint
+  layout \
+    :name,    :string,
+    :number,  :int,
+    :type,    FeatureType,
+    :mapping, :int,
+    :flags,   :uint
 end
 
 class Subfeature < FFI::Struct
-	layout \
-		:name,    :string,
-		:number,  :int,
-		:type,    SubfeatureType,
-		:mapping, :int,
-		:flags,   :uint
+  layout \
+    :name,    :string,
+    :number,  :int,
+    :type,    SubfeatureType,
+    :mapping, :int,
+    :flags,   :uint
 end
 
 end; end

data/lib/sensors/chip.rb

@@ -32,53 +32,53 @@ require 'sensors/subfeature'
 module Sensors
 
 class Chip
-	attr_reader :name
+  attr_reader :name
 
-	def initialize (name=nil)
-		if name.is_a?(C::ChipName) || name.is_a?(FFI::Pointer)
-			@chip_name = name.is_a?(C::ChipName) ? name : C::ChipName.new(name)
-			name       = nil
-		else
-			@chip_name = C::ChipName.new
-			C::sensors_parse_chip_name(name, @chip_name)
+  def initialize (name=nil)
+    if name.is_a?(C::ChipName) || name.is_a?(FFI::Pointer)
+      @chip_name = name.is_a?(C::ChipName) ? name : C::ChipName.new(name)
+      name       = nil
+    else
+      @chip_name = C::ChipName.new
+      C::sensors_parse_chip_name(name, @chip_name)
 
-			ObjectSpace.define_finalizer self, Chip.finalizer(@chip_name.pointer)
-		end
+      ObjectSpace.define_finalizer self, Chip.finalizer(@chip_name.pointer)
+    end
 
-		FFI::MemoryPointer.new(512).tap {|pointer|
-			@name = if C::sensors_snprintf_chip_name(pointer, 512, to_ffi) < 0
-				name
-			else
-				pointer.typecast(:string)
-			end
-		}
-	end
+    FFI::MemoryPointer.new(512).tap {|pointer|
+      @name = if C::sensors_snprintf_chip_name(pointer, 512, to_ffi) < 0
+        name
+      else
+        pointer.typecast(:string)
+      end
+    }
+  end
 
-	def self.finalizer (pointer)
-		proc {
-			C::sensors_free_chip_name(pointer)
-		}
-	end
+  def self.finalizer (pointer)
+    proc {
+      C::sensors_free_chip_name(pointer)
+    }
+  end
 
-	def features
-		Enumerator.new do |e|
-			number = FFI::MemoryPointer.new :int
+  def features
+    Enumerator.new do |e|
+      number = FFI::MemoryPointer.new :int
 
-			until (feature = C::sensors_get_features(to_ffi, number)).null?
-				e << Feature.new(self, feature)
-			end
-		end
-	end
+      until (feature = C::sensors_get_features(to_ffi, number)).null?
+        e << Feature.new(self, feature)
+      end
+    end
+  end
 
-	alias to_s name
+  alias to_s name
 
-	def inspect
-		"#<Chip: #{name || 'unknown'}>"
-	end
+  def inspect
+    "#<Chip: #{name || 'unknown'}>"
+  end
 
-	def to_ffi
-		@chip_name
-	end
+  def to_ffi
+    @chip_name
+  end
 end
 
 end

data/lib/sensors/feature.rb

@@ -29,40 +29,40 @@
 module Sensors
 
 class Feature
-	attr_reader :chip, :label
+  attr_reader :chip, :label
 
-	def initialize (chip, pointer)
-		@chip  = chip
-		@value = pointer.is_a?(C::Feature) ? pointer : C::Feature.new(pointer)
+  def initialize (chip, pointer)
+    @chip  = chip
+    @value = pointer.is_a?(C::Feature) ? pointer : C::Feature.new(pointer)
 
-		@label = C::sensors_get_label(chip.to_ffi, to_ffi)
-	end
+    @label = C::sensors_get_label(chip.to_ffi, to_ffi)
+  end
 
-	C::Feature.layout.members.each {|name|
+  C::Feature.layout.members.each {|name|
     define_method name do
       @value[name]
     end
   }
 
-	def subfeature (type)
-		Subfeature.new(self, C::sensors_get_subfeature(chip.to_ffi, to_ffi, C::SubfeatureType["#{feature.type}_#{type.downcase}".to_sym]))
-	end
+  def subfeature (type)
+    Subfeature.new(self, C::sensors_get_subfeature(chip.to_ffi, to_ffi, C::SubfeatureType["#{feature.type}_#{type.downcase}".to_sym]))
+  end
 
-	def subfeatures
-		Enumerator.new do |e|
-			number = FFI::MemoryPointer.new :int
+  def subfeatures
+    Enumerator.new do |e|
+      number = FFI::MemoryPointer.new :int
 
-			until (subfeature = C::sensors_get_all_subfeatures(chip.to_ffi, to_ffi, number)).null?
-				e << Subfeature.new(self, subfeature)
-			end
-		end
-	end
+      until (subfeature = C::sensors_get_all_subfeatures(chip.to_ffi, to_ffi, number)).null?
+        e << Subfeature.new(self, subfeature)
+      end
+    end
+  end
 
-	alias to_s name
+  alias to_s name
 
-	def to_ffi
-		@value
-	end
+  def to_ffi
+    @value
+  end
 end
 
 end

data/lib/sensors/subfeature.rb

@@ -29,37 +29,37 @@
 module Sensors
 
 class Subfeature
-	attr_reader :chip
+  attr_reader :chip
 
-	def initialize (feature, pointer)
-		@chip    = feature.chip
-		@feature = feature
-		@value   = pointer.is_a?(C::Subfeature) ? pointer : C::Subfeature.new(pointer)
-	end
+  def initialize (feature, pointer)
+    @chip    = feature.chip
+    @feature = feature
+    @value   = pointer.is_a?(C::Subfeature) ? pointer : C::Subfeature.new(pointer)
+  end
 
-	C::Subfeature.layout.members.each {|name|
+  C::Subfeature.layout.members.each {|name|
     define_method name do
       @value[name]
     end
   }
 
-	def value
-		FFI::MemoryPointer.new(:double).tap {|result|
-			C::sensors_get_value(chip.to_ffi, to_ffi, result)
+  def value
+    FFI::MemoryPointer.new(:double).tap {|result|
+      C::sensors_get_value(chip.to_ffi, to_ffi, result)
 
-			break result.typecast(:double)
-		}
-	end
+      break result.typecast(:double)
+    }
+  end
 
-	def value= (value)
-		C::sensors_set_value(chip.to_ffi, to_ffi, value)
-	end
+  def value= (value)
+    C::sensors_set_value(chip.to_ffi, to_ffi, value)
+  end
 
-	alias to_s name
+  alias to_s name
 
-	def to_ffi
-		number
-	end
+  def to_ffi
+    number
+  end
 end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: sensors
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.1.1
 platform: ruby
 authors: 
 - meh.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 Z
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -23,6 +23,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ffi-extra
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: meh@paranoici.org
 executables: []