ruby_jard 0.2.0 → 0.2.1

data/lib/ruby_jard/screens/threads_screen.rb

@@ -4,63 +4,105 @@ module RubyJard
   module Screens
     class ThreadsScreen < RubyJard::Screen
       def title
-        "Threads (#{RubyJard.current_session.contexts.length})"
+        ['Threads', "#{RubyJard.current_session.contexts.length} threads"]
       end
 
-      def data_size
-        [@height, RubyJard.current_session.contexts.length].min
+      def build
+        contexts = RubyJard.current_session.contexts.filter { |c| c.thread.alive? }
+        contexts = sort_contexts(contexts)
+        @rows = contexts.map do |context|
+          RubyJard::Row.new(
+            line_limit: 2,
+            columns: [
+              RubyJard::Column.new(
+                spans: [
+                  span_mark(context),
+                  span_thread_id(context)
+                ]
+              ),
+              RubyJard::Column.new(
+                spans: [
+                  span_thread_status(context)
+                ]
+              ),
+              RubyJard::Column.new(
+                spans: [
+                  span_thread_name(context),
+                  span_thread_location(context)
+                ]
+              )
+            ]
+          )
+        end
+        @selected = contexts.index { |c| current_thread?(c) }
       end
 
-      def data_window
-        return @data_window if defined?(@data_window)
+      private
 
-        contexts = RubyJard.current_session.contexts.filter { |c| c.thread.alive? }
-        @data_window ||= sort_contexts(contexts).first(data_size)
+      def span_mark(context)
+        RubyJard::Span.new(
+          margin_right: 1,
+          content: '•',
+          styles: thread_status_style(context.thread)
+        )
       end
 
-      def span_mark(context, _index)
-        [
-          current_thread?(context) ? '→' : ' ',
-          [:bright_yellow, current_thread?(context) ? :bold : nil]
-        ]
+      def span_thread_id(context)
+        RubyJard::Span.new(
+          content: "Thread #{context.thread.object_id}",
+          styles: :thread_id
+        )
       end
 
-      def span_thread_id(context, _index)
-        [
-          context.thread.object_id.to_s,
-          [:green, current_thread?(context) ? :bold : nil]
-        ]
+      def span_thread_status(context)
+        RubyJard::Span.new(
+          content: "(#{context.thread.status})",
+          styles: thread_status_style(context.thread)
+        )
       end
 
-      def span_thread_status(context, _index)
-        status_color =
-          if context.suspended?
-            :red
-          elsif context.ignored?
-            :white
-          elsif context.thread.status == 'run'
-            :green
+      def span_thread_name(context)
+        RubyJard::Span.new(
+          margin_right: 1,
+          content: context.thread.name.nil? ? 'untitled' : context.thread.name,
+          styles: :thread_name
+        )
+      end
+
+      def span_thread_location(context)
+        return unknown_thread_location if
+          context.thread.backtrace_locations.nil? ||
+          RubyJard.current_session.backtrace[0].nil?
+
+        last_backtrace =
+          if current_thread?(context)
+            RubyJard.current_session.backtrace[0].first
           else
-            :white
+            context.thread.backtrace_locations[1]
           end
-        [
-          "(#{context.thread.status})",
-          [status_color, current_thread?(context) ? :bold : nil]
-        ]
-      end
 
-      def span_thread_name(context, _index)
-        if context.thread.name.nil?
-          last_backtrace = context.thread.backtrace_locations[1]
-          location = decorate_path(last_backtrace.path, last_backtrace.lineno)
-          ["#{location.path}:#{location.lineno}", current_thread?(context) ? [:bright_white, :bold] : :white]
+        return unknown_thread_location if last_backtrace.nil?
+
+        decorated_path = decorate_path(last_backtrace.path, last_backtrace.lineno)
+        if decorated_path.gem?
+          RubyJard::Span.new(
+            content: "in #{decorated_path.gem} (#{decorated_path.gem_version})",
+            styles: :thread_location
+          )
         else
-          name = context.thread.name.to_s
-          [name, current_thread?(context) ? [:bright_white, :bold] : :white]
+          RubyJard::Span.new(
+            content: "at #{decorated_path.path}:#{decorated_path.lineno}",
+            styles: :thread_location
+          )
         end
       end
 
-      private
+      def unknown_thread_location
+        RubyJard::Span.new(
+          content: 'at ???',
+          styles: :thread_location
+        )
+      end
 
       def sort_contexts(contexts)
         # Sort: current context first
@@ -95,6 +137,16 @@ module RubyJard
       def decorate_path(path, lineno)
         RubyJard::Decorators::PathDecorator.new(path, lineno)
       end
+
+      def thread_status_style(thread)
+        if thread.status == 'run'
+          :thread_status_run
+        elsif thread.status == 'sleep'
+          :thread_status_sleep
+        else
+          :thread_status_other
+        end
+      end
     end
   end
 end

data/lib/ruby_jard/screens/variables_screen.rb

@@ -24,9 +24,9 @@ module RubyJard
       DEFAULT_TYPE_SYMBOL = :var
 
       KINDS = [
-        KIND_LOC = :loc,
-        KIND_INS = :ins,
-        KIND_CON = :con
+        KIND_LOC = :local_variable,
+        KIND_INS = :instance_variable,
+        KIND_CON = :constant
       ].freeze
 
       KIND_PRIORITIES = {
@@ -35,12 +35,6 @@ module RubyJard
         KIND_CON => 3
       }.freeze
 
-      KIND_COLORS = {
-        KIND_LOC => :bright_blue,
-        KIND_INS => :bright_blue,
-        KIND_CON => :green
-      }.freeze
-
       INLINE_TOKEN_KIND_MAPS = {
         KIND_LOC => :ident,
         KIND_INS => :instance_variable,
@@ -52,65 +46,82 @@ module RubyJard
         'Variables'
       end
 
-      def data_size
-        @height
-      end
-
-      def data_window
-        return [] if current_frame.nil?
-        return @data_window if defined?(@data_window)
-
+      def build
         variables = fetch_local_variables + fetch_instance_variables + fetch_constants
-        # Each row is an array of [kind, name, value]
-        @data_window = sort_variables(variables).first(data_size)
+        variables = sort_variables(variables)
+        @rows = variables.map do |variable|
+          RubyJard::Row.new(
+            line_limit: 3,
+            columns: [
+              RubyJard::Column.new(
+                spans: [
+                  span_inline(variable)
+                ]
+              ),
+              RubyJard::Column.new(
+                spans: [
+                  span_name(variable),
+                  span_size(variable),
+                  RubyJard::Span.new(margin_right: 1, content: '=', styles: :variable_assignment),
+                  span_inspection(variable)
+                ]
+              )
+            ]
+          )
+        end
+        @selected = 0
       end
 
-      def span_inline(data_row, _index)
-        if inline?(data_row[0], data_row[1])
-          ['•', [:bright_yellow, :bold]]
+      def span_inline(variable)
+        if inline?(variable[0], variable[1])
+          RubyJard::Span.new(
+            content: '•',
+            styles: :variable_mark_inline
+          )
         else
-          [' ']
+          RubyJard::Span.new(
+            content: ' ',
+            styles: :variable_mark
+          )
         end
       end
 
-      def span_type(data_row, _index)
-        type_name = TYPE_SYMBOLS[data_row[2].class] || DEFAULT_TYPE_SYMBOL
-        [type_name.to_s, :white]
-      end
-
-      def span_name(data_row, _index)
-        [
-          data_row[1].to_s,
-          [
-            KIND_COLORS[data_row[0]] || :bright_white,
-            inline?(data_row[0], data_row[1]) ? :bold : nil
-          ]
-        ]
-      end
-
-      def span_indicator(_data_row, _index)
-        ['=', [:bright_white]]
+      def span_name(variable)
+        RubyJard::Span.new(
+          margin_right: 1,
+          content: variable[1].to_s,
+          styles: variable[0].to_sym
+        )
       end
 
-      def span_size(data_row, _index)
-        value = data_row[2]
-        if value.is_a?(Array) && !value.empty?
-          ["(size:#{value.length})", :white]
-        elsif value.is_a?(String) && value.length > 20
-          ["(size:#{value.length})", :white]
-        elsif value.is_a?(Hash) && !value.empty?
-          ["(size:#{value.length})", :white]
-        end
+      def span_size(variable)
+        value = variable[2]
+        size_label =
+          if value.is_a?(Array) && !value.empty?
+            "(len:#{value.length})"
+          elsif value.is_a?(String) && value.length > 20
+            "(len:#{value.length})"
+          elsif value.is_a?(Hash) && !value.empty?
+            "(size:#{value.length})"
+          end
+        RubyJard::Span.new(
+          margin_right: 1,
+          content: size_label,
+          styles: :variable_size
+        )
       end
 
-      def span_inspection(data_row, _index)
+      def span_inspection(variable)
         # Hard limit: screen area
-        inspection = data_row[2].inspect[0..@height * @width]
+        inspection = variable[2].inspect[0..@layout.height * @layout.width]
         # TODO: This is just a workable. Should write a decorator to inspect objects accurately
         ["\n", "\r", "\r\n"].each do |esc|
           inspection.gsub!(esc, esc.inspect)
         end
-        [inspection, :dim, :white]
+        RubyJard::Span.new(
+          content: inspection,
+          styles: :variable_inspection
+        )
       end
 
       private
@@ -169,6 +180,8 @@ module RubyJard
 
         constants = constant_source.constants.select { |v| v.to_s.upcase == v.to_s }
         constants.map do |variable|
+          next if %w[NIL TRUE FALSE].include?(variable.to_s)
+
           [KIND_CON, variable, constant_source.const_get(variable)]
         rescue NameError
           nil
@@ -209,13 +222,13 @@ module RubyJard
         current_file = RubyJard.current_session.frame.file
         current_line = RubyJard.current_session.frame.line
         source_decorator = RubyJard::Decorators::SourceDecorator.new(current_file, current_line, 1)
-        loc_decorator = RubyJard::Decorators::LocDecorator.new(
-          current_file,
-          source_decorator.codes[current_line - source_decorator.window_start]
+        _spans, tokens = loc_decorator.decorate(
+          source_decorator.codes[current_line - source_decorator.window_start],
+          current_file
         )
 
         @inline_tokens = {}
-        loc_decorator.tokens.each_slice(2) do |token, kind|
+        tokens.each_slice(2) do |token, kind|
           next unless INLINE_TOKEN_KINDS.include?(kind)
 
           @inline_tokens[kind] ||= []
@@ -224,6 +237,9 @@ module RubyJard
 
         @inline_tokens
       end
+      def loc_decorator
+        @loc_decorator ||= RubyJard::Decorators::LocDecorator.new
+      end
     end
   end
 end

data/lib/ruby_jard/session.rb

@@ -27,6 +27,22 @@ module RubyJard
     def start
       return if started?
 
+      ##
+      # Globally configure Byebug. Byebug doesn't allow configuration by instance.
+      # So, I have no choice.
+      # TODO: Byebug autoloaded configuration may override those values.
+      Byebug::Setting[:autolist] = false
+      Byebug::Setting[:autoirb] = false
+      Byebug::Setting[:autopry] = false
+      Byebug::Context.processor = RubyJard::ReplProcessor
+      # Exclude all files in Ruby Jard source code from the stacktrace.
+      Byebug::Context.ignored_files = Byebug::Context.all_files + Dir.glob(
+        File.join(
+          File.expand_path(__dir__, '../lib'),
+          '**',
+          '*.rb'
+        )
+      )
       @started = true
     end
 

data/lib/ruby_jard/span.rb

@@ -4,14 +4,16 @@ module RubyJard
   class Span
     extend Forwardable
 
-    attr_accessor :span_template, :content, :content_length, :styles
+    attr_accessor :content, :content_length, :styles
 
-    def_delegators :@span_template, :margin_left, :margin_right, :word_wrap, :ellipsis
+    def initialize(content: '', content_length: nil, margin_left: 0, margin_right: 0, styles: [])
+      if !content.nil? && !content.empty?
+        content = ' ' * margin_left + content if margin_left > 0
+        content += ' ' * margin_right if margin_right > 0
+      end
 
-    def initialize(span_template:, content: '', content_length: 0, styles: [])
-      @span_template = span_template
-      @content = content
-      @content_length = content_length
+      @content = content.to_s
+      @content_length = content_length || @content.length
       @styles = styles
     end
   end

data/lib/ruby_jard/version.rb

@@ -2,5 +2,5 @@
 
 # Semantic versionn
 module RubyJard
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/ruby_jard.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'bin'
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = []
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'byebug', '>= 11.1.0'
-  spec.add_runtime_dependency 'pastel', '>= 0.7.4'
-  spec.add_runtime_dependency 'pry', '>= 0.13.0'
+  spec.add_runtime_dependency 'byebug', '~> 11.1.0'
+  spec.add_runtime_dependency 'pry', '~> 0.13.0'
+  spec.add_runtime_dependency 'tty-screen', '~> 0.8.1'
 end

data/stylesheets/github-light.css

@@ -0,0 +1,130 @@
+/*!
+ * GitHub Light v0.4.1
+ * Copyright (c) 2012 - 2017 GitHub, Inc.
+ * Licensed under MIT (https://github.com/primer/github-syntax-theme-generator/blob/master/LICENSE)
+ */
+
+.pl-c /* comment, punctuation.definition.comment, string.comment */ {
+  color: #6a737d;
+}
+
+.pl-c1 /* constant, entity.name.constant, variable.other.constant, variable.language, support, meta.property-name, support.constant, support.variable, meta.module-reference, markup.raw, meta.diff.header, meta.output */,
+.pl-s .pl-v /* string variable */ {
+  color: #005cc5;
+}
+
+.pl-e /* entity */,
+.pl-en /* entity.name */ {
+  color: #6f42c1;
+}
+
+.pl-smi /* variable.parameter.function, storage.modifier.package, storage.modifier.import, storage.type.java, variable.other */,
+.pl-s .pl-s1 /* string source */ {
+  color: #24292e;
+}
+
+.pl-ent /* entity.name.tag, markup.quote */ {
+  color: #22863a;
+}
+
+.pl-k /* keyword, storage, storage.type */ {
+  color: #d73a49;
+}
+
+.pl-s /* string */,
+.pl-pds /* punctuation.definition.string, source.regexp, string.regexp.character-class */,
+.pl-s .pl-pse .pl-s1 /* string punctuation.section.embedded source */,
+.pl-sr /* string.regexp */,
+.pl-sr .pl-cce /* string.regexp constant.character.escape */,
+.pl-sr .pl-sre /* string.regexp source.ruby.embedded */,
+.pl-sr .pl-sra /* string.regexp string.regexp.arbitrary-repitition */ {
+  color: #032f62;
+}
+
+.pl-v /* variable */,
+.pl-smw /* sublimelinter.mark.warning */ {
+  color: #e36209;
+}
+
+.pl-bu /* invalid.broken, invalid.deprecated, invalid.unimplemented, message.error, brackethighlighter.unmatched, sublimelinter.mark.error */ {
+  color: #b31d28;
+}
+
+.pl-ii /* invalid.illegal */ {
+  color: #fafbfc;
+  background-color: #b31d28;
+}
+
+.pl-c2 /* carriage-return */ {
+  color: #fafbfc;
+  background-color: #d73a49;
+}
+
+.pl-c2::before /* carriage-return */ {
+  content: "^M";
+}
+
+.pl-sr .pl-cce /* string.regexp constant.character.escape */ {
+  font-weight: bold;
+  color: #22863a;
+}
+
+.pl-ml /* markup.list */ {
+  color: #735c0f;
+}
+
+.pl-mh /* markup.heading */,
+.pl-mh .pl-en /* markup.heading entity.name */,
+.pl-ms /* meta.separator */ {
+  font-weight: bold;
+  color: #005cc5;
+}
+
+.pl-mi /* markup.italic */ {
+  font-style: italic;
+  color: #24292e;
+}
+
+.pl-mb /* markup.bold */ {
+  font-weight: bold;
+  color: #24292e;
+}
+
+.pl-md /* markup.deleted, meta.diff.header.from-file, punctuation.definition.deleted */ {
+  color: #b31d28;
+  background-color: #ffeef0;
+}
+
+.pl-mi1 /* markup.inserted, meta.diff.header.to-file, punctuation.definition.inserted */ {
+  color: #22863a;
+  background-color: #f0fff4;
+}
+
+.pl-mc /* markup.changed, punctuation.definition.changed */ {
+  color: #e36209;
+  background-color: #ffebda;
+}
+
+.pl-mi2 /* markup.ignored, markup.untracked */ {
+  color: #f6f8fa;
+  background-color: #005cc5;
+}
+
+.pl-mdr /* meta.diff.range */ {
+  font-weight: bold;
+  color: #6f42c1;
+}
+
+.pl-ba /* brackethighlighter.tag, brackethighlighter.curly, brackethighlighter.round, brackethighlighter.square, brackethighlighter.angle, brackethighlighter.quote */ {
+  color: #586069;
+}
+
+.pl-sg /* sublimelinter.gutter-mark */ {
+  color: #959da5;
+}
+
+.pl-corl /* constant.other.reference.link, string.other.link */ {
+  text-decoration: underline;
+  color: #032f62;
+}
+