scryglass 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 812af5768c446597a262d5db01b4b560510ee2223e13b5884ed456f54d7c626c
-  data.tar.gz: aaf8d7344d82b2ea03528fc66ba6c5c58ea61254f554656c42509c8f2e36c0ab
+  metadata.gz: 75f5dd1ffed556a9b5d06dc18925e3c728bb2e49742fee1d7b5705c5f8be0aac
+  data.tar.gz: 3076092cf60d7359fc51552199584af40b23e1a71c4291ee8853738a75bc1c8d
 SHA512:
-  metadata.gz: 667d43b1bfd0855f7e64e0d3f8f24f8d187b4d0ffa164b24631dc2e6a3682a5365b10f8283a980dcc82b0566a6e4601eb1f25782c7c6940ca2cb65602bb06051
-  data.tar.gz: 578f61b052af0fc5004b11f7a634465c6412cb5a84446845cc403fea73f84449ec9bf4c2e7c92b67369f934492fb01c74d7474fd0c3e3593749aa6c6634e69c6
+  metadata.gz: cd72f233a5afe293c135ab3ed638d147397dc3400bcd37a7dc6b724f125af7484a8036ee9f1bd0fb492025ff30ee06a9c04cddb92c954912a33d7a17aa71b9f4
+  data.tar.gz: 3fc0b51496476cf08bc9ef79573198133265a15eeac5cac1fb573e27767aa788f1901be0887dec7dcf1341e8eedd1c0d45c12f3ddf9ba5a60f662a2b94ee0e7d

data/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2020-09-21
+
+## Added
+
+- Added ability to distinguish genuine escape key presses, and added escape key functionality.
+- Added ability (AnsiSliceStringRefinement) to slice strings while effectively maintaining their ANSI formatting, as our eyes would expect.
+- Added some dynamic header items to Tree View that track the following:
+  - Multiple targets count and message
+  - Last search text (what will be searched again by hitting 'n')
+  - Number-to-move, if digits are typed
+  - ('?' controls reminder now only displays when header is otherwise empty)
+
+## Changed
+
+- Now inputs check and screen redraws every 0.1 seconds even without user keypresses.
+- (ArrayFitToRefinement now allows non-plural array counts)
+
+## Removed
+
+- Temporarily removed record/playback functionality
+- Removed all dependency on activesupport
+
+## Fixed
+
+- Fixed issue where shrinking the console screen size enough would create a visual glitch until one of the boundary-resizing commands was received.
+
 ## [1.0.1] - 2020-09-18
 
 ### Added

data/Gemfile.lock

@@ -1,30 +1,17 @@
 PATH
   remote: .
   specs:
-    scryglass (1.0.1)
+    scryglass (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.7)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.2)
     rake (12.3.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.0)
   bundler (~> 2.1)
   rake (~> 12.0)
   scryglass!

data/README.md

@@ -1,3 +1,17 @@
+# 🔮 Scryglass
+
+Scryglass is a ruby console tool for visualizing and actively exploring objects (large, nested, interrelated, or unfamiliar). You can navigate nested arrays, hashes, instance variables, ActiveRecord
+relations, and unknown Enumerable types like an expandable/collapsable file tree in an intuitive UI.
+
+Objects and child objects can also be inspected through a variety of display lenses, returned directly to the console, and more!
+
+`scry` is quick to use and useful for both experienced developers and those very new to ruby, rails, or coding.  
+It facilitates:
+- Debugging/Investigating
+- Education, learning the structure of objects and their relationships
+- Comparing/Scanning sub-items in an Enumerable (e.g. Person.first.library_records.scry)
+
+
 # Table of Contents
 
 [🔮 Scryglass Intro Summary](#-scryglass)
@@ -18,18 +32,6 @@
 - [Miscellaneous Troubleshooting Notes](#miscellaneous-troubleshooting-notes)
 - [Contributing](#contributing)
 
-# 🔮 Scryglass
-
-Scryglass is a ruby console tool for visualizing and actively exploring objects (large, nested, interrelated, or unfamiliar). You can navigate nested arrays, hashes, instance variables, ActiveRecord
-relations, and unknown Enumerable types like an expandable/collapsable file tree in an intuitive UI.
-
-Objects and child objects can also be inspected through a variety of display lenses, returned directly to the console, and more!
-
-`scry` is quick to use and useful for both experienced developers and those very new to ruby, rails, or coding.  
-It facilitates:
-- Debugging/Investigating
-- Education, learning the structure of objects and their relationships
-- Comparing/Scanning sub-items in an Enumerable (e.g. Person.first.library_records.scry)
 
 ## ⚡️ tl;dr SUPER Quick Start
 
@@ -58,7 +60,7 @@ $ gem install scryglass
 ```
 ## Enabling Scryglass
 
-For the `scry` method syntax to work as cleanly as it does, Scryglass needs to add the method to the Kernel module. While this is safe, it was safest to have this only happen on a console session basis. To enable the `scry` method, call `Scryglass.load`. Thus, to automatically enable Scryglass when opening a console, you add one of the following lines to your `./irbrc` (and `./pryrc` for rails or pry sessions):
+For the `scry` method syntax to work as cleanly as it does, Scryglass needs to add the method to the Kernel module. While this is safe, it was safest to have this only happen on a console session basis. To enable the `scry` method, call `Scryglass.load`. Thus, to automatically enable Scryglass when opening a console, you add one of the following lines to your `./.irbrc` (and `./.pryrc` for rails or pry sessions):
 ```ruby
 Scryglass.load
 ```
@@ -162,6 +164,7 @@ Scryglass has two features to make wait time a little easier:
 | `-` | Select/Deselect current row | If these objects are later returned, the order in which they were selected will determine their order in the returned array. |
 | `/` | Begin a text search (in tree view) | Begins a case-sensitive regex search of all items, in a loop, starting with just below the current row. For a matching object to be found, the search must match its *truncated sample string in tree view* (regardless of what is on or off screen) (it must match either the key or the value, not the full line they create) (known enumerable types, like `[•••]`, may count as a match if they contain the string in the backend). |
 | `n` | Move to next search result | Will, using the most recent search entry, move the cursor on to the next match downward, cycling through all rows. This follows the same matching rules as the original search. |
+| `Esc` | Resets selection, last search, and number-to-move. (or returns to Tree View) | (Essentially, clears the values represented in the Tree View header if you're in the Tree View; otherwise it returns you to the Tree View) |
 
 ## Configuration / Customization (all optional)
 
@@ -192,7 +195,7 @@ Scryglass.configure do |config|
   #   { name: 'Inspect (`.inspect`)',
   #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { puts o.inspect } } },
   #   { name: 'Yaml Print (`y`)',
-  #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { y o } } }, # OR: `puts o.to_yaml`
+  #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { require 'yaml' ; y o } } }, # OR: `puts o.to_yaml`
   #   { name: 'Puts (`puts`)',
   #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { puts o } } },
   #   # { name: 'Method Showcase',  # Not included by default

data/example_config.rb

@@ -15,7 +15,7 @@ Scryglass.configure do |config|
   #   { name: 'Inspect (`.inspect`)',
   #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { puts o.inspect } } },
   #   { name: 'Yaml Print (`y`)',
-  #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { y o } } }, # OR: `puts o.to_yaml`
+  #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { require 'yaml' ; y o } } }, # OR: `puts o.to_yaml`
   #   { name: 'Puts (`puts`)',
   #     lambda: ->(o) { Hexes.capture_io(char_limit: 20_000) { puts o } } },
   #   # { name: 'Method Showcase',  # Not included by default

data/lib/hexes.rb

@@ -107,7 +107,7 @@ module Hexes
     necessary_constants_defined = necessary_constants.all?(&:constant_defined?)
     return yield unless necessary_constants_defined
 
-    rails_logger_defined = 'Rails'.constant_defined? && Rails.try(:logger).present?
+    rails_logger_defined = 'Rails'.constant_defined? && !!Rails.try(:logger)
 
     ## These are purposefully preserved as global variables so retrieval, in
     ##   debugging or errored usage, is as easy as possible.

data/lib/refinements/ansi_slice_string_refinement.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+module AnsiSliceStringRefinement
+  refine String do
+    ## (This really might not do what you expect if your string has (or you are
+    ##   printing) unescaped newlines).
+    def ansi_slice(target_range)
+      unless target_range.is_a?(Range)
+        raise ArgumentError, 'ansi_slice takes a Range as its argument!'
+      end
+      if target_range.min.negative? || target_range.max.negative?
+        raise ArgumentError, 'Range argument must be entirely positive!'
+      end
+
+      return self[target_range] if (self =~ /\e\[[\d\;]*m/).nil? # Just quick
+
+      mock_index = 0 # A scanning index that *doesn't* count ANSI codes
+      result_string_array = []
+
+      ansi_string_breakout.each do |char|
+        char_is_ansi_escape_code = char.is_ansi_escape_code?
+        within_target_range =
+          target_range.include?(mock_index)
+        # char_is_applicable_ansi_code =
+          # (char_is_ansi_escape_code && mock_index <= target_range.max)
+
+        if within_target_range || char_is_ansi_escape_code
+          result_string_array << char
+        end
+
+        mock_index += 1 unless char_is_ansi_escape_code
+      end
+
+      result_string_array.join('')
+    end
+
+    ## Splits string into characters, with each ANSI escape code being its own
+    ##   grouped item, like so:
+    ##     irb> "PLAIN\e[32mCOLOR\e[0mPLAIN".ansi_string_breakout
+    ##     => ["P", "L", "A", "I", "N", "\e[32m", "C", "O", "L", "O", "R",
+    ##         "\e[0m", "P", "L", "A", "I", "N"]
+    def ansi_string_breakout
+      breakout_array = []
+      working_self = self.dup
+
+      while working_self[0]
+        if (working_self =~ /\e\[[\d\;]*m/) == 0 # if begins with
+          end_of_escape_code = (working_self.index('m'))
+          leading_escape_code = working_self[0..end_of_escape_code]
+          breakout_array << leading_escape_code
+          working_self = working_self[(end_of_escape_code + 1)..-1]
+        else
+          leading_character = working_self[0]
+          breakout_array << leading_character
+          working_self = working_self[1..-1]
+        end
+      end
+
+      breakout_array
+    end
+
+    def is_ansi_escape_code?
+      (self =~ /^\e\[[\d\;]*m$/) == 0
+    end
+  end
+end

data/lib/refinements/array_fit_to_refinement.rb

@@ -8,6 +8,9 @@ module ArrayFitToRefinement
       length_method = ignore_ansi_codes ? :ansiless_length : :length
       length_result = string_array.join('').send(length_method)
 
+      if string_array.count < 2
+        return nonplural_solution(string_length_goal, length_result, fill: fill)
+      end
 
       if length_result > string_length_goal
         string_array.compress_to(string_length_goal, ignore_ansi_codes: ignore_ansi_codes)
@@ -63,5 +66,14 @@ module ArrayFitToRefinement
 
       working_array.zip(spacers).flatten.compact
     end
+
+    private
+
+    def nonplural_solution(string_length_goal, length_result, fill:)
+      return [fill * string_length_goal] if self.empty?
+
+      remaining_space = string_length_goal - length_result
+      return self.map(&:to_s).append(fill * remaining_space)
+    end
   end
 end

data/lib/scryglass.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 require 'stringio'
+
 ## Bookkeeping and external tools:
 require "scryglass/version"
-require 'active_support/core_ext/object/blank' # This gives us `.present?` and `.blank?` # https://stackoverflow.com/questions/4648684/how-to-use-present-in-ruby-projects
 require 'io/console'
 require 'pp'
+require 'timeout'
 
 ## Refinements and sub-tools:
 require 'refinements/ansiless_string_refinement'
+# require 'refinements/ansi_slice_string_refinement' # Employed soon
 require 'refinements/clip_string_refinement'
 require 'refinements/constant_defined_string_refinement'
 require 'refinements/array_fit_to_refinement'
@@ -76,6 +78,8 @@ module Scryglass
       ·    / : Begin a text search (in tree view)                                           ·
       ·    n : Move to next search result                                                   ·
       ·                                                                                     ·
+      ·  Esc : Resets selection, last search, and number-to-move. (or returns to Tree View) ·
+      ·                                                                                     ·
       · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · ·
   HELPSCREENADVANCEDPAGE
 

data/lib/scryglass/lens_panel.rb

@@ -78,7 +78,7 @@ module Scryglass
 
     def current_ro_subheader
       current_ro = scry_session.current_ro
-      user_input = scry_session.user_input
+      last_keypress = scry_session.last_keypress
 
       row_above_string =
         current_ro.next_visible_ro_up.to_s if current_ro.next_visible_ro_up
@@ -88,7 +88,7 @@ module Scryglass
       tree_preview_related_commands = ['A', 'B', 'C', 'D',
                                        '@', '.', '(', '*', '|', '-']
       ro_view_label =
-        if tree_preview_related_commands.include?(user_input)
+        if tree_preview_related_commands.include?(last_keypress)
           "\e[7mVIEWING:\e[00m" # Color reversed
         else
           'VIEWING:'
@@ -108,7 +108,7 @@ module Scryglass
       current_lens         = scry_session.current_lens
       current_subject_type = scry_session.current_subject_type
       current_subject      = scry_session.current_ro.current_subject
-      user_input           = scry_session.user_input
+      last_keypress        = scry_session.last_keypress
 
       lens_count = LensPanel.lenses.count
       lens_id    = current_lens % lens_count
@@ -128,9 +128,9 @@ module Scryglass
         subject_type_header, subject_class_header, lens_type_header
       ].fit_to(screen_width)
 
-      if user_input == 'l'
+      if last_keypress == 'l'
         fit_lens_header[4] = "\e[7m#{fit_lens_header[4]}" # Format to be ended by Hexes.opacify_screen_string() (using \e[00m)
-      elsif user_input == 'L'
+      elsif last_keypress == 'L'
         fit_lens_header[0] = "\e[7m#{fit_lens_header[0]}\e[00m"
       end
 

data/lib/scryglass/ro.rb

@@ -114,19 +114,15 @@ module Scryglass
 
     # (Used for recalculate_indeces after new Ros have been injected)
     def next_ro_without_using_index
-      if sub_ros.any?
-        sub_ros.first
-      elsif top_ro?
-        nil
-      elsif sibling_down.present?
-        sibling_down
-      else
-        upward_feeler_ro = self
-        until upward_feeler_ro.sibling_down.present? || upward_feeler_ro.top_ro?
-          upward_feeler_ro = upward_feeler_ro.parent_ro
-        end
-        upward_feeler_ro.sibling_down
+      return sub_ros.first if sub_ros.first
+      return nil if top_ro?
+      return sibling_down if sibling_down
+
+      upward_feeler_ro = self
+      until upward_feeler_ro.sibling_down || upward_feeler_ro.top_ro?
+        upward_feeler_ro = upward_feeler_ro.parent_ro
       end
+      upward_feeler_ro.sibling_down
     end
 
     def sibling_down

data/lib/scryglass/ro_builder.rb

@@ -310,7 +310,7 @@ module Scryglass
           through_indicator = is_through ? '(t)' : '   '
         end
 
-        is_scoped = info.scope.present?
+        is_scoped = !!info.scope
         if include_scoped_associations
           scoped_indicator = is_scoped ? '(s)' : '   '
         end
@@ -322,7 +322,7 @@ module Scryglass
             relation_name.to_s
           end
 
-        if ar_value.present? || include_empty_associations
+        if (!ar_value || ar_value.empty?) || include_empty_associations
           ar_key = Scryglass::ViewWrapper.new(
             relation_name,
             string: relation_representation

data/lib/scryglass/session.rb

@@ -11,7 +11,7 @@ class Scryglass::Session
                 :view_panels, :current_panel_type,
                 :progress_bar
 
-  attr_accessor :user_input, :last_search, :number_to_move
+  attr_accessor :user_signals, :last_search, :number_to_move
 
   CURSOR_CHARACTER = '–' # These are en dashes (alt+dash), not hyphens or em dashes.
 
@@ -33,7 +33,7 @@ class Scryglass::Session
     self.current_panel_type = :tree
     self.special_command_targets = []
     self.number_to_move = ''
-    self.user_input = nil
+    self.user_signals = []
     self.progress_bar = Prog::Pipe.new
 
     top_ro = roify(seed, parent_ro: nil, depth: 1)
@@ -52,15 +52,16 @@ class Scryglass::Session
     in_scry_session = true
     redraw = true
 
-    case actions
-    when :record
-      $scry_session_actions_performed = []
-    when :playback
-      if $scry_session_actions_performed.blank?
-        raise 'Could not find recording of previous session\'s actions'
-      end
-      @input_stack = $scry_session_actions_performed.dup
-    end
+    ## On hold: Record/Playback Functionality:
+    # case actions
+    # when :record
+    #   $scry_session_actions_performed = []
+    # when :playback
+    #   if $scry_session_actions_performed.blank?
+    #     raise 'Could not find recording of previous session\'s actions'
+    #   end
+    #   @input_stack = $scry_session_actions_performed.dup
+    # end
 
     # We print a full screen of lines so the first call of draw_screen doesn't
     #   write over any previous valuable content the user had in the console.
@@ -70,24 +71,35 @@ class Scryglass::Session
       draw_screen if redraw
       redraw = true
 
-      case actions
-      when :record
-        self.user_input = $stdin.getch
-        $scry_session_actions_performed << user_input
-      when :playback
-        if @input_stack.any? # (IV to be easily accessible for debugging)
-          self.user_input = @input_stack.shift
-          sleep 0.05
-        else
-          self.user_input = $stdin.getch
-        end
-      else
-        self.user_input = $stdin.getch
-      end
+      ## On hold: Record/Playback Functionality:
+      # case actions
+      # when :record
+      #   self.user_input = $stdin.getch
+      #   $scry_session_actions_performed << user_input
+      # when :playback
+      #   if @input_stack.any? # (IV to be easily accessible for debugging)
+      #     self.user_input = @input_stack.shift
+      #     sleep 0.05
+      #   else
+      #     self.user_input = $stdin.getch
+      #   end
+      # else
+      #   self.user_input = $stdin.getch
+      # end
+
+      new_signal = fetch_user_signal
 
       wait_start_time = Time.now
 
-      case user_input
+      case new_signal
+      when nil
+      when 'esc'
+        case current_panel_type
+        when :lens
+          self.current_panel_type = :tree
+        when :tree
+          clear_tracked_values
+        end
       when "\u0003"
         set_console_cursor_below_content
         raise IRB::Abort, 'Ctrl+C Detected'
@@ -123,40 +135,34 @@ class Scryglass::Session
         self.number_to_move += '9'
         redraw = false
       when '0'
-        if number_to_move.present? # You can append zeros to number_to_move...
+        if number_to_move[0] # You can append zeros to existing number_to_move...
           self.number_to_move += '0'
           redraw = false
         else # ...but otherwise it's understood to be a view||cursor reset.
           reset_the_view_or_cursor
         end
       when 'A' # Up arrow
-        action_count = number_to_move.present? ? number_to_move.to_i : 1
+        action_count = !number_to_move.empty? ? number_to_move.to_i : 1
         navigate_up_multiple(action_count)
 
         self.number_to_move = ''
-        lens_view.recalculate_boundaries if current_panel_type == :lens
         tree_view.slide_view_to_cursor
       when 'B' # Down arrow
-        action_count = number_to_move.present? ? number_to_move.to_i : 1
+        action_count = !number_to_move.empty? ? number_to_move.to_i : 1
         navigate_down_multiple(action_count)
 
         self.number_to_move = ''
-        lens_view.recalculate_boundaries if current_panel_type == :lens
         tree_view.slide_view_to_cursor
       when 'C' # Right arrow
         expand_targets
       when 'D' # Left arrow
         collapse_targets
-        lens_view.recalculate_boundaries if current_panel_type == :lens
       when ' '
         toggle_view_panel
-        lens_view.recalculate_boundaries if current_panel_type == :lens
       when 'l'
         scroll_lens_type
-        lens_view.recalculate_boundaries if current_panel_type == :lens
       when 'L'
         toggle_current_subject_type
-        lens_view.recalculate_boundaries if current_panel_type == :lens
       when 'w'
         current_view_panel.move_view_up(5)
       when 's'
@@ -177,15 +183,12 @@ class Scryglass::Session
         in_scry_session = run_help_screen_ui
       when '@'
         build_instance_variables_for_target_ros
-        tree_view.recalculate_boundaries
         tree_view.slide_view_to_cursor # Just a nice-to-have
       when '.'
         build_activerecord_relations_for_target_ros
-        tree_view.recalculate_boundaries
         tree_view.slide_view_to_cursor # Just a nice-to-have
       when '('
         build_enum_children_for_target_ros
-        tree_view.recalculate_boundaries
         tree_view.slide_view_to_cursor # Just a nice-to-have
       when '|'
         sibling_ros = if current_ro.top_ro?
@@ -214,12 +217,15 @@ class Scryglass::Session
           special_command_targets << current_ro
         end
       when '/'
+        _screen_height, screen_width = $stdout.winsize
         $stdout.write "#{CSI}1;1H" # (Moves console cursor to top left corner)
-        $stdout.write SEARCH_PROMPT
+        $stdout.print ' ' * screen_width
+        $stdout.write "#{CSI}1;1H" # (Moves console cursor to top left corner)
+        $stdout.print SEARCH_PROMPT
         $stdout.write "#{CSI}1;#{SEARCH_PROMPT.ansiless_length + 1}H" # (Moves
         #   console cursor to just after the search prompt, before user types)
         query = $stdin.gets.chomp
-        if query.present?
+        unless query.empty?
           self.last_search = query
           go_to_next_search_result
         end
@@ -236,7 +242,7 @@ class Scryglass::Session
         return subjects_of_target_ros
       end
 
-      print "\a" if Time.now - wait_start_time > 4 && user_input != '?' # (Audio 'beep')
+      print "\a" if Time.now - wait_start_time > 4 && last_keypress != '?' # (Audio 'beep')
     end
   end
 
@@ -244,13 +250,24 @@ class Scryglass::Session
     all_ros.first
   end
 
+  def last_keypress
+    last_two_signals = user_signals.last(2)
+    last_two_signals.last || last_two_signals.first
+  end
+
   private
 
+  def clear_tracked_values
+    self.special_command_targets = []
+    self.last_search = nil
+    self.number_to_move = ''
+  end
+
   def print_progress_bar
     screen_height, _screen_width = $stdout.winsize
     bar = progress_bar.to_s
     $stdout.write "#{CSI}#{screen_height};1H" # (Moves console cursor to bottom left corner)
-    print bar if bar.present?
+    print bar unless bar.tr(' ', '').empty?
   end
 
   def current_view_panel
@@ -325,6 +342,29 @@ class Scryglass::Session
     end
   end
 
+  def fetch_user_signal
+    previous_signal = user_signals.last
+    new_signal =
+      begin
+        Timeout.timeout(0.1) { $stdin.getch }
+      rescue Timeout::Error
+        nil
+      end
+
+    ## Since many keys, including arrow keys, result in several signals being
+    ##   sent (e.g. DOWN: "\e" then "[" then "B" in RAPID succession), the
+    ##   *pause* after a genuine escape key press (also "\e") is the only way
+    ##   to distinguish it precisely.
+    genuine_escape_key_press = new_signal.nil? && previous_signal == "\e"
+    if genuine_escape_key_press
+      new_signal = 'esc'
+    end
+
+    user_signals << new_signal unless new_signal.nil? && previous_signal.nil?
+
+    new_signal
+  end
+
   def run_help_screen_ui
     screen_height, _screen_width = $stdout.winsize
 
@@ -337,9 +377,12 @@ class Scryglass::Session
       sliced_help_screen = Hexes.simple_screen_slice(current_help_screen)
       help_screen_string = Hexes.opacify_screen_string(sliced_help_screen)
       Hexes.overwrite_screen(help_screen_string)
-      help_screen_user_input = $stdin.getch
 
-      case help_screen_user_input
+      new_signal = fetch_user_signal
+
+      case new_signal
+      when 'esc'
+        return true
       when '?'
         current_help_screen_index += 1
       when 'q'
@@ -375,7 +418,6 @@ class Scryglass::Session
 
     move_cursor_to(current_ro.parent_ro) until current_ro.visible?
     tree_view.slide_view_to_cursor
-    tree_view.recalculate_boundaries # TODO: should these be conditional? If they are, I might need a potential tree view recalc after toggling lens view to tree view.
   end
 
   def expand_targets
@@ -388,7 +430,6 @@ class Scryglass::Session
     else
       expand!(current_ro)
     end
-    tree_view.recalculate_boundaries
   end
 
   def reset_the_view_or_cursor
@@ -400,6 +441,8 @@ class Scryglass::Session
   end
 
   def draw_screen
+    current_view_panel.recalculate_boundaries # This now happens at every screen
+    #   draw to account for the user changing the screen size. Otherwise glitch.
     current_view_panel.ensure_correct_view_coords
     screen_string = current_view_panel.screen_string
 

data/lib/scryglass/tree_panel.rb

@@ -4,6 +4,7 @@ module Scryglass
   class TreePanel < Scryglass::ViewPanel
     using ClipStringRefinement
     using AnsilessStringRefinement
+    using ArrayFitToRefinement
 
     def slide_view_to_cursor
       cursor_tracking = Scryglass.config.cursor_tracking
@@ -54,13 +55,35 @@ module Scryglass
 
     def uncut_header_string
       _screen_height, screen_width = $stdout.winsize
-      header_string = "Press '?' for controls\n".rjust(screen_width, ' ') +
-                      '·' * screen_width
-      if scry_session.special_command_targets.any?
-        special_targets_message = "  (Next command will apply to all selected rows)"
-        header_string[0...special_targets_message.length] = special_targets_message
+      dotted_line = '·' * screen_width
+
+      number_to_move          = scry_session.number_to_move
+      last_search             = scry_session.last_search
+      special_command_targets = scry_session.special_command_targets
+
+      if special_command_targets.any?
+        special_targets_message = "(Next command will apply to all (#{special_command_targets.count}) selected rows)"
+      end
+      if !number_to_move.empty?
+        number_to_move_message = " Move distance: #{number_to_move}"
+      end
+      if last_search
+        last_search_message = " Last search: #{last_search}"
       end
-      header_string
+      if [special_targets_message, number_to_move_message, last_search].none?
+        help_key_reminder = "Press '?' for controls"
+      end
+
+      tree_header_items = [
+        special_targets_message,
+        last_search_message,
+        number_to_move_message,
+        help_key_reminder
+      ]
+
+      fit_tree_header_array = tree_header_items.fit_to(screen_width)
+
+      fit_tree_header_array.join('') + "\n" + dotted_line
     end
 
     def visible_body_slice(uncut_body_string)

data/lib/scryglass/version.rb

@@ -1,3 +1,3 @@
 module Scryglass
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/scryglass.gemspec

@@ -41,7 +41,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.5.3'
 
-  spec.add_development_dependency 'activesupport', '~> 5.0'
   spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 12.0'
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: scryglass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gavin Myers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +48,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".tool-versions"
 - CHANGELOG.md
@@ -76,6 +63,7 @@ files:
 - lib/example_material.rb
 - lib/hexes.rb
 - lib/prog.rb
+- lib/refinements/ansi_slice_string_refinement.rb
 - lib/refinements/ansiless_string_refinement.rb
 - lib/refinements/array_fit_to_refinement.rb
 - lib/refinements/clip_string_refinement.rb