jazz_fingers 5.0.1 → 6.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b393eef001d85320069330c948fdd7236e6e7d7f4de9629d8f840d232fc418ca
-  data.tar.gz: e7e153cf459ed83b1d6bcb468b8bfb4034e8b10db6de1bdefd9683960024b8ef
+  metadata.gz: 532d4660c48c061acd71789b37a2192a234ee1a9c758e7a558a6d84f4e9a2e17
+  data.tar.gz: 10dda140b0286c7ef7c7639703742d07b11e0e1c27edde9d4f66a4d41d01dd48
 SHA512:
-  metadata.gz: e2516d198ba0e449a6924c08dbb353d267cecb72dba81bb017fab65e9b23cb27fcd56ec8ce75a4dff4e843626139b0626420822dca7570f04017cd2c7bfbad16
-  data.tar.gz: 0f8ece831786a3cb2b6a6169f400f0c0b0ebf4822d008889a727d9523e45dee60d2b609092cd2215fa40acf2a23616046d4e3732807901a241ad77c63631f369
+  metadata.gz: d1673af4271d78fb52ce3537a09f963af085a5afd1a8382af3664e9f67b7573e1a4e98e1ab60a38ef0c6f57a83aaa877cd79df99a43ed22b795c5d3c0e1a0dd8
+  data.tar.gz: a8ffbb30aeb64be2a37955274645e740137a4f404bb68190d05ea8412acd2ade3b145214c1c9ac26f8762dba31dd5605e014644a1a062ac3d3057ce88648317c

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.6.6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 5.1.0.rc1 (2020-04-25)
+* Change deprecated method on pry > 0.13.0
+* Improve naming context
+
 ## 5.0.1 (2019-06-02)
 * Remove documentation for removed dependency
 * Use non deprecated method of `pry` if existent

data/README.md

@@ -9,7 +9,7 @@ hard-working fingers!
 **jazz_fingers** is an opinionated set of console-related gems and a bit of glue:
 
 * [**Pry**][pry] for a powerful shell alternative to IRB.
-* [**Awesome Print**][awesome_print] for stylish pretty print.
+* [**Amazing Print**][amazing_print] for stylish pretty print.
   console.
 * [**Pry Coolline**][pry-coolline] for syntax highlighting as you type.
 
@@ -46,7 +46,7 @@ Some configurations can be overwritten:
 if defined?(JazzFingers)
   JazzFingers.configure do |config|
     config.colored_prompt = false
-    config.awesome_print = false
+    config.amazing_print = false
     config.coolline = false
     config.application_name = MyAwesomeProject
   end
@@ -69,7 +69,7 @@ mixed encodings.
 
 
 [pry]:                http://pry.github.com
-[awesome_print]:      https://github.com/michaeldv/awesome_print
+[amazing_print]:      https://github.com/amazing-print/amazing_print
 [hirb]:               https://github.com/cldwalker/hirb
 [pry-doc]:            https://github.com/pry/pry-doc
 [pry-coolline]:       https://github.com/pry/pry-coolline

data/jazz_fingers.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Exercise those fingers. Pry-based enhancements for the default Ruby console.'
   description =
     'Spending hours in the ruby console? Spruce it up and show off those hard-working hands! jazz_fingers'\
-    'replaces IRB with Pry, improves output through awesome_print, and has some other goodies up its sleeves.'
+    'replaces IRB with Pry, improves output through amazing_print, and has some other goodies up its sleeves.'
   gem.description   = description
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   # Dependencies
   gem.required_ruby_version = '>= 2.0'
-  gem.add_runtime_dependency 'awesome_print', '~> 1.6'
+  gem.add_runtime_dependency 'amazing_print', '~> 1.2'
   gem.add_runtime_dependency 'pry', '~> 0.10'
   gem.add_runtime_dependency 'pry-byebug', '~> 3.4'
   gem.add_runtime_dependency 'pry-coolline', '~> 0.2'

data/lib/jazz_fingers.rb

@@ -6,6 +6,9 @@ require 'readline'
 require 'forwardable'
 
 module JazzFingers
+  autoload :AMAZING_PRINT, 'jazz_fingers/amazing_print'
+  autoload :CodeRay, 'jazz_fingers/coderay'
+  autoload :Commands, 'jazz_fingers/commands'
   autoload :Configuration, 'jazz_fingers/configuration'
   autoload :Input, 'jazz_fingers/input'
   autoload :Print, 'jazz_fingers/print'
@@ -15,7 +18,7 @@ module JazzFingers
   class << self
     extend Forwardable
 
-    def_delegators :config, :awesome_print?, :coolline?
+    def_delegators :config, :amazing_print?, :coolline?
 
     def print
       @print ||= Print.config
@@ -45,13 +48,32 @@ module JazzFingers
     end
 
     def setup!
-      Pry.print = print if JazzFingers.awesome_print?
       Pry.prompt = prompt
       Pry.input = input if JazzFingers.coolline?
       Pry.config.should_load_plugins = false
       Pry.commands.alias_command('c', 'continue')
       Pry.commands.alias_command('s', 'step')
       Pry.commands.alias_command('n', 'next')
+      Pry.editor = 'vi'
+      Pry.config.ls.separator = "\n"
+      Pry.config.ls.heading_color = :magenta
+      Pry.config.ls.public_method_color = :green
+      Pry.config.ls.protected_method_color = :yellow
+      Pry.config.ls.private_method_color = :bright_black
+
+      JazzFingers::Commands.constants(false).each do |constant|
+        command = JazzFingers::Commands.const_get(constant)
+        Pry.config.commands.import(command)
+      end
+
+      if JazzFingers.amazing_print?
+        require 'amazing_print'
+
+        AmazingPrint.defaults = JazzFingers::AMAZING_PRINT
+        Pry.print = print
+      end
+
+      JazzFingers::CodeRay.setup!
 
       true
     end

data/lib/jazz_fingers/amazing_print.rb

@@ -0,0 +1,26 @@
+module JazzFingers
+  AMAZING_PRINT = {
+    indent: 2,
+    sort_keys: true,
+    color: {
+      args: :greenish,
+      array: :whiteish,
+      bigdecimal: :blue,
+      class: :yellow,
+      date: :greenish,
+      falseclass: :red,
+      fixnum: :blue,
+      float: :blue,
+      hash: :whiteish,
+      keyword: :cyan,
+      method: :purpleish,
+      nilclass: :red,
+      string: :yellowish,
+      struct: :whiteish,
+      symbol: :cyanish,
+      time: :greenish,
+      trueclass: :green,
+      variable: :cyanish
+    }
+  }
+end

data/lib/jazz_fingers/coderay.rb

@@ -0,0 +1,20 @@
+module JazzFingers
+  module CodeRay
+    autoload :ESCAPED_COLORS, 'jazz_fingers/coderay/escaped_colors'
+    autoload :UNESCAPED_COLORS, 'jazz_fingers/coderay/unescaped_colors'
+
+    def self.setup!
+      ::CodeRay.scan("example", :ruby).term
+
+      if ::CodeRay::VERSION >= '1.1.0'
+        ESCAPED_COLORS.each do |key, value|
+          ::CodeRay::Encoders::Terminal::TOKEN_COLORS[key] = value
+        end
+      else
+        UNESCAPED_COLORS.each do |key, value|
+          ::CodeRay::Encoders::Terminal::TOKEN_COLORS[key] = value
+        end
+      end
+    end
+  end
+end

data/lib/jazz_fingers/coderay/escaped_colors.rb

@@ -0,0 +1,74 @@
+module JazzFingers
+  module CodeRay
+    ESCAPED_COLORS = {
+      attribute_name: "\e[33m",
+      attribute_value: "\e[31m",
+      binary: "\e[1;35m",
+      char: {
+        self: "\e[36m",
+        delimiter: "\e[34m"
+      },
+      class: "\e[1;35m",
+      class_variable: "\e[36m",
+      color: "\e[32m",
+      comment: "\e[37m",
+      complex: "\e[34m",
+      constant: "\e[34m\e[4m",
+      decoration: "\e[35m",
+      definition: "\e[1;32m",
+      directive: "\e[32m\e[4m",
+      doc: "\e[46m",
+      doctype: "\e[1;30m",
+      doc_string: "\e[31m\e[4m",
+      entity: "\e[33m",
+      error: "\e[1;33m\e[41m",
+      exception: "\e[1;31m",
+      float: "\e[1;35m",
+      function: "\e[1;34m",
+      global_variable: "\e[42m",
+      hex: "\e[1;36m",
+      include: "\e[33m",
+      integer: "\e[1;34m",
+      key: "\e[35m",
+      label: "\e[1;15m",
+      local_variable: "\e[33m",
+      octal: "\e[1;35m",
+      operator_name: "\e[1;29m",
+      predefined_constant: "\e[1;36m",
+      predefined_type: "\e[1;30m",
+      predefined: "\e[4m\e[1;34m",
+      preprocessor: "\e[36m",
+      pseudo_class: "\e[34m",
+      regexp: {
+        self: "\e[31m",
+        content: "\e[31m",
+        delimiter: "\e[1;29m",
+        modifier: "\e[35m",
+        function: "\e[1;29m"
+      },
+      reserved: "\e[1;31m",
+      shell: {
+        self: "\e[42m",
+        content: "\e[1;29m",
+        delimiter: "\e[37m",
+      },
+      string: {
+        self: "\e[36m",
+        modifier: "\e[1;32m",
+        escape: "\e[1;36m",
+        delimiter: "\e[1;32m",
+      },
+      symbol: "\e[1;31m",
+      tag: "\e[34m",
+      type: "\e[1;34m",
+      value: "\e[36m",
+      variable: "\e[34m",
+
+      insert: "\e[42m",
+      delete: "\e[41m",
+      change: "\e[44m",
+      head: "\e[45m"
+    }.freeze
+  end
+end
+

data/lib/jazz_fingers/coderay/unescaped_colors.rb

@@ -0,0 +1,74 @@
+module JazzFingers
+  module CodeRay
+    UNESCAPED_COLORS = {
+      attribute_name: '33',
+      attribute_value: '31',
+      binary: '1;35',
+      char: {
+        self: '36',
+        delimiter: '34'
+      },
+      class: '1;35',
+      class_variable: '36',
+      color: '32',
+      comment: '37',
+      complex: '34',
+      constant: ['34', '4'],
+      decoration: '35',
+      definition: '1;32',
+      directive: ['32', '4'],
+      doc: '46',
+      doctype: '1;30',
+      doc_string: ['31', '4'],
+      entity: '33',
+      error: ['1;33', '41'],
+      exception: '1;31',
+      float: '1;35',
+      function: '1;34',
+      global_variable: '42',
+      hex: '1;36',
+      include: '33',
+      integer: '1;34',
+      key: '35',
+      label: '1;15',
+      local_variable: '33',
+      octal: '1;35',
+      operator_name: '1;29',
+      predefined_constant: '1;36',
+      predefined_type: '1;30',
+      predefined: ['4', '1;34'],
+      preprocessor: '36',
+      pseudo_class: '34',
+      regexp: {
+        self: '31',
+        content: '31',
+        delimiter: '1;29',
+        modifier: '35',
+        function: '1;29'
+      },
+      reserved: '1;31',
+      shell: {
+        self: '42',
+        content: '1;29',
+        delimiter: '37',
+      },
+      string: {
+        self: '36',
+        modifier: '1;32',
+        escape: '1;36',
+        delimiter: '1;32',
+      },
+      symbol: '1;31',
+      tag: '34',
+      type: '1;34',
+      value: '36',
+      variable: '34',
+
+      insert: '42',
+      delete: '41',
+      change: '44',
+      head: '45'
+    }.freeze
+  end
+end
+

data/lib/jazz_fingers/commands.rb

@@ -0,0 +1,7 @@
+module JazzFingers
+  module Commands
+    autoload :CALLER_METHOD, 'jazz_fingers/commands/caller_method'
+    autoload :COPY, 'jazz_fingers/commands/copy'
+    autoload :SQL, 'jazz_fingers/commands/sql'
+  end
+end

data/lib/jazz_fingers/commands/caller_method.rb

@@ -0,0 +1,16 @@
+module JazzFingers
+  module Commands
+    CALLER_METHOD = Pry::CommandSet.new do
+      command "caller_method" do |depth|
+        depth = depth.to_i || 1
+        if /^(.+?):(\d+)(?::in `(.*)')?/ =~ caller(depth+1).first
+          file   = Regexp.last_match[1]
+          line   = Regexp.last_match[2].to_i
+          method = Regexp.last_match[3]
+          output.puts [file, line, method]
+        end
+      end
+    end
+  end
+end
+

data/lib/jazz_fingers/commands/copy.rb

@@ -0,0 +1,10 @@
+module JazzFingers
+  module Commands
+    COPY = Pry::CommandSet.new do
+      command "copy", "Copy argument to the clip-board" do |str|
+        IO.popen('pbcopy', 'w') { |f| f << str.to_s }
+      end
+    end
+  end
+end
+

data/lib/jazz_fingers/commands/sql.rb

@@ -0,0 +1,14 @@
+module JazzFingers
+  module Commands
+    SQL = Pry::CommandSet.new do
+      command "sql", "Send sql over AR." do |query|
+        if defined?(Rails)
+          pp ActiveRecord::Base.connection.select_all(query)
+        else
+          pp "Rails not defined"
+        end
+      end
+    end
+  end
+end
+

data/lib/jazz_fingers/configuration.rb

@@ -1,6 +1,6 @@
 module JazzFingers
   class Configuration
-    attr_writer :colored_prompt, :prompt_separator, :coolline, :awesome_print,
+    attr_writer :colored_prompt, :prompt_separator, :coolline, :amazing_print,
                 :application_name
 
     # Color the prompt?
@@ -32,17 +32,26 @@ module JazzFingers
       @coolline
     end
 
-    def awesome_print?
-      return true if @awesome_print.nil?
+    def amazing_print?
+      return true if @amazing_print.nil?
 
-      @awesome_print
+      @amazing_print
     end
 
     def application_name
-      return "(#{underscore(@application_name)})" unless @application_name.nil?
-      return "(#{Rails.application.class.parent_name.underscore})" if defined?(Rails)
+      return underscore(@application_name) unless @application_name.nil?
 
-      '(jazz_fingers)'
+      if defined?(Rails)
+        application_class = Rails.application.class
+
+        if application_class.respond_to?(:module_parent_name)
+          return application_class.module_parent_name.underscore
+        else
+          return application_class.parent_name.underscore
+        end
+      end
+
+      "jazz_fingers"
     end
 
     private

data/lib/jazz_fingers/print.rb

@@ -1,11 +1,11 @@
-require 'awesome_print'
+require 'amazing_print'
 
 module JazzFingers
   class Print
     class << self
       def config
         lambda do |_output, value, pry_object|
-          pretty = value.ai(indent: 2)
+          pretty = value.ai
           pry_object.pager.page("=> #{pretty}\n")
         end
       end

data/lib/jazz_fingers/prompt.rb

@@ -1,5 +1,18 @@
+# frozen_string_literal: true
+
 module JazzFingers
   class Prompt
+    OBJECT_INSTANCE = /#<(.+)>/
+
+    autoload :PryVersion013AndLater, 'jazz_fingers/prompt/pry_version_013_and_later'
+    autoload :PryVersion012AndPrior, 'jazz_fingers/prompt/pry_version_012_and_prior'
+
+    if Pry::VERSION >= "0.13.0"
+      include PryVersion013AndLater
+    else
+      include PryVersion012AndPrior
+    end
+
     def initialize(options = {})
       @colored = options.fetch(:colored)
       @separator = options.fetch(:separator)
@@ -28,48 +41,75 @@ module JazzFingers
       "\001\e[1m\002#{text}\001\e[0m\002"
     end
 
-    def separator
+    def main_separator
       red_text(@separator)
     end
 
-    def name
-      blue_text(@application_name)
+    def wait_separator
+      "*"
     end
 
-    def line_number(pry)
-      if pry.respond_to? :input_ring
-        "[#{bold_text(pry.input_ring.size)}]"
-      else
-        "[#{bold_text(pry.input_array.size)}]"
-      end
-    end
+    # Return the current Pry context
+    #
+    # When the Pry context is `"main"` or `"nil"`, use the application name from
+    # the JazzFingers config. Examples: "(my_rails_app_name)", "(jazz_fingers)".
+    #
+    # When in the context of an object instance, use the abbreviated object
+    # path. Example: "(#<Pry::Prompt>)", "(#<RSpec::...::ClassName>)"
+    #
+    # Fall back to the raw context provided by Pry.view_clip.
+    # Example: "(Pry::Prompt)"
+    def context(module_name = "main")
+      name =
+        case module_name
+        when "main", "nil"
+          @application_name
+        when OBJECT_INSTANCE
+          abbreviated_context(module_name)
+        else
+          module_name
+        end
 
-    def text(object, level)
-      level = 0 if level < 0
-      text = Pry.view_clip(object)
+      blue_text("(#{name})")
+    end
 
-      if text == 'main'
-        ''
+    def line_number(pry)
+      if pry.respond_to? :input_ring
+        bold_text(pry.input_ring.size)
       else
-        "(#{'../' * level}#{text})"
+        bold_text(pry.input_array.size)
       end
     end
 
-    def main_prompt
-      lambda do |_object, _level, pry|
-        "#{RUBY_VERSION} #{name}#{line_number(pry)} #{separator} "
-      end
-    end
+    # Abbreviate the object path in the given `object_label` string so the
+    # prompt doesn't overflow. Display only the root and leaf namespaces.
+    #
+    # Examples:
+    #   In:  #<Class1::Class2::Class3::Class4::Class5>
+    #   Out: #<Class1::...::Class5>
+    #
+    #   In:  #<Class1::Class2>
+    #   Out: #<Class1::Class2>
+    #
+    #   In:  #<NoPathJustASingleLongClassName>
+    #   Out: #<NoPathJustASingleLongClassName>
+    def abbreviated_context(object_label)
+      object_path = object_label[OBJECT_INSTANCE, 1]
+      object_path_components = object_path.split("::")
+      return object_label if object_path_components.length <= 2
 
-    def block_prompt
-      lambda do |_object, level, pry|
-        spaces = '  ' * level
-        "#{RUBY_VERSION} #{name}#{line_number(pry)} * #{spaces}"
-      end
+      root, *_, leaf = object_path_components
+      "#<#{root}::...::#{leaf}>"
     end
 
-    def config
-      [main_prompt, block_prompt]
+    def template(module_name, pry, separator)
+      format(
+        "%<ruby>s %<context>s[%<line>s] %<separator>s ",
+        ruby: RUBY_VERSION,
+        context: context(module_name),
+        line: line_number(pry),
+        separator: separator
+      )
     end
   end
 end

data/lib/jazz_fingers/prompt/pry_version_012_and_prior.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module JazzFingers
+  class Prompt
+    # For Pry < 0.13.
+    module PryVersion012AndPrior
+      def config
+        [main_prompt, wait_prompt]
+      end
+
+      def main_prompt
+        lambda do |context, _nesting, pry|
+          template(Pry.view_clip(context), pry, main_separator)
+        end
+      end
+
+      def wait_prompt
+        lambda do |context, _nesting, pry|
+          template(Pry.view_clip(context), pry, wait_separator)
+        end
+      end
+    end
+  end
+end

data/lib/jazz_fingers/prompt/pry_version_013_and_later.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module JazzFingers
+  class Prompt
+    # For Pry >= 0.13.
+    module PryVersion013AndLater
+      # Add the JazzFingers prompt to the Pry::Prompt hash to enable changing it
+      # with `change-prompt`.
+      #
+      # Return the Pry::Prompt object.
+      def config
+        return Pry::Prompt[:jazz_fingers] if Pry::Prompt[:jazz_fingers]
+
+        Pry::Prompt.add(
+          :jazz_fingers,
+          "A spruced-up prompt provided by jazz_fingers.",
+          [main_separator, wait_separator]
+        ) do |context, _nesting, pry, separator|
+          template(Pry.view_clip(context), pry, separator)
+        end
+
+        Pry::Prompt[:jazz_fingers]
+      end
+    end
+  end
+end

data/lib/jazz_fingers/version.rb

@@ -1,3 +1,3 @@
 module JazzFingers
-  VERSION = '5.0.1'.freeze
+  VERSION = '6.0.0-rc1'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jazz_fingers
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0.pre.rc1
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Spending hours in the ruby console? Spruce it up and show off those hard-working
-  hands! jazz_fingersreplaces IRB with Pry, improves output through awesome_print,
+  hands! jazz_fingersreplaces IRB with Pry, improves output through amazing_print,
   and has some other goodies up its sleeves.
 email: plribeiro3000@gmail.com
 executables: []
@@ -102,16 +102,26 @@ files:
 - Rakefile
 - jazz_fingers.gemspec
 - lib/jazz_fingers.rb
+- lib/jazz_fingers/amazing_print.rb
+- lib/jazz_fingers/coderay.rb
+- lib/jazz_fingers/coderay/escaped_colors.rb
+- lib/jazz_fingers/coderay/unescaped_colors.rb
+- lib/jazz_fingers/commands.rb
+- lib/jazz_fingers/commands/caller_method.rb
+- lib/jazz_fingers/commands/copy.rb
+- lib/jazz_fingers/commands/sql.rb
 - lib/jazz_fingers/configuration.rb
 - lib/jazz_fingers/input.rb
 - lib/jazz_fingers/print.rb
 - lib/jazz_fingers/prompt.rb
+- lib/jazz_fingers/prompt/pry_version_012_and_prior.rb
+- lib/jazz_fingers/prompt/pry_version_013_and_later.rb
 - lib/jazz_fingers/version.rb
 homepage: https://github.com/plribeiro3000/jazz_fingers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,12 +132,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Exercise those fingers. Pry-based enhancements for the default Ruby console.
 test_files: []