iStats 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9bff6f43ceaf154fc22a175a84ab82d3f1230346
+  data.tar.gz: bcd0dbe5bdbf052142511505b98d8f600d0c1703
+SHA512:
+  metadata.gz: a640c65868a3f78e2f7fb2f9221ccb1de7f7f013e8c81ba5f83fb19d208468c5b1377648a1430323e1d36528ed31100d10bc12841b01e698277665b4d1947ab0
+  data.tar.gz: 6d640b55b90680bdf895d685eff2b1ce2b17d3b3fc9e1d438f2dd980e10eade76cfcf87fe0eaf9fd4cb8b2ddcab7e8eae464c665ab2675daf2c8c52a5b7622cb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iStats (0.0.2)
+    iStats (0.0.3)
       sparkr
 
 GEM

data/README.md

@@ -3,23 +3,16 @@ iStats
 
 Quick attempt at writing a Ruby wrapper for a small C library that interacts with the IOKit library (apple) to get the CPU temperature. Will expand to more hardware data and stats in the future. 
 
-__Note:__ Currently only works for Ruby 2.0. Working on a new gem that will work on 1.9, 2.0 and 2.1.
+#### Tested on
+MacBook Pro 2012<br>
+OS X 10.9.2<br>
+Ruby: 1.9.3, 2.0.0, 2.1.1<br>
 
 ## Screenshot
 ![](http://i.imgur.com/ht2NZCL.gif)
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'iStats'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
     $ gem install iStats
 
 ## Usage

data/ext/osx_stats/smc.c

@@ -40,6 +40,24 @@ UInt32 _strtoul(char *str, int size, int base)
     return total;
 }
 
+float _strtof(unsigned char *str, int size, int e)
+{
+    float total = 0;
+    int i;
+
+    for (i = 0; i < size; i++)
+    {
+        if (i == (size - 1))
+            total += (str[i] & 0xff) >> e;
+        else
+            total += str[i] << (size - 1 - i) * (8 - e);
+    }
+
+	total += (str[size-1] & 0x03) * 0.25;
+
+    return total;
+}
+
 void _ultostr(char *str, UInt32 val)
 {
     str[0] = '\0';
@@ -167,19 +185,50 @@ double SMCGetTemperature(char *key)
     return 0.0;
 }
 
+float SMCGetFanSpeed(int fanNum)
+{
+    SMCVal_t val;
+    kern_return_t result;
+
+    UInt32Char_t  key;
+    sprintf(key, SMC_KEY_FAN_SPEED, fanNum);
+    result = SMCReadKey(key, &val);
+    return _strtof(val.bytes, val.dataSize, 2);
+}
+
+int SMCGetFanNumber(char *key)
+{
+    SMCVal_t val;
+    kern_return_t result;
+
+    result = SMCReadKey(key, &val);
+    return _strtoul((char *)val.bytes, val.dataSize, 10);
+}
+
 // int main(int argc, char *argv[])
 // {
 //     SMCOpen();
-//     printf("%0.1f°C\n", SMCGetTemperature(SMC_KEY_CPU_TEMP));
+//     //printf("%0.1f°C\n", SMCGetTemperature(SMC_KEY_CPU_TEMP));
+//     //printf("%0.1f\n", SMCGetFanSpeed(0));
+//     //printf("%0.1f\n", SMCGetFanSpeed(3));
+//     //printf("%i\n", SMCGetFanNumber(SMC_KEY_FAN_NUM));
 //     SMCClose();
 //
 //     return 0;
 // }
 
+//
+// RUBY MODULE
+//
 VALUE CPU_STATS = Qnil;
+VALUE FAN_STATS = Qnil;
 void Init_osx_stats() {
 	CPU_STATS = rb_define_module("CPU_STATS");
 	rb_define_method(CPU_STATS, "get_cpu_temp", method_get_cpu_temp, 0);
+
+  FAN_STATS = rb_define_module("FAN_STATS");
+  rb_define_method(FAN_STATS, "get_fan_number", method_get_fan_number, 0);
+  rb_define_method(FAN_STATS, "get_fan_speed", method_get_fan_speed, 1);
 }
 
 VALUE method_get_cpu_temp(VALUE self) {
@@ -189,3 +238,20 @@ VALUE method_get_cpu_temp(VALUE self) {
 
   return rb_float_new(temp);
 }
+
+VALUE method_get_fan_number(VALUE self) {
+  SMCOpen();
+  int num = SMCGetFanNumber(SMC_KEY_FAN_NUM);
+  SMCClose();
+
+  return INT2NUM(num);
+}
+
+VALUE method_get_fan_speed(VALUE self, VALUE num) {
+  uint fanNum = NUM2UINT(num);
+  SMCOpen();
+  float speed = SMCGetFanSpeed(fanNum);
+  SMCClose();
+
+  return rb_float_new(speed);
+}

data/ext/osx_stats/smc.h

@@ -41,6 +41,8 @@
 
 // key values
 #define SMC_KEY_CPU_TEMP      "TC0P"
+#define SMC_KEY_FAN_SPEED     "F%dAc"
+#define SMC_KEY_FAN_NUM       "FNum"
 
 
 typedef struct {
@@ -90,8 +92,12 @@ typedef struct {
 
 
 // prototypes
+float SMCGetFanSpeed(int fanNum);
+int SMCGetFanNumber(char *key);
+double SMCGetTemperature(char *key);
+
+// Ruby modules
 void Init_osx_stats();
 VALUE method_get_cpu_temp(VALUE self);
-double SMCGetTemperature(char *key);
-kern_return_t SMCSetFanRpm(char *key, int rpm);
-int SMCGetFanRpm(char *key);
+VALUE method_get_fan_speed(VALUE self, VALUE num);
+VALUE method_get_fan_number(VALUE self);

data/lib/iStats.rb

@@ -11,6 +11,7 @@ require 'iStats/color'
 require 'iStats/symbols'
 require 'iStats/command'
 require 'iStats/cpu'
+require 'iStats/fan'
 
 module IStats
   def self.options

data/lib/iStats/command.rb

@@ -19,6 +19,8 @@ module IStats
           all
         when 'cpu'
           Cpu.delegate stat
+        when 'fan'
+          Fan.delegate stat
         else
           help("Unknown category: #{category}")
         end
@@ -26,7 +28,10 @@ module IStats
 
       def all
         # Exec all
+        puts "--- CPU Stats ---\n"
         Cpu.all
+        puts "\n--- Fan Stats ---\n"
+        Fan.all
       end
 
       # Public: Parse extra options
@@ -68,6 +73,8 @@ module IStats
           istats all                               Print all stats
           istats cpu                               Print all CPU stats
           istats cpu [temp | temperature]          Print CPU temperature
+          istats fan                               Print all fan stats
+          istats fan [speed]                       Print fan speed
 
           for more help see: https://github.com/Chris911/iStats
         ".gsub(/^ {8}/, '') # strip the first eight spaces of every line

data/lib/iStats/fan.rb

@@ -0,0 +1,66 @@
+module IStats
+  # Fan Stats
+  # Extend FAN_STATS C module (ext/osx_stats/smc.c)
+  class Fan
+    extend FAN_STATS
+    class << self
+      include IStats::Color
+
+      def delegate(stat)
+        case stat
+        when 'all'
+          all
+        when 'number', 'num'
+          print_fan_number
+        when 'speed'
+          fans_speed
+        else
+          Command.help "Unknown stat for Fan: #{stat}"
+        end
+      end
+
+      def all
+        print_fan_number
+        fans_speed
+      end
+
+      def fan_number
+        # C method
+        get_fan_number
+      end
+
+      def print_fan_number
+        puts "Total fans on system: #{fan_number}"
+      end
+
+      def fans_speed
+        fanNum = fan_number
+        (0..(fanNum-1)).each do |n|
+          s = get_fan_speed(n)
+          print_fan_speed(n, s)
+        end
+      end
+
+      def print_fan_speed(fanNum, speed)
+        message = "Fan #{fanNum} speed: #{speed} RPM  "
+        list = [0, 30, 55, 80, 100, 130]
+        sparkline = Sparkr.sparkline(list) do |tick, count, index|
+          if index.between?(0, 5) and speed > 5500
+            flash_red(tick)
+          elsif index.between?(0, 1)
+            green(tick)
+          elsif index.between?(2, 3) and speed > 2500
+            light_yellow(tick)
+          elsif index == 4 and speed > 3500
+            yellow(tick)
+          elsif index == 5 and speed > 4500
+            red(tick)
+          else
+            tick
+          end
+        end
+        puts message + sparkline
+      end
+    end
+  end
+end

data/lib/iStats/version.rb

@@ -1,3 +1,3 @@
 module IStats
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iStats
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Chris911
@@ -14,65 +13,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Stats for your mac
@@ -84,7 +75,7 @@ extensions:
 - ext/osx_stats/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -99,32 +90,32 @@ files:
 - lib/iStats/color.rb
 - lib/iStats/command.rb
 - lib/iStats/cpu.rb
+- lib/iStats/fan.rb
 - lib/iStats/symbols.rb
 - lib/iStats/version.rb
 homepage: https://github.com/Chris911/iStats
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Stats for your mac
 test_files: []