iStats 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a03b4b826a3677a7d9a4cfe1a2e4cb4d82a5be
-  data.tar.gz: 9b75eaf35c248fce0c9d1edcc36e9ed1735bab05
+  metadata.gz: f6d54c5c804c54fed0d04f31076a0aaa8ba12dfe
+  data.tar.gz: 622027f040ac6ae403c3d1001701a75e8732c9dd
 SHA512:
-  metadata.gz: d412be9240b14e9c977e0490b480a44d5dfcb2d3b1301b70db1025d80e1f67f31b2b1682757eaf369d09e3fe94fcb70b78e9dd17c66e3f81ce7e42279fcfa54c
-  data.tar.gz: 2865be544f5d2202e2dedc54acf8de8fefb908e5fc36a2ff7ff9dc9fab0b83c8bf8bd4e533238b9caa972d2257619fca07621da17d085d4ff520d6e255040f6e
+  metadata.gz: 74ffa8f9e3b78f50e6fcb767ead6f877ef1c133ba1c7822b56541d5b19700797f2f3227879ec75b1871c6f1aa10ed0754ba65d75cb668023d8c24876406689b5
+  data.tar.gz: 69c8d8d52003bfa4432765e59390c71f619d55336cc266fe65a4cc51515b31bf959a982de37092e022ef16cc2e5aeb92b4f5385c9fbd88e650eba9b6e7279014

data/README.md

@@ -23,27 +23,32 @@ If you are running an older version of OS X and the install fails you might want
 ```
   - iStats: help ---------------------------------------------------
 
-  istats --help                            This help text
-  istats --version                         Print current version
-
-  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
-  istats battery                           Print all battery stats
-  istats battery [health]                  Print battery health
-  istats battery [cycle_count | cc]        Print battery cycle count info
-  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
-
-  istats scan                              Scans and print temperatures
-  istats scan [key]                        Print single SMC temperature key
-  istats enable [key | all]                Enables key
-  istats disable [key | all]               Disable key
-  istats list                              List available keys
+  istats --help                        This help text
+  istats --version                     Print current version
+
+  # Commands
+  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
+  istats battery                       Print all battery stats
+  istats battery [health]              Print battery health
+  istats battery [time | remain]       Print battery time remaining
+  istats battery [cycle_count | 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
+
+  istats scan                          Scans and print temperatures
+  istats scan [key]                    Print single SMC temperature key
+  istats enable [key | all]            Enables key
+  istats disable [key | all]           Disable key
+  istats list                          List available keys
+
+  # Arguments
+  --no-graphs                          Don't display sparklines graphs
+  -f, --fahrenheit                     Display temperatures in fahrenheit
 
   for more help see: https://github.com/Chris911/iStats
 ```

data/lib/iStats.rb

@@ -17,6 +17,7 @@ require 'iStats/battery'
 require 'iStats/extra'
 require 'iStats/smc'
 require 'iStats/settings'
+require 'iStats/utils'
 
 module IStats
   def self.options

data/lib/iStats/battery.rb

@@ -99,7 +99,7 @@ module IStats
       # Get the battery temperature
       #
       def battery_temperature
-        puts "Battery temp: #{get_battery_temp.round(2)}#{Symbols.degree}C  "
+        puts "Battery temp: #{Printer.format_temperature(get_battery_temp)}  "
       end
 
       # Get the battery health

data/lib/iStats/command.rb

@@ -26,6 +26,7 @@ module IStats
       #
       def setup(options)
         Printer.disable_graphs unless options[:display_graphs]
+        Printer.set_temperature_scale options[:temperature_scale]
       end
 
       # Delegate command to proper class
@@ -81,7 +82,7 @@ module IStats
       #
       # returns nothing
       def parse_options
-        options = {:display_graphs => true}
+        options = {:display_graphs => true, :temperature_scale => 'celcius'}
 
         opt_parser = OptionParser.new do |opts|
           opts.on('-v', '--version', 'Print Version') do
@@ -97,6 +98,10 @@ module IStats
           opts.on('--no-graphs', 'Don\'t display graphs') do
             options[:display_graphs] = false
           end
+
+          opts.on('-f', '--fahrenheit', 'Display temperatures in fahrenheit') do
+            options[:temperature_scale] = 'fahrenheit'
+          end
         end
 
         begin
@@ -144,6 +149,7 @@ module IStats
 
           # Arguments
           --no-graphs                          Don't display sparklines graphs
+          -f, --fahrenheit                     Display temperatures in fahrenheit
 
           for more help see: https://github.com/Chris911/iStats
         ".gsub(/^ {8}/, '') # strip the first eight spaces of every line

data/lib/iStats/cpu.rb

@@ -30,7 +30,7 @@ module IStats
       def cpu_temperature
         t = get_cpu_temp
         thresholds = [50, 68, 80, 90]
-        puts "CPU temp: #{t}#{Symbols.degree}C  " + Printer.gen_sparkline(t, thresholds)
+        puts "CPU temp: #{Printer.format_temperature(t)} #{Printer.gen_sparkline(t, thresholds)}"
       end
     end
   end

data/lib/iStats/extra.rb

@@ -46,14 +46,14 @@ module IStats
         end
       end
 
-      # Pretty print sensor tempaerature
+      # Pretty print sensor temperature
       def display_temp(key, sensor, display)
         t = SMC.is_key_supported(key).round(2);
         thresholds = sensor['thresholds'][1..-2].split(/, /).map { |s| s.to_i }
         if (display)
-          puts "#{key} #{t}#{Symbols.degree}C \t" + Printer.gen_sparkline(t, thresholds) + " #{sensor['name']}"
+          puts "#{key} #{Printer.format_temperature(t)} \t#{Printer.gen_sparkline(t, thresholds)} #{sensor['name']}"
         else
-          puts "#{key} #{sensor['name']} temp: #{t}#{Symbols.degree}C  " + Printer.gen_sparkline(t, thresholds)
+          puts "#{key} #{sensor['name']} temp: #{Printer.format_temperature(t)}  #{Printer.gen_sparkline(t, thresholds)}"
         end
       end
     end

data/lib/iStats/printer.rb

@@ -1,6 +1,7 @@
 module IStats
   class Printer
     @display_graphs = true
+    @temperature_scale = 'celcius'
 
     class << self
       include IStats::Color
@@ -9,6 +10,10 @@ module IStats
         @display_graphs = false
       end
 
+      def set_temperature_scale(scale)
+        @temperature_scale = scale
+      end
+
       # Create colored sparkline
       # value      - The stat value
       # thresholds - must be an array of size 4 containing the threshold values
@@ -37,6 +42,18 @@ module IStats
           end
         end
       end
+
+      # Pretty print temperature values.
+      # Also converts the value to the class temperature_scale.
+      #
+      # Returns the temperature string.
+      def format_temperature(temperature)
+        if @temperature_scale == 'celcius'
+          "#{temperature.round(2)}#{Symbols.degree}C"
+        else
+          "#{Utils.to_fahrenheit(temperature).round(2)}#{Symbols.degree}F"
+        end
+      end
     end
   end
 end

data/lib/iStats/smc.rb

@@ -112,7 +112,7 @@ module IStats
 
                 Settings.addSensor(key, sensors)
 
-                puts "#{key} #{sensors['name']}  #{t}#{Symbols.degree}C  " + Printer.gen_sparkline(t, sensors['thresholds'])
+                puts "#{key} #{sensors['name']}  #{Printer.format_temperature(t)}  #{Printer.gen_sparkline(t, sensors['thresholds'])}"
               end
             }
           }

data/lib/iStats/utils.rb

@@ -0,0 +1,12 @@
+module IStats
+  module Utils
+    extend self
+    
+    # Converts a temperature value in celcius to fahrenheit.
+    #
+    # Returns the temperature in fahrenheit.
+    def to_fahrenheit(temperature)
+      (temperature * (9.0 / 5.0)) + 32
+    end
+  end
+end

data/lib/iStats/version.rb

@@ -1,3 +1,3 @@
 module IStats
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iStats
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris911
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkr
@@ -111,6 +111,7 @@ files:
 - lib/iStats/settings.rb
 - lib/iStats/smc.rb
 - lib/iStats/symbols.rb
+- lib/iStats/utils.rb
 - lib/iStats/version.rb
 homepage: https://github.com/Chris911/iStats
 licenses: