panda-motd 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace8e728251d18f1ee3043f9de8cff80fe631a30cd8af80aac5026020f80f7ae
-  data.tar.gz: 26c7447624bac833cb204c98f7ff528ae4538f91a6c3490fbf5a9feeaf4a385d
+  metadata.gz: e96416cb34d16f565eb89916c6156cd2e293a04f0ba8ffeede5df5e92d73acc3
+  data.tar.gz: abc7ad56a5b1a0d90dcbf4cd4a7f948bed78232357f2ac7fc352f7388d136d0f
 SHA512:
-  metadata.gz: beb33befc6b4372211a23725531d59797d03c50dd45d4f28bef6741b6391d9dc28f8b987ec531ff68c52d374f8c533938357c4e87f3c6b9749f7c124cb35a48c
-  data.tar.gz: 8bf66b63249f303dc161ea32d9b37d6d1da7d0c4416d848eff3b11984c61f88decd3ee119503790beaf0cb294a64e74d91fbb36b14130fcb2454167ac5696e58
+  metadata.gz: 452c47ad204b5dfb044abf370c0f0643c24bcfea8565ca5329ad487717cd116fd1d4c88378985be2d14a4759269cbe363d7b86bfdba31425e673d9f5be4aecef
+  data.tar.gz: a2209d1666149ac3222c005b79af5d3edb129a79dec9bc12c8c07c906ad26aa384dfc0222378ce3aa4c8da097cb425c33e4de76b67d92a0c2677ead2ba493366

data/lib/panda_motd/components/ascii_text_art.rb

@@ -17,7 +17,7 @@ class ASCIITextArt
     begin
       @art = Artii::Base.new font: @config['font']
       @results = @art.asciify(@text)
-      @results = @results.send(@config['color'].to_sym) if @config['color']
+      @results = @results.colorize(@config['color'].to_sym) if @config['color']
     rescue Errno::EISDIR # Artii doesn't handle invalid font names very well
       @errors << ComponentError.new(self, 'Invalid font name')
     end

data/lib/panda_motd/components/filesystems.rb

@@ -80,42 +80,30 @@ class Filesystems
   private
 
   def percentage_color(percentage)
-    return :green  if (0..75).cover?   percentage
-    return :yellow if (75..95).cover?  percentage
-    return :red    if (95..100).cover? percentage
-    return :white
-  end
-
-  def find_header_id_by_text(header_array, text)
-    return header_array.each_index.select { |i| header_array[i].downcase.include? text }.first
+    case percentage
+    when 0..75 then :green
+    when 76..95 then :yellow
+    when 96..100 then :red
+    else :white
+    end
   end
 
   def parse_filesystem_usage(filesystems)
-    command_result = `BLOCKSIZE=1024 df`.split("\n")
-    header = command_result[0].split
-    entries = command_result[1..command_result.count]
-
-    name_index  = find_header_id_by_text(header, 'filesystem')
-    size_index  = find_header_id_by_text(header, 'blocks')
-    used_index  = find_header_id_by_text(header, 'used')
-    avail_index = find_header_id_by_text(header, 'avail')
-
-    results = filesystems.map do |filesystem, name|
-      matching_entry = entries.find { |e| e.split[name_index] == filesystem }
-
-      if matching_entry
-        {
-          pretty_name: name,
-          filesystem_name: matching_entry.split[name_index],
-          size: matching_entry.split[size_index].to_i * 1024,
-          used: matching_entry.split[used_index].to_i * 1024,
-          avail: matching_entry.split[avail_index].to_i * 1024
-        }
-      else
-        "#{filesystem} was not found"
-      end
+    entries = `BLOCKSIZE=1024 df --output=source,size,used,avail`.lines
+                                                                 .drop(1)
+
+    filesystems.map do |filesystem, pretty_name|
+      matching_entry = entries.map(&:split).find { |e| e.first == filesystem }
+      next "#{filesystem} was not found" unless matching_entry
+
+      filesystem_name, size, used, avail = matching_entry
+      {
+        pretty_name: pretty_name,
+        filesystem_name: filesystem_name,
+        size: size.to_i * 1024,
+        used: used.to_i * 1024,
+        avail: avail.to_i * 1024
+      }
     end
-
-    return results
   end
 end

data/lib/panda_motd/components/last_login.rb

@@ -16,55 +16,55 @@ class LastLogin
   end
 
   def to_s
-    result = "Last Login:\n"
-
-    @results.each do |user, logins|
-      result += "  #{user}:\n"
-      location_string_size = logins.map { |l| l[:location].length }.max
-      logins.each do |login|
-        location_part = login[:location].ljust(location_string_size, ' ')
-        start_part = login[:time_start].strftime('%m/%d/%Y %I:%M%p')
-
-        end_part = if login[:time_end].is_a? String # still logged in text
-                     login[:time_end].green
-                   else
-                     "#{((login[:time_end] - login[:time_start]) * 24 * 60).to_i} minutes"
-                   end
-
-        result += "    from #{location_part} at #{start_part} (#{end_part})\n"
-      end
-      result += '    no logins found for user.' if logins.empty?
-    end
-
-    return result
+    <<~LAST
+      Last Login:
+      #{@results.map do |user, logins|
+        logins_part =
+          if logins.empty?
+            '    no logins found for user.'
+          else
+            longest_location_size = logins.map { |l| l[:location].length }.max
+            logins.map do |login|
+              location_part = login[:location].ljust(longest_location_size, ' ')
+              start_part = login[:time_start].strftime('%m/%d/%Y %I:%M%p')
+              end_part = if login[:time_end].is_a? String # still logged in text
+                           login[:time_end].green
+                         else
+                           "#{((login[:time_end] - login[:time_start]) * 24 * 60).to_i} minutes"
+                         end
+              "    from #{location_part} at #{start_part} (#{end_part})"
+            end.join("\n")
+          end
+        <<~USER
+            #{user}:
+          #{logins_part}
+          USER
+      end.join("\n")}
+    LAST
   end
 
   private
 
   def parse_last_logins(users)
-    all_logins = {}
-    users.each_with_index do |(username, num_logins), i|
-      user_logins = []
-      cmd_result = `last --time-format=iso #{username}`
-      cmd_result.split("\n").each do |entry|
-        next unless entry.start_with? username
-        data = entry.split(/(?:\s{2,})|(?:\s-\s)/)
-
-        time_end = data[4] == 'still logged in' ? data[4] : DateTime.parse(data[4])
-
-        user_logins << {
-          username: username,
-          location: data[2],
-          time_start: DateTime.parse(data[3]),
-          time_end: time_end
-        }
-
-        break if user_logins.count >= num_logins
-      end
+    users.map do |(username, num_logins)|
+      user_logins =
+        `last --time-format=iso #{username}`
+        .lines
+        .select { |entry| entry.start_with?(username) }
+        .take(num_logins)
+        .map do |entry|
+          data = entry.chomp.split(/(?:\s{2,})|(?:\s-\s)/)
+          time_end = data[4] == 'still logged in' ? data[4] : DateTime.parse(data[4])
 
-      all_logins[username.to_sym] = user_logins
-    end
+          {
+            username: username,
+            location: data[2],
+            time_start: DateTime.parse(data[3]),
+            time_end: time_end
+          }
+        end
 
-    return all_logins
+      [username.to_sym, user_logins]
+    end.to_h
   end
 end

data/lib/panda_motd/components/service_status.rb

@@ -17,52 +17,38 @@ class ServiceStatus
   end
 
   def to_s
-    if @results.any?
-      result = "Services:\n"
-      longest_name_size = @results.keys.map { |k| k.to_s.length }.max + 1 # add 1 for the ':' at the end
-      @results.each_with_index do |(name, status), i|
-        name_part = (name.to_s + ':').ljust(longest_name_size, ' ')
-        status_part = status.to_s.send(service_colors[status])
-        result += "  #{name_part} #{status_part}"
-        result += "\n" unless i == @results.count - 1 # don't print newline for last entry
-      end
-
-      return result
-    else
-      return "Services:\n  No matching services found."
-    end
+    return "Services:\n  No matching services found." unless @results.any?
+    longest_name_size = @results.keys.map { |k| k.to_s.length }.max
+    <<~HEREDOC
+      Services:
+      #{@results.map do |(name, status)|
+        name_part = name.to_s.ljust(longest_name_size, ' ') + ':'
+        status_part = status.to_s.colorize(service_colors[status.to_sym])
+        "  #{name_part} #{status_part}"
+      end.join("\n")}
+    HEREDOC
   end
 
   private
 
-  def parse_services(services)
-    results = {}
-
-    cmd_result = `systemctl | grep '\.service'`.delete("^\u{0000}-\u{007F}")
-
-    if cmd_result.empty?
-      @errors << ComponentError.new(self, 'Unable to parse systemctl output')
-    end
-
-    cmd_result.split("\n").each do |line|
-      parsed_name = line.split[0].gsub('.service', '')
-      parsed_status = line.split[3]
-
-      matching_service = services.find { |service, _name| service == parsed_name }
-
-      if matching_service
-        results[parsed_name.to_sym] = parsed_status.to_sym
-      end
-    end
+  def parse_service(service)
+    cmd_result = `systemctl is-active #{service[0]}`.strip
+    @errors << ComponentError.new(self, 'Unable to parse systemctl output') unless valid_responses.include? cmd_result
+    return cmd_result
+  end
 
-    return results
+  def parse_services(services)
+    services.map { |service| [service[1].to_sym, parse_service(service).to_sym] }.to_h
   end
 
   def service_colors
     return {
-      running: :green,
-      exited: :white,
-      failed: :red
+      active: :green,
+      inactive: :red
     }
   end
+
+  def valid_responses
+    return ['active', 'inactive']
+  end
 end

data/lib/panda_motd/components/ssl_certificates.rb

@@ -16,25 +16,19 @@ class SSLCertificates
   end
 
   def to_s
-    result = "SSL Certificates:\n"
     longest_name_size = @results.map { |r| r[0].length }.max
+    <<~HEREDOC
+      SSL Certificates:
+      #{@results.map do |cert|
+          return "  #{cert}" if cert.is_a? String # print the not found message
 
-    @results.each_with_index do |cert, i|
-      if cert.is_a? String # print the not found message
-        result += "  #{cert}"
-      else
-        name_portion = "  #{cert[0]}".ljust(longest_name_size + 6, ' ')
-
-        status = cert_status(cert[1])
-
-        date_portion = "#{cert_status_strings[status]} ".send(cert_status_colors[status]) + cert[1].strftime('%e %b %Y %H:%M:%S%p').to_s
-        result += name_portion + date_portion
-      end
-
-      result += "\n" unless i == @results.count - 1 # don't print newline for last entry
-    end
-
-    return result
+          name_portion = cert[0].ljust(longest_name_size + 6, ' ')
+          status = cert_status(cert[1])
+          status = cert_status_strings[status].to_s.colorize(cert_status_colors[status])
+          date_portion = cert[1].strftime('%e %b %Y %H:%M:%S%p')
+          "  #{name_portion} #{status} #{date_portion}"
+        end.join("\n")}
+    HEREDOC
   end
 
   private
@@ -61,10 +55,13 @@ class SSLCertificates
   end
 
   def cert_status(expiry_date)
-    status = :valid
-    status = :expiring if (DateTime.now...DateTime.now + 30).cover? expiry_date # ... range excludes end
-    status = :expired if DateTime.now >= expiry_date
-    return status
+    if (DateTime.now...DateTime.now + 30).cover? expiry_date # ... range excludes end
+      :expiring
+    elsif DateTime.now >= expiry_date
+      :expired
+    else
+      :valid
+    end
   end
 
   def cert_status_colors

data/lib/panda_motd/components/uptime.rb

@@ -12,8 +12,7 @@ class Uptime
   end
 
   def process
-    sysinfo = SysInfo.new
-    uptime = sysinfo.uptime
+    uptime = SysInfo.new.uptime
 
     @days = (uptime / 24).floor
     @hours = (uptime - @days * 24).floor
@@ -21,10 +20,15 @@ class Uptime
   end
 
   def to_s
-    result = ''
-    result += "#{@days} day#{'s' if @days != 1}, " unless @days.zero?
-    result += "#{@hours} hour#{'s' if @hours != 1}, " unless @hours.zero? && @days.zero?
-    result += "#{@minutes} minute#{'s' if @minutes != 1}"
-    return "#{@config['prefix'] || 'up'} #{result}"
+    return "#{@config['prefix'] || 'up'} #{format_uptime}"
+  end
+
+  private
+
+  def format_uptime
+    [@days, @hours, @minutes].zip(%w[day hour minute])
+                             .reject { |n, _word| n.zero? }
+                             .map { |n, word| "#{n} #{word}#{'s' if n != 1}" }
+                             .join(', ')
   end
 end

data/lib/panda_motd/version.rb

@@ -1,4 +1,4 @@
 class PandaMOTD
   #:nodoc:
-  VERSION ||= '0.0.7'.freeze
+  VERSION ||= '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panda-motd
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Taylor Thurlow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: artii
@@ -210,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="