iStats 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ef0dfa872c16561636ee9ffd55048b59b3bba9
-  data.tar.gz: 374f759ee22e0a411c17658ff7474d8bd7b305c1
+  metadata.gz: 13a2f312a29bf4d7fb4afbe20dc1c805411e7ef2
+  data.tar.gz: 2faa9e60b56008e5a0ed526e7e90f941bc99cd9c
 SHA512:
-  metadata.gz: 6e50c705d65d13ea355be98fd7666b7df415fb403973ea3bc1243c07d38b347b91130f519bddad0b43bd90587a723b63976732a14734c1281b51f37cf1a61187
-  data.tar.gz: ee65277dd9c6aafb455200f912d1f5acd0c7e1dc0631b866d5413fb579c01de3a7e2ea05d121a190465db8c01de9c1a9ee447d0c9d0397c642359db4266a67e7
+  metadata.gz: 3ddd5d18c2c7a3d00e5e7cc9095d1f1485ca2825f8116c95429b5b7b69bd83b6ce6b8bed74db718bb61fe4a0c5ad2d0f3efef333f899feb9d2fcfc21ccc0e6cf
+  data.tar.gz: 16e47c3fdb34e28de1f12b4ecc51a1f6858f2b4a76bad29f0fb816570472a4500eed2e3c3952d24c1d3eebd089c86737a60228b2bcd389d31fa8bf7d4c64952e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iStats (0.0.6)
+    iStats (0.0.9)
       sparkr (~> 0.4)
 
 GEM

data/README.md

@@ -1,12 +1,12 @@
 iStats [![Gem Version](https://badge.fury.io/rb/iStats.svg)](http://badge.fury.io/rb/iStats)
 ======
 
-iStats is a command-line tool that allows you to easily grab the CPU temperature, fan speeds and battery information on OS X. If you'd like to see more data available feel free to open an issue. 
+iStats is a command-line tool that allows you to easily grab the CPU temperature, fan speeds and battery information on OS X. If you'd like to see more data available feel free to open an issue.
 
 ## Installation
 
     $ gem install iStats
-    
+
 #### Warning
 **This is now fixed with the release of OS X 10.9.3**<br>
 A [bug in Ruby](https://bugs.ruby-lang.org/issues/9624) and Apple XCode 5.1 onwards (new CLANG version) might make it impossible to install this gem if you are using Ruby from the Xcode command-line tools package. If you see an error when the gem is building the native extension try to use this command to install iStats: <br>
@@ -16,7 +16,7 @@ If you are using RVM or homebrew to manage your Ruby installation you should be
 
 ## Screenshot
 #### All Stats
-![](http://i.imgur.com/f3tCnnW.png)
+![](http://i.imgur.com/c4xLB8u.png)
 
 #### Sparkline levels
 ![](http://i.imgur.com/ht2NZCL.gif)
@@ -40,6 +40,7 @@ If you are using RVM or homebrew to manage your Ruby installation you should be
   istats battery [temp | temperature]      Print battery temperature
   istats battery [time | remain]           Print battery time remaining
   istats battery [charge]                  Print battery charge
+  istats battery [capacity]                Print battery capacity info
 
   for more help see: https://github.com/Chris911/iStats
 ```

data/lib/iStats/battery.rb

@@ -25,6 +25,8 @@ module IStats
           battery_time_remaining
         when 'charge'
           battery_charge
+        when 'capacity'
+          print_capacity_info
         else
           Command.help "Unknown stat for Battery: #{stat}"
         end
@@ -36,26 +38,62 @@ module IStats
         return unless validate_battery
 
         battery_health
-        battery_temperature
         cycle_count
+        print_capacity_info
+        battery_temperature
       end
 
       # Prints the battery cycle count info
       #
       def cycle_count
-        data = %x( ioreg -l | grep Capacity )
-        cycle_count = data[/"Cycle Count"=([0-9]*)/, 1]
+        data = %x( ioreg -l | grep "CycleCount" )
+        cycle_count = data[/"CycleCount" = ([0-9]*)/, 1]
         if cycle_count == nil
           puts "Cycle count: unknown"
         else
           max_cycle_count = design_cycle_count
           percentage = (cycle_count.to_f/max_cycle_count.to_f)*100
           thresholds = [45, 65, 85, 95]
-          puts "Cycle count: #{cycle_count}  " + Printer.gen_sparkline(percentage, thresholds)
+          puts "Cycle count: #{cycle_count}  " + Printer.gen_sparkline(percentage, thresholds) + "  #{percentage.round(1)}%"
           puts "Max cycle count: #{max_cycle_count}"
         end
       end
 
+      # Get information from ioreg
+      #
+      def grep_ioreg(keyword)
+        data = %x( ioreg -l | grep "#{keyword}" )
+        capacity = data[/"#{keyword}" = ([0-9]*)/, 1]
+      end
+
+      # Original max capacity
+      #
+      def ori_max_capacity
+        grep_ioreg("DesignCapacity")
+      end
+
+      # Current max capacity
+      #
+      def cur_max_capacity
+        grep_ioreg("MaxCapacity")
+      end
+
+      # Current capacity
+      #
+      def cur_capacity
+        grep_ioreg("CurrentCapacity")
+      end
+
+      # Print battery capacity info
+      #
+      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"
+        puts "Maximum charge:  #{cur_max_capacity} mAh " + Printer.gen_sparkline(100-percentage, thresholds) + "  #{percentage.round(1)}%"
+        puts "Design capacity: #{ori_max_capacity} mAh"
+      end
+
       # Get the battery temperature
       #
       def battery_temperature

data/lib/iStats/command.rb

@@ -95,6 +95,7 @@ module IStats
           istats battery [cycleCount | cc]         Print battery cycle count info
           istats battery [temp | temperature]      Print battery temperature
           istats battery [charge]                  Print battery charge
+          istats battery [capacity]                Print battery capacity info
 
           for more help see: https://github.com/Chris911/iStats
         ".gsub(/^ {8}/, '') # strip the first eight spaces of every line

data/lib/iStats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iStats
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chris911
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkr