iStats 0.0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a2f312a29bf4d7fb4afbe20dc1c805411e7ef2
-  data.tar.gz: 2faa9e60b56008e5a0ed526e7e90f941bc99cd9c
+  metadata.gz: 46b672f385914695c84c7b0039a9936194185d08
+  data.tar.gz: d683d69c2094a1c16a810f48af5f16d0ccb2a71d
 SHA512:
-  metadata.gz: 3ddd5d18c2c7a3d00e5e7cc9095d1f1485ca2825f8116c95429b5b7b69bd83b6ce6b8bed74db718bb61fe4a0c5ad2d0f3efef333f899feb9d2fcfc21ccc0e6cf
-  data.tar.gz: 16e47c3fdb34e28de1f12b4ecc51a1f6858f2b4a76bad29f0fb816570472a4500eed2e3c3952d24c1d3eebd089c86737a60228b2bcd389d31fa8bf7d4c64952e
+  metadata.gz: 69fc87975d1584f76b7d898ec03dfadecc7103d2957a8e55f720d10383ec88fb51b55da4953e915aea0bdf0afb610b5b98d40a34bd8702a835884136db17af30
+  data.tar.gz: ab1565ffba4602dd28557cb14ff4607c26d886192d03f325fb6691edeea47184574bc196b9a406922b8dc58665a5f5e712623cc34b7fb14fc605087af4151e8a

data/README.md

@@ -55,5 +55,5 @@ If you are using RVM or homebrew to manage your Ruby installation you should be
 
 #### Tested on
 MacBook Pro 2012<br>
-OS X 10.9.2<br>
+OS X 10.9.3<br>
 Ruby: 1.9.3, 2.0.0, 2.1.1<br>

data/ext/osx_stats/smc.c

@@ -413,21 +413,26 @@ VALUE method_get_battery_charge(VALUE self) {
     }
 }
 
+#ifdef SMC_MAIN_TEST
 /* Main method used for test */
-// int main(int argc, char *argv[])
-// {
-//     //SMCOpen();
-//     //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();
-//
-//     int designCycleCount = getDesignCycleCount();
-//     const char* batteryHealth = getBatteryHealth();
-//
-//   	if (designCycleCount) printf ("%i\n", designCycleCount);
-//     if (batteryHealth) printf ("%s\n", batteryHealth);
-//
-//     return 0;
-// }
+int main(int argc, char *argv[])
+{
+    SMCOpen();
+    int i = 0, fans = SMCGetFanNumber(SMC_KEY_FAN_NUM);
+    float bat_temp = SMCGetTemperature(SMC_KEY_BATTERY_TEMP);
+    printf("CPU\t%0.1f\t°C\n", SMCGetTemperature(SMC_KEY_CPU_TEMP));
+    printf("FAN_NUM\t%i\n", fans);
+    for (i = 0; i < fans; i++)
+        printf ("FAN_%i\t%0.1f\tRPM\n", i, SMCGetFanSpeed(i));
+    SMCClose();
+
+    printf ("HasBatt\t%i\n", hasBattery());
+    printf ("Battery\t%0.1f\t°C\n", bat_temp);
+    printf ("Health\t%s\n", getBatteryHealth());
+    printf ("DCycle\t%i\n", getDesignCycleCount());
+    printf ("Remain\t%0.0f\tmAh\n", IOPSGetTimeRemainingEstimate());
+    printf ("Charge\t%i\t%%\n", getBatteryCharge());
+
+    return 0;
+}
+#endif

data/iStats.gemspec

@@ -28,6 +28,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "sparkr", "~> 0.4"
 
   s.add_development_dependency "bundler", "~> 1.3"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rake-compiler"
+  s.add_development_dependency "rake", "~> 1.8"
+  s.add_development_dependency "rake-compiler", "~> 1.8"
 end

data/lib/iStats/battery.rb

@@ -46,8 +46,8 @@ module IStats
       # Prints the battery cycle count info
       #
       def cycle_count
-        data = %x( ioreg -l | grep "CycleCount" )
-        cycle_count = data[/"CycleCount" = ([0-9]*)/, 1]
+        @ioreg_out ||= %x( ioreg -rn AppleSmartBattery )
+        cycle_count = @ioreg_out[/"CycleCount" = ([0-9]*)/, 1]
         if cycle_count == nil
           puts "Cycle count: unknown"
         else
@@ -62,8 +62,8 @@ module IStats
       # Get information from ioreg
       #
       def grep_ioreg(keyword)
-        data = %x( ioreg -l | grep "#{keyword}" )
-        capacity = data[/"#{keyword}" = ([0-9]*)/, 1]
+        @ioreg_out ||= %x( ioreg -rn AppleSmartBattery )
+        capacity = @ioreg_out[/"#{keyword}" = ([0-9]*)/, 1]
       end
 
       # Original max capacity
@@ -89,7 +89,9 @@ module IStats
       def print_capacity_info
         percentage = (cur_max_capacity.to_f/ori_max_capacity.to_f)*100
         thresholds = [45, 65, 85, 95]
-        puts "Current charge:  #{cur_capacity} mAh"
+        charge = get_battery_charge
+        charge = charge ? "  #{charge}%" : ""
+        puts "Current charge:  #{cur_capacity} mAh#{charge}"
         puts "Maximum charge:  #{cur_max_capacity} mAh " + Printer.gen_sparkline(100-percentage, thresholds) + "  #{percentage.round(1)}%"
         puts "Design capacity: #{ori_max_capacity} mAh"
       end

data/lib/iStats/version.rb

@@ -1,3 +1,3 @@
 module IStats
-  VERSION = '0.0.9'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iStats
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris911
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkr
@@ -42,30 +42,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 description: iStats is a command-line tool that allows you to easily grab the CPU
   temperature, fan speeds and battery information on OS X.
 email:
@@ -78,7 +78,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,22 +0,0 @@
-PATH
-  remote: .
-  specs:
-    iStats (0.0.9)
-      sparkr (~> 0.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    rake (10.3.1)
-    rake-compiler (0.9.2)
-      rake
-    sparkr (0.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  iStats!
-  rake
-  rake-compiler