iStats 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a2eb06ddde880e36b03cf31038ddff22ca21488
-  data.tar.gz: 3c2079b2b812dbcc117688c5c680ae8f08853ab1
+  metadata.gz: f4a03b4b826a3677a7d9a4cfe1a2e4cb4d82a5be
+  data.tar.gz: 9b75eaf35c248fce0c9d1edcc36e9ed1735bab05
 SHA512:
-  metadata.gz: 91ede5007967a1929e0a31216a9b1c0be2b116e62c8466162249ff287b45a2172b8cddca4580dfb916766e81d4af43f7a9878ad59a3790e2277c890c10770fb3
-  data.tar.gz: add07f319d4f174a38da7fbcd64408240a48abe427fecdab5395906e65e1a1ae2ba5de0fe6800a7da3444fa8ff19907d14d0695b3f65fc5af6f5656d7b724f62
+  metadata.gz: d412be9240b14e9c977e0490b480a44d5dfcb2d3b1301b70db1025d80e1f67f31b2b1682757eaf369d09e3fe94fcb70b78e9dd17c66e3f81ce7e42279fcfa54c
+  data.tar.gz: 2865be544f5d2202e2dedc54acf8de8fefb908e5fc36a2ff7ff9dc9fab0b83c8bf8bd4e533238b9caa972d2257619fca07621da17d085d4ff520d6e255040f6e

data/.gitignore

@@ -34,3 +34,9 @@ build/
 .rvmrc
 
 Makefile.ori
+
+# Compiled files
+ext/osx_stats/Makefile
+ext/osx_stats/osx_stats.bundle
+ext/osx_stats/smc.o
+lib/osx_stats.bundle

data/README.md

@@ -65,6 +65,11 @@ iStats now supports extra sensors for advanced users. Here's how to enable that
 5. Create new Pull Request
 
 #### Tested on
+
+MacBook Pro 2011
+OS X: 10.11.6
+Ruby: 2.0.0
+
 MacBook Pro 2012    
 OS X: 10.9.3    
 Ruby: 1.9.3, 2.0.0, 2.1.1    

data/bin/istats

@@ -5,4 +5,4 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'iStats'
 
-IStats::Command.execute(*ARGV)
+IStats::Command.execute()

data/lib/iStats/command.rb

@@ -6,16 +6,26 @@ module IStats
 
       # Executes a command
       #
-      # args - Command line arguments
-      #
-      def execute(*args)
+      def execute
+        Settings.load
+
+        options = parse_options
+
         # Default command is 'all'
-        category = args.empty? ? 'all' : args.shift
-        stat     = args.empty? ? 'all' : args.shift
+        category = ARGV.empty? ? 'all' : ARGV.shift
+        stat     = ARGV.empty? ? 'all' : ARGV.shift
+
+        setup options
 
-        Settings.load;
-        parse_options
-        delegate(category, stat)
+        delegate(category, stat, options)
+      end
+
+      # Setup execution by applying global settings
+      #
+      # options - command line options
+      #
+      def setup(options)
+        Printer.disable_graphs unless options[:display_graphs]
       end
 
       # Delegate command to proper class
@@ -23,7 +33,7 @@ module IStats
       # category - Hardware we are targeting (CPU, fan, etc.)
       # stat     - The stat we want
       #
-      def delegate(category, stat)
+      def delegate(category, stat, options)
         case category
         when 'all'
           all
@@ -71,18 +81,27 @@ module IStats
       #
       # returns nothing
       def parse_options
-        o = OptionParser.new do |opts|
+        options = {:display_graphs => true}
+
+        opt_parser = OptionParser.new do |opts|
           opts.on('-v', '--version', 'Print Version') do
             puts "iStats v#{IStats::VERSION}"
             quit
           end
+
           opts.on('-h', '--help', 'Print Help') do
             help
             quit
           end
+
+          opts.on('--no-graphs', 'Don\'t display graphs') do
+            options[:display_graphs] = false
+          end
         end
+
         begin
-          o.parse!
+          opt_parser.parse!
+          options
         rescue OptionParser::MissingArgument => e
           help e.message
           quit
@@ -100,27 +119,31 @@ module IStats
         " #{error.nil? ? '' : red("\n[Error] #{error}\n")}
           - 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 [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
+          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
 
           for more help see: https://github.com/Chris911/iStats
         ".gsub(/^ {8}/, '') # strip the first eight spaces of every line

data/lib/iStats/printer.rb

@@ -1,14 +1,23 @@
 module IStats
   class Printer
+    @display_graphs = true
+
     class << self
       include IStats::Color
 
+      def disable_graphs
+        @display_graphs = false
+      end
+
       # Create colored sparkline
       # value      - The stat value
       # thresholds - must be an array of size 4 containing the threshold values
       #              for the sparkline colors
       #
       def gen_sparkline(value, thresholds)
+        # Graphs can be disabled globally
+        return '' unless @display_graphs
+
         return if thresholds.count < 4
 
         list = [0, 30, 55, 80, 100, 130]

data/lib/iStats/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iStats
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Chris911
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkr