graphina 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca65e421a6d4a67744edd6f1acc65219c29f16b5d1decf0e886c9208e9d9906
-  data.tar.gz: ff1f2e42524b8eae0c6df646b010740bc312f8348d03727639a85b097835de4d
+  metadata.gz: f80b47eb1b37298a4d0af81ff87040dfbedfc763d83de640875c4fce56e9d599
+  data.tar.gz: 13a399a5f87f2ec2b0b19c36411eaf8799f2b1013a40e4a63f82a9ef33cb6e0d
 SHA512:
-  metadata.gz: 4fd6afb55759a51ff4b5d6d52723af3e7a29e888273784aa8b637be5591486093bc65fd9315c0a8c02eb83a4e7b53b604b19a1c809f0dc27cdcfd900f49370d0
-  data.tar.gz: f1ec824b10b71a579d9c10e9ffb5642943313952c46b85d199d2d903e60cc2d87b0911fbf9f32a8e54883b72e29b1306e3b64e0b5b141635df0834b0ed41c668
+  metadata.gz: 8eb5ebef9f82cfc6b2321ea4e288bd41703cd4a69fee37e7d1ffc27271e5af65d0698ee4862a17027fc1a5adfa0cd6249704effe656f39ec3f25fa3e997bf5ee
+  data.tar.gz: bb3513cdd086d4eb07ebf4f3999e4380522c92f533f0fc17319010127d6f8c847cf309271d6e936112c613a6aabb6e472e62cb01ebe8ee180be8a201e3bc01c4

data/README.md

@@ -66,12 +66,12 @@ To install one of the included defaults you can try
 graphina -S default
 ```
 
-which attempts to infer a default config for your platform.
-
+which attempts to infer a default config for your platform and install it.
 
 Currently these platforms are included:
 
   - MacOS x86 64 see [x86_64-darwin](lib/graphina/panel/defaults/x86_64-darwin.yml).
+  - MacOS ARM 64 see [arm64-darwin](lib/graphina/panel/defaults/arm64-darwin.yml).
   - Linux x86 64 see [x86_64-linux](lib/graphina/panel/defaults/x86_64-linux.yml).
 
 These can be installed eplicitly via:
@@ -109,7 +109,7 @@ graphina -t "CPU Usage (faked)" -f blue -b black
 
 ```bash
 # Monitor CPU usage in real-time
-graphina -t 'CPU Usage' -n 1 -F as_percent -e "top -l 1 -n 0 | grep 'CPU usage' | awk '{print \$3+\$5}'"
+graphina -t 'CPU Usage' -n 1 -F as_percent -e "top -l 1 -n 0 | awk '/^CPU usage/ {print \$3 + \$5}'"
 ```
 
 ### 4. Using Predefined Panels
@@ -147,7 +147,7 @@ graph.start
 # Using external command for data
 graph = Graphina::Graph.new(
   title: 'Temperature',
-  value: ->(i) { `sensors | grep 'Tctl' | awk '{print \$2}'`.to_f },
+  value: ->(i) { `sensors | awk '/^Tctl/ {print \$2}'`.to_f },
   format_value: :as_celsius,
   sleep: 2
 )

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/graphina.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: graphina 0.2.0 ruby lib
+# stub: graphina 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "graphina".freeze
-  s.version = "0.2.0".freeze
+  s.version = "0.3.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de".freeze
   s.executables = ["graphina".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/graphina.rb".freeze, "lib/graphina/graph.rb".freeze, "lib/graphina/graph/display.rb".freeze, "lib/graphina/graph/display/cell.rb".freeze, "lib/graphina/graph/formatters.rb".freeze, "lib/graphina/graphina_config.rb".freeze, "lib/graphina/panel.rb".freeze, "lib/graphina/panel/chooser.rb".freeze, "lib/graphina/setup.rb".freeze, "lib/graphina/version.rb".freeze]
-  s.files = [".utilsrc".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/graphina".freeze, "graphina.gemspec".freeze, "img/graphina.png".freeze, "lib/graphina.rb".freeze, "lib/graphina/graph.rb".freeze, "lib/graphina/graph/display.rb".freeze, "lib/graphina/graph/display/cell.rb".freeze, "lib/graphina/graph/formatters.rb".freeze, "lib/graphina/graphina_config.rb".freeze, "lib/graphina/panel.rb".freeze, "lib/graphina/panel/chooser.rb".freeze, "lib/graphina/panel/defaults/x86_64-darwin.yml".freeze, "lib/graphina/panel/defaults/x86_64-linux.yml".freeze, "lib/graphina/setup.rb".freeze, "lib/graphina/version.rb".freeze]
+  s.files = [".utilsrc".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/graphina".freeze, "graphina.gemspec".freeze, "img/graphina.png".freeze, "lib/graphina.rb".freeze, "lib/graphina/graph.rb".freeze, "lib/graphina/graph/display.rb".freeze, "lib/graphina/graph/display/cell.rb".freeze, "lib/graphina/graph/formatters.rb".freeze, "lib/graphina/graphina_config.rb".freeze, "lib/graphina/panel.rb".freeze, "lib/graphina/panel/chooser.rb".freeze, "lib/graphina/panel/defaults/arm64-darwin.yml".freeze, "lib/graphina/panel/defaults/x86_64-darwin.yml".freeze, "lib/graphina/panel/defaults/x86_64-linux.yml".freeze, "lib/graphina/setup.rb".freeze, "lib/graphina/version.rb".freeze]
   s.homepage = "https://github.com/flori/graphina".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "Graphina - Gem for creating terminal-based data visualizations with real-time\ngraphical displays using Unicode characters and ANSI styling.\n".freeze, "--main".freeze, "README.md".freeze]

data/lib/graphina/graph/formatters.rb

@@ -50,7 +50,10 @@ class Graphina::Graph
     #
     # @return [ String ] the formatted frequency representation with unit suffix
     def as_hertz(value)
-      Tins::Unit.format(value, prefix: :uc, format: '%.3f%U', unit: 'Hz')
+      prefix = [
+        '', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y',
+      ].each_with_index.map { |n, i| Tins::Unit::Prefix.new(n.freeze, 1000, 1000 ** i, false) }.freeze
+      Tins::Unit.format(value, prefix:, format: '%.3f%U', unit: 'Hz')
     end
 
     # The as_celsius method formats a temperature value with a degree symbol

data/lib/graphina/panel/defaults/arm64-darwin.yml

@@ -0,0 +1,35 @@
+cpu_usage_percentage:
+  title: "CPU Usage %"
+  interval: 1
+  command: |
+    top -l 1 -n 0 | awk '/^CPU usage:/ { printf "%.1f", $3 + $5 }'
+  format_value: as_percent
+  color: '#fe8019'
+cpu_temperature:
+  title: "CPU Temperature ℃ "
+  interval: 1
+  command: |
+    smctemp -c
+  format_value: as_celsius
+  color: '#fb4934'
+cpu_clock_average:
+  title: "CPU Clock Speed Hz"
+  interval: 1
+  command: |
+    sudo powermetrics --show-usage-summary -s cpu_power -i 100 -n 9 | awk '/CPU [0-9]+ frequency: / { count++; sum += $4 } END { if (count > 0) { print 1000000 * sum / count } else { print 0 } }'
+  format_value: as_hertz
+  color: '#b8bb26'
+memory_usage:
+  title: "Memory Usage"
+  interval: 1
+  command: |
+    free -b | awk '/^Mem:/ { print $4 }'
+  format_value: as_bytes
+  color: '#689d6a'
+memory_usage_percentage:
+  title: "Memory Usage %"
+  interval: 1
+  command: |
+    free -b | awk '/^Mem:/ { printf "%.1f", 100 * $4 / $2 }'
+  format_value: as_percent
+  color: '#689d6a'

data/lib/graphina/panel/defaults/x86_64-darwin.yml

@@ -1,22 +1,22 @@
 cpu_usage_percentage:
-  title: "CPU Usage (%)"
+  title: "CPU Usage %"
   interval: 1
   command: |
     top -l 1 -n 0 | awk '/^CPU usage:/ { printf "%.1f", $3 + $5 }'
   format_value: as_percent
   color: '#fe8019'
 cpu_temperature:
-  title: "CPU Temperature (℃) "
+  title: "CPU Temperature ℃ "
   interval: 1
   command: |
     osx-cpu-temp -C | tr -dc '0-9.'
   format_value: as_celsius
   color: '#fb4934'
 cpu_clock_average:
-  title: "CPU Clock Speed (MHz)"
+  title: "CPU Clock Speed Hz"
   interval: 1
   command: |
-    sudo bash -c 'powermetrics --show-usage-summary -s cpu_power & pid=$!; sleep 1; kill $pid'| awk '/CPU Average/ { count++; gsub(/.*\(/, ""); gsub(/\ .*/, ""); sum += $0 } END { if (count > 0) { print 1000000*sum/count } else { print 0 } }'
+    sudo powermetrics --show-usage-summary -s cpu_power -i 100 -n 9 | awk '/CPU Average frequency as fraction of nominal: / { count++; gsub(/[^0-9.]/, "", $9); sum += $9 } END { if (count > 0) { print 1000000 * sum / count } else { print 0 } }'
   format_value: as_hertz
   color: '#b8bb26'
 memory_usage:
@@ -27,7 +27,7 @@ memory_usage:
   format_value: as_bytes
   color: '#689d6a'
 memory_usage_percentage:
-  title: "Memory Usage (%)"
+  title: "Memory Usage %"
   interval: 1
   command: |
     free -b | awk '/^Mem:/ { printf "%.1f", 100 * $4 / $2 }'

data/lib/graphina/panel/defaults/x86_64-linux.yml

@@ -1,19 +1,19 @@
 cpu_usage_percentage:
-  title: "CPU Usage (%)"
+  title: "CPU Usage %"
   interval: 1
   command: |
     top -b -n 1 | awk '/^%Cpu\(s\)/ { print $2 + $4 + $6 }'
   format_value: as_percent
   color: '#fe8019'
 cpu_temperature:
-  title: "CPU Temperature (℃) "
+  title: "CPU Temperature ℃ "
   interval: 1
   command: |
     sensors | awk '/^Tctl:/ { print $2 }' | tr -dc '0-9.'
   format_value: as_celsius
   color: '#fb4934'
 cpu_clock_average:
-  title: "CPU Clock Speed (MHz)"
+  title: "CPU Clock Speed Hz"
   interval: 1
   command: |
     awk '/cpu MHz/ {sum += $4; count++} END {if (count > 0) print 1000000 * sum/count}' /proc/cpuinfo
@@ -27,9 +27,9 @@ memory_usage:
   format_value: as_bytes
   color: '#689d6a'
 memory_usage_percentage:
-  title: "Memory Usage (%)"
+  title: "Memory Usage %"
   interval: 1
   command: |
-    free -b | awk '/^Mem:/ { printf \"%.1f\", 100 * $3 / $2 }'
+    free -b | awk '/^Mem:/ { printf "%.1f", 100 * $3 / $2 }'
   format_value: as_percent
   color: '#689d6a'

data/lib/graphina/setup.rb

@@ -43,7 +43,7 @@ class Graphina::Setup
   #   not exist
   def infer_default_panels_path_from_platform
     case RUBY_PLATFORM
-    when /\Ax86_64-darwin/, /\Ax86_64-linux/
+    when /\A(x86_64|arm64)-darwin/, /\Ax86_64-linux/
       path = default_panels_path($&)
       if path.exist?
         path

data/lib/graphina/version.rb

@@ -1,6 +1,6 @@
 module Graphina
   # Graphina version
-  VERSION         = '0.2.0'
+  VERSION         = '0.3.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphina
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Frank
@@ -152,6 +152,7 @@ files:
 - lib/graphina/graphina_config.rb
 - lib/graphina/panel.rb
 - lib/graphina/panel/chooser.rb
+- lib/graphina/panel/defaults/arm64-darwin.yml
 - lib/graphina/panel/defaults/x86_64-darwin.yml
 - lib/graphina/panel/defaults/x86_64-linux.yml
 - lib/graphina/setup.rb