brice 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ddba70d209c217914a89b04cabb534d265361553
-  data.tar.gz: 301300658dfad33b7bc0c8ec3c476333ba311656
+SHA256:
+  metadata.gz: 36999aee54c54f1de81d06593f1038074c2b9726c8201752cb692ba28c33a411
+  data.tar.gz: 6dd8b2419fc5e1f0a3192ba5fb3273c1ab9c66f1136d12e27865f4ba0e8104db
 SHA512:
-  metadata.gz: b37341fda49b517f99dfe9a4b0c752df4b5e594ccdc8f09c5fcee672bb8fb516918849c6c75a39ab96f809cdeeed477c70ea1003bceeb729005d3afe39ec755f
-  data.tar.gz: fc851d3cb88d455fa4926722e960aa67a38d532c95dd88f744431319f7dcb210d3a2e99c9e81a915b944cf7799913308ac4b4e650dba0d2a43df5315216d6927
+  metadata.gz: 9d00c57bd13955221544ae079b8fe8f62553419544c716f1492fab2a3850fe4d8a5f92716b9ab5adfecc9c37b78c3716d02ad40c5d438d709e3c71a3408c3670
+  data.tar.gz: 10ab3f892e919a92a29b32e5c4d2064bb3045ea375adfe74648642dbd35af9c0ac9101a754ec31285ca4aa26a1fc3caa766a0c74b5af3a1b1fa46206b1b21afe

data/ChangeLog

@@ -2,6 +2,10 @@
 
 = Revision history for brice
 
+== 0.4.2 [2020-09-17]
+
+* Ruby 2.7 compatibility.
+
 == 0.4.1 [2016-03-29]
 
 * To mark default packages as optional, use underscore in addition to question

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to brice version 0.4.1
+This documentation refers to brice version 0.4.2
 
 
 == DESCRIPTION
@@ -75,7 +75,7 @@ Travis CI::     https://travis-ci.org/blackwinter/brice
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2008-2016 Jens Wille
+Copyright (C) 2008-2020 Jens Wille
 
 brice is free software: you can redistribute it and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free

data/Rakefile

@@ -12,7 +12,7 @@ begin
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: { nuggets: '~> 1.4' },
+      dependencies: { nuggets: '~> 1.6' },
 
       required_ruby_version: '>= 1.9.3'
     }

data/lib/brice.rb

@@ -48,7 +48,7 @@ module Brice
 
   # call-seq:
   #   Brice.init { |config| ... }
-  #   Brice.init(:verbose => true) { |config| ... }
+  #   Brice.init(verbose: true) { |config| ... }
   #
   # Initialize Brice and optionally configure any packages.
   def init(options = {})
@@ -123,6 +123,10 @@ module Brice
     opt.is_a?(Hash) && opt.key?(key) ? opt[key] : default
   end
 
+  def error(obj, met, err)
+    warn "Error in #{obj}##{met}: #{err.backtrace.first}: #{err} (#{err.class})"
+  end
+
   private
 
   # call-seq:

data/lib/brice/colours.rb

@@ -28,9 +28,9 @@ module Brice
 
   # Add colour support to IRb.
   #
-  # Set your own colours with <tt>config.colours.opt = { :colours => { ... } }</tt>
+  # Set your own colours with <tt>config.colours.opt = { colours: { ... } }</tt>
   # or modify the default scheme (DEFAULT_COLOURS) with <tt>config.colours.opt =
-  # { :colours => Brice::Colours::DEFAULT_COLOURS.merge(...) }</tt>.
+  # { colours: Brice::Colours::DEFAULT_COLOURS.merge(...) }</tt>.
 
   module Colours
 
@@ -94,6 +94,8 @@ module Brice
     }
 
     def init(opt = {})
+      require 'ripper'
+
       enable_irb if Brice.opt(opt, :irb, STDOUT.tty?)
       enable_pp  if Brice.opt(opt, :pp,  STDOUT.tty?)
 
@@ -188,15 +190,11 @@ module Brice
 
     # Colourize the results of inspect
     def colourize(str)
-      res = ''
-
-      Tokenizer.tokenize(str) { |token, value|
+     ''.tap { |res| Tokenizer.tokenize(str.to_s) { |token, value|
         res << colourize_string(value, colours[token])
-      }
-
-      res
+      } }
     rescue => err
-      warn "#{err.backtrace.first}: #{err} (#{err.class})"
+      Brice.error(self, __method__, err)
       str
     end
 
@@ -237,144 +235,174 @@ module Brice
 
     # Tokenize an inspection string.
 
-    module Tokenizer
+    class Tokenizer
+
+      EVENT_MAP = {
+      # on_CHAR:            :unknown,
+      # on___end__:         :unknown,
+      # on_backref:         :unknown,
+      # on_backtick:        :unknown,
+        on_comma:           :comma,
+        on_comment:         :unknown,
+        on_const:           :class,
+      # on_cvar:            :unknown,
+      # on_embdoc:          :unknown,
+      # on_embdoc_beg:      :unknown,
+      # on_embdoc_end:      :unknown,
+      # on_embexpr_beg:     :unknown,
+      # on_embexpr_end:     :unknown,
+      # on_embvar:          :unknown,
+        on_float:           :number,
+      # on_gvar:            :unknown,
+      # on_heredoc_beg:     :unknown,
+      # on_heredoc_end:     :unknown,
+        on_ident:           :symbol,
+      # on_ignored_nl:      :unknown,
+        on_imaginary:       :number,
+        on_int:             :number,
+      # on_ivar:            :unknown,
+        on_kw:              :keyword,
+        on_label:           :unknown,
+        on_lbrace:          :open_hash,
+        on_lbracket:        :open_array,
+        on_lparen:          :unknown,
+      # on_nl:              :unknown,
+        on_op:              :refers,
+        on_period:          :comma,
+      # on_qsymbols_beg:    :unknown,
+      # on_qwords_beg:      :unknown,
+        on_rational:        :number,
+        on_rbrace:          :close_hash,
+        on_rbracket:        :close_array,
+        on_regexp_beg:      :unknown,
+        on_regexp_end:      :unknown,
+        on_rparen:          :unknown,
+        on_semicolon:       :comma,
+        on_sp:              :whitespace,
+        on_symbeg:          :symbol_prefix,
+      # on_symbols_beg:     :unknown,
+      # on_tlambda:         :unknown,
+      # on_tlambeg:         :unknown,
+        on_tstring_beg:     :open_string,
+        on_tstring_content: :string,
+        on_tstring_end:     :close_string,
+      # on_words_beg:       :unknown,
+      # on_words_sep:       :unknown
+      }
 
-      extend self
+      OBJECT_RE = %r{
+        \A
+        ( \#< )
+        ( .+ )
+        ( > )
+        \z
+      }x
+
+      OBJECT_CLASS_RE = %r{
+        \A
+        (?: \w | :: )+
+      }x
+
+      OBJECT_ADDR_RE = %r{
+        \A
+        ( : )
+        ( 0x [\hx]+ )
+        (?= \s | \z )
+      }x
+
+      IVAR_RE = %r{
+        \A
+        ( @ )
+        ( .+ )
+        \z
+      }x
+
+      RANGE_RE = %r{
+        \A
+        \.+
+        \z
+      }x
+
+      def self.tokenize(str, &block)
+        new(&block).tokenize(str)
+      end
+
+      def initialize(&block)
+        @block = block or raise ArgumentError, 'no block given'
+      end
+
+      attr_reader :block
 
       def tokenize(str)
-        raise ArgumentError, 'no block given' unless block_given?
+        return if str.empty?
+        return if enc_event(str)
 
-        chars = str.split(//)
-        char  = last_char = repeat = nil
-        states, value, index = [], '', 0
+        lex, prev = Ripper.lex(str), nil
 
-        reset = lambda { |*args|
-          states.pop
+        len = lex[-1][0][-1] + lex[-1][-1].bytesize
+        str, rest = str.byteslice(0, len), str.byteslice(len .. -1)
 
-          value  = ''
-          repeat = args.first unless args.empty?
-        }
+        return block[:unknown, rest] if str.empty?
 
-        yield_last = lambda { |*args|
-          yield states.last, value
-          reset[*args]
+        lex.each { |_, event, tok|
+          sym_event(event, tok, prev) ||
+          obj_event(event, tok)       ||
+          rng_event(event, tok)       ||
+          var_event(event, tok)       ||
+          map_event(event, tok)
+
+          prev = event
         }
 
-        until index > chars.size
-          char, repeat = chars[index], false
-
-          case states.last
-            when nil
-              case char
-                when ':' then states << :symbol
-                when '"' then states << :string
-                when '#' then states << :object
-                when /[a-z]/i
-                  states << :keyword
-                  repeat = true
-                when /[0-9-]/
-                  states << :number
-                  repeat = true
-                when '{'  then yield :open_hash,   '{'
-                when '['  then yield :open_array,  '['
-                when ']'  then yield :close_array, ']'
-                when '}'  then yield :close_hash,  '}'
-                when /\s/ then yield :whitespace,  char
-                when ','  then yield :comma,       ','
-                when '>'  then yield :refers,      '=>' if last_char == '='
-                when '.'  then yield :range,       '..' if last_char == '.'
-                when '='  then nil
-                else           yield :unknown,     char if char
-              end
-            when :symbol
-              if char =~ /[a-z0-9_!?]/  # should have =, but that messes up foo=>bar
-                value << char
-              else
-                yield :symbol_prefix, ':'
-                yield_last[true]
-              end
-            when :string
-              if char == '"'
-                if last_char == '\\'
-                  value[-1] = char
-                else
-                  yield :open_string,  char
-                  yield_last[]
-                  yield :close_string, char
-                end
-              else
-                value << char
-              end
-            when :keyword
-              if char =~ /[a-z0-9_]/i
-                value << char
-              else
-                states[-1] = :class if value =~ /\A[A-Z]/
-                yield_last[true]
-
-                value << char if char == '.'
-              end
-            when :number
-              case char
-                when /[0-9e-]/
-                  value << char
-                when '.'
-                  if last_char == char
-                    value.chop!
-
-                    yield_last[]
-                    yield :range, '..'
-                  else
-                    value << char
-                  end
-                else
-                  yield_last[true]
-              end
-            when :object
-              case char
-                when '<'
-                  yield :open_object, '#<'
-                  states << :object_class
-                when ':'
-                  states << :object_addr
-                when '@'
-                  states << :object_line
-                when '>'
-                  yield :close_object, '>'
-                  reset[]
-              end
-            when :object_class
-              if char == ':'
-                yield_last[true]
-              else
-                value << char
-              end
-            when :object_addr
-              case char
-                when '>'
-                  # ignore
-                when '@'
-                  yield :object_addr_prefix, ':'
-                  yield_last[true]
-                else
-                  value << char
-              end
-            when :object_line
-              if char == '>'
-                yield :object_line_prefix, '@'
-                yield_last[true]
-              else
-                value << char
-              end
-            else
-              raise "unknown state: #{states}"
-          end
+        tokenize(rest)
+      end
+
+      private
+
+      def enc_event(str)  # XXX /\A\s*#.*?coding\s*:\s*./
+        object($1, $2, $3) if str =~ OBJECT_RE && str.include?('coding')
+      end
 
-          unless repeat
-            index += 1
-            last_char = char
+      def obj_event(event, tok)
+        object($1, $2, $3) if event == :on_comment && tok =~ OBJECT_RE
+      end
+
+      def sym_event(event, tok, prev)
+        block[:symbol, tok] if event == :on_kw && prev == :on_symbeg
+      end
+
+      def rng_event(event, tok)
+        block[:range, tok] if event == :on_op && tok =~ RANGE_RE
+      end
+
+      def var_event(event, tok)
+        if event == :on_ivar && tok =~ IVAR_RE
+          block[:object_line_prefix, $1]
+          block[:keyword, $2]
+        end
+      end
+
+      def map_event(event, tok)
+        block[EVENT_MAP[event], tok]
+      end
+
+      def object(open, str, close)
+        block[:open_object, open]
+
+        if str.sub!(OBJECT_CLASS_RE, '')
+          block[:object_class, $&]
+
+          if str.sub!(OBJECT_ADDR_RE, '')
+            block[:object_addr_prefix, $1]
+            block[:object_addr, $2]
+
+            str = tokenize(str)
           end
         end
+
+        block[:unknown, str] if str
+
+        block[:close_object, close]
       end
 
     end

data/lib/brice/history.rb

@@ -43,11 +43,11 @@ module Brice
   class History
 
     DEFAULTS = {
-      :path   =>  ENV['IRB_HISTORY_FILE'] || File.join(ENV.user_home, '.irb_history'),
-      :size   => (ENV['IRB_HISTORY_SIZE'] || 1000).to_i,
-      :perms  => File::WRONLY | File::CREAT | File::TRUNC,
-      :uniq   => :reverse,
-      :merge  => true
+      path:   ENV['IRB_HISTORY_FILE'] || File.join(ENV.user_home, '.irb_history'),
+      size:  (ENV['IRB_HISTORY_SIZE'] || 1000).to_i,
+      perms: File::WRONLY | File::CREAT | File::TRUNC,
+      uniq:  :reverse,
+      merge: true
     }
 
     def self.init(opt = {})
@@ -91,6 +91,8 @@ module Brice
     end
 
     def load_history(history = @history)
+      @first_line = nil
+
       return unless File.readable?(@path)
       read_history { |line| history << line }
 

data/lib/brice/rc/060_init.rb

@@ -2,6 +2,8 @@
 
 brice 'init' => nil do |config|
 
-  IRB.conf[:AUTO_INDENT] = true
+  IRB.conf[:AUTO_INDENT]        = true
+  IRB.conf[:ECHO_ON_ASSIGNMENT] = true
+  IRB.conf[:USE_MULTILINE]      = false
 
 end

data/lib/brice/rc/070_prompt.rb

@@ -17,8 +17,8 @@ brice 'prompt' => nil do |config|
       alias_method :_brice_original_evaluate, :evaluate
 
       # Capture execution time
-      def evaluate(*a)
-        @_brice_tms = Benchmark.measure { _brice_original_evaluate(*a) }
+      def evaluate(*a, **o)
+        @_brice_tms = Benchmark.measure { _brice_original_evaluate(*a, **o) }
       end
     end
   end
@@ -39,17 +39,17 @@ brice 'prompt' => nil do |config|
     lambda { |rt| "#{rt} => %s\n" } : "=> %s\n"
 
   IRB.conf[:PROMPT].update(
-    :BRICE_SIMPLE => {
-      :PROMPT_I => '  ',
-      :PROMPT_S => '  ',
-      :PROMPT_C => '  ',
-      :RETURN   => prompt_return
+    BRICE_SIMPLE: {
+      PROMPT_I: '  ',
+      PROMPT_S: '  ',
+      PROMPT_C: '  ',
+      RETURN:   prompt_return
     },
-    :BRICE_VERBOSE => {
-      :PROMPT_I => "#{prefix}> ",
-      :PROMPT_S => "#{prefix}> ",
-      :PROMPT_C => "#{prefix}> ",
-      :RETURN   => prompt_return
+    BRICE_VERBOSE: {
+      PROMPT_I: "#{prefix}> ",
+      PROMPT_S: "#{prefix}> ",
+      PROMPT_C: "#{prefix}> ",
+      RETURN:   prompt_return
     }
   )
 

data/lib/brice/rc/080_rails.rb

@@ -24,10 +24,10 @@ brice 'rails' => nil do |config|
     IRB.conf[:PROMPT] ||= {}
 
     IRB.conf[:PROMPT][:BRICE_RAILS] = {
-      :PROMPT_I => prompt,
-      :PROMPT_S => prompt,
-      :PROMPT_C => prompt,
-      :RETURN   => IRB.conf[:PROMPT][:BRICE_SIMPLE] ?
+      PROMPT_I: prompt,
+      PROMPT_S: prompt,
+      PROMPT_C: prompt,
+      RETURN:   IRB.conf[:PROMPT][:BRICE_SIMPLE] ?
         IRB.conf[:PROMPT][:BRICE_SIMPLE][:RETURN] : "=> %s\n"
     }
 
@@ -40,7 +40,7 @@ brice 'rails' => nil do |config|
         Object.const_set(:RAILS_DEFAULT_LOGGER, Logger.new(STDOUT))
       }
 
-      define_irb_method(:logger) { |*args|
+      define_irb_method(:logger) { |*args, &block|
         if args.empty?
           RAILS_DEFAULT_LOGGER
         else
@@ -51,7 +51,7 @@ brice 'rails' => nil do |config|
 
           if block_given?
             begin
-              yield  # RDoc: Warning: yield outside of method
+              block.call
             ensure
               logger.level = previous_level
             end

data/lib/brice/shortcuts.rb

@@ -39,8 +39,8 @@ module Brice
 
   # Convenient shortcut methods.
   #
-  # Set <tt>config.shortcuts.opt = { :object => false }</tt> to disable
-  # ObjectShortcuts, or <tt>config.shortcuts.opt = { :ri => false }</tt>
+  # Set <tt>config.shortcuts.opt = { object: false }</tt> to disable
+  # ObjectShortcuts, or <tt>config.shortcuts.opt = { ri: false }</tt>
   # to disable #ri shortcuts.
 
   module Shortcuts

data/lib/brice/version.rb

@@ -4,7 +4,7 @@ module Brice
 
     MAJOR = 0
     MINOR = 4
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brice
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nuggets
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ files:
 - lib/brice/rc/010_added_methods_.rb
 - lib/brice/rc/020_libs.rb
 - lib/brice/rc/030_history.rb
-- lib/brice/rc/040_colours.rb
+- lib/brice/rc/040_colours_.rb
 - lib/brice/rc/050_shortcuts.rb
 - lib/brice/rc/060_init.rb
 - lib/brice/rc/070_prompt.rb
@@ -113,15 +113,13 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  brice-0.4.1 [2016-03-29]:
+  brice-0.4.2 [2020-09-17]:
 
-  * To mark default packages as optional, use underscore in addition to question
-    mark, since the latter is not supported on Windows file systems (issue #10
-    by Hovis Biddle).
+  * Ruby 2.7 compatibility.
 
 rdoc_options:
 - "--title"
-- brice Application documentation (v0.4.1)
+- brice Application documentation (v0.4.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -141,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extra cool IRb goodness for the masses