lit-cli 0.4.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed5d7713a6943b0043bf26568c069dc4c0a647a8581dc48d7a88c05abb3b5de
-  data.tar.gz: 53c911d1424038fa5bb836dfc68f739514d53a62b91ed813dc506078d4c5742d
+  metadata.gz: c0bb5bf94135acf7647df72b3431dc89663ee6bca855cfb3c75f298d8a79099d
+  data.tar.gz: a1c226eec222a72c0be6f38ee4940f5a3f70809557805bcc0992ebff50e11e89
 SHA512:
-  metadata.gz: e75aab70ca6f9aac9258b68f289ca7efdaf24d8328030a7195c91e24ecd7828eaf32d42d7cee87acc6b1d188d2ef692969cc402055b1a98ed71bc5a0edf4632e
-  data.tar.gz: 0f88b27bcb0308d93b8e7ba223a91a11125faf4c29fdb600e3ff77a18a1526c1be51f5dc4c60e276f5b2a0aca2e91577a92e8f4ef85b6e6c233d80cab8c0a2c3
+  metadata.gz: 335100d58b9ee3c5f6fa599725c91c0911237b1e6ba64fadd4d62b59569478e897eee752f4f9abf70365ae102fa99f9a4d849099c8b99521e6207ec9ad00ae2a
+  data.tar.gz: 97b8638b199affa210e563aa529f8178a45fe0f5023c844460a78e6f742a3b20dbcb502cf64922001b40fa974a009118bce2d7040fba7d3cf88cc0190dc7281d

data/lib/config.rb

@@ -22,22 +22,27 @@ module LitCLI
     @@errors = Set.new
 
     attr_accessor :enabled
+    attr_accessor :statuses
     attr_accessor :types
-    attr_accessor :type
+    # Flags.
     attr_accessor :step
+    attr_accessor :status
+    attr_accessor :type
     attr_accessor :delay
 
     def initialize()
 
-      @types = {
-        :info => { icon: "ℹ", color: :blue },
-        :pass => { icon: "✔", color: :green },
-        :warn => { icon: "⚠", color: :yellow },
-        :fail => { icon: "⨯", color: :red },
-        :error => { icon: "!", color: :red },
-        :debug => { icon: "?", color: :purple },
+      @statuses = {
+        :info => { icon: "ℹ", color: :blue, styles: [:upcase] },
+        :pass => { icon: "✔", color: :green, styles: [:upcase] },
+        :warn => { icon: "⚠", color: :yellow, styles: [:upcase] },
+        :fail => { icon: "⨯", color: :red, styles: [:upcase] },
+        :error => { icon: "!", color: :red, styles: [:upcase] },
+        :debug => { icon: "?", color: :purple, styles: [:upcase] },
       }
 
+      @types = nil
+
       # Lit is disabled by default, then enabled via the `lit` command.
       # Or it can be permanently enabled, without the use of the `lit` command.
       @enabled = false
@@ -48,12 +53,15 @@ module LitCLI
       # Flag defaults when not supplied via command line.
       ##
 
-      # Array of types to filter by, for example... [:warn, :error, :fail]
-      @type = nil
-
       # Boolean on whether or not to step through each lit() breakpoint.
       @step = false
 
+      # Array of statuses to filter by, for example: [:warn, :error, :fail]
+      @status = nil
+
+      # Array of types to filter by, for example: [:cat, :dog, :tree]
+      @type = nil
+
       # Integer or float representing amount of seconds to delay each lit() by.
       @delay = 0
 
@@ -89,6 +97,7 @@ module LitCLI
       end
 
       @step = true if flags.has_key? :step
+      @status = Array(flags[:status]).map(&:to_sym) if valid? flags, :status
       @type = Array(flags[:type]).map(&:to_sym) if valid? flags, :type
       @delay = flags[:delay].to_f if valid? flags, :delay
     end

data/lib/lit_cli.rb

@@ -8,26 +8,49 @@ module LitCLI
   @@config = Config.new
   @@is_prying = false
 
-  def lit(message, type = :info)
+  def lit(message, status = :info, type = nil, context = nil)
     if @@config.enabled
-      return if LitCLI.filter? type
-      LitCLI.render(type)
+      return if LitCLI.filter_status? status
+      return if LitCLI.filter_type? type
+
+      LitCLI.render(message, status, type, context)
+
       LitCLI.step()
+      yield if block_given?
+
       LitCLI.delay()
     end
   end
   alias 🔥 lit
 
-  def self.render(type)
-    type_config = @@config.types[type]
+  def self.render(message, status, type, context)
+    text = "🔥"
 
-    time_text = LitCLI.colorize(Time.now().strftime("%k:%M"), :cyan)
-    type_text = type_config[:icon] + " " + type.to_s
-    type_text_color = LitCLI.colorize(type_text, type_config[:color])
+    # Time.
+    time = LitCLI.format(Time.now().strftime("%k:%M"), color: :cyan)
+    text << " #{time}"
 
-    message = "🔥 #{time_text} #{type_text_color} #{message}"
+    # Status.
+    config = @@config.statuses[status]
+    text << LitCLI.format(" #{config[:icon]} #{status.to_s}", config)
+
+    # Type.
+    if !@@config.types.nil? && @@config.types.has_key?(type)
+      config = @@config.types[type]
+      if config.has_key? :icon
+        text << LitCLI.format(" #{config[:icon]} #{type.to_s}", config)
+      else
+        text << LitCLI.format(" #{type.to_s}", config)
+      end
+    end
 
-    puts message
+    # Context.
+    text << LitCLI.format(" #{context}", styles: [:bold, :dim])
+
+    # Message.
+    text << " #{message}"
+
+    puts text
   end
 
   def self.step()
@@ -39,7 +62,15 @@ module LitCLI
     end
   end
 
-  def self.filter? type
+  def self.filter_status? status
+    unless @@config.status.nil? || @@config.status.include?(status)
+      return true
+    end
+
+    false
+  end
+
+  def self.filter_type? type
     unless @@config.type.nil? || @@config.type.include?(type)
       return true
     end
@@ -57,23 +88,61 @@ module LitCLI
     @@config.step && @@is_prying
   end
 
-  def self.colorize(text, color)
-    case color
-    when :blue
-      return @@pastel.bright_blue(text)
-    when :green
-      return @@pastel.green(text)
-    when :yellow
-      return @@pastel.yellow(text)
-    when :red
-      return @@pastel.red(text)
-    when :purple, :magenta
-      return @@pastel.magenta(text)
-    when :cyan
-      return @@pastel.cyan(text)
-    else
-      return text
+  def self.format(text, config)
+
+    if config.has_key? :styles
+      # Change characters first.
+      config[:styles].each do |style|
+        case style
+        when :upcase
+          text = text.upcase
+        when :downcase
+          text = text.downcase
+        when :capitalize
+          text = text.capitalize
+        end
+      end
+      # Then apply styling.
+      config[:styles].each do |style|
+        case style
+        when :clear
+          text = @@pastel.clear(text)
+        when :bold
+          text = @@pastel.bold(text)
+        when :dim
+          text = @@pastel.dim(text)
+        when :italic
+          text = @@pastel.italic(text)
+        when :underline
+          text = @@pastel.underline(text)
+        when :inverse
+          text = @@pastel.inverse(text)
+        when :hidden
+          text = @@pastel.hidden(text)
+        when :strike, :strikethrough
+          text = @@pastel.strikethrough(text)
+        end
+      end
+    end
+
+    if config.has_key? :color
+      case config[:color]
+      when :blue
+        text = @@pastel.bright_blue(text)
+      when :green
+        text = @@pastel.green(text)
+      when :yellow
+        text = @@pastel.yellow(text)
+      when :red
+        text = @@pastel.red(text)
+      when :purple, :magenta
+        text = @@pastel.magenta(text)
+      when :cyan
+        text = @@pastel.cyan(text)
+      end
     end
+
+    text
   end
 
   # Override config from application.

data/lib/lit_pry.rb

@@ -1,68 +1,111 @@
 # Only override kernel methods when Lit's @step flag is true.
 if ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
+  require 'set'
+
+  # TODO: Investigate RubyGems `require` before overriding.
+  # SEE: https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems/core_ext/kernel_require.rb
+
   module Kernel
 
-    def require_relative relative_path
-      filename = relative_path
+    @@lit_processed_paths = Set.new
 
-      # Get directory of the file that called this file.
-      absolute_path = caller_locations.first.absolute_path.split('/')
-      absolute_path.pop
+    def require_relative relative_path, current_directory = nil
+      return false if relative_path.nil?
 
-      # When relative path is current directory.
-      if relative_path.start_with?('./')
-        filename = relative_path.delete_prefix! './'
-      end
+      # Handle absolute path.
+      if relative_path.start_with?('/') && File.exist?(relative_path)
+        absolute_path = relative_path.split('/')
+        file_name = absolute_path.pop
+      # Handle relative path.
+      else
+        # Get directory of the file that called this file.
+        if current_directory.nil?
+          absolute_path = caller_locations.first.absolute_path.split('/')
+          absolute_path.pop
+        else
+          absolute_path = current_directory.split('/')
+        end
+
+        # When path is current directory.
+        if relative_path.start_with?('./')
+          relative_path.delete_prefix! './'
+        end
+
+        # When path is parent directory.
+        while relative_path.start_with?('../')
+          relative_path.delete_prefix! '../'
+          absolute_path.pop
+        end
+
+        # When path contains child directories.
+        if relative_path.split('/').count > 1
+          # Add child directories to absolute path and remove from relative path.
+          child_path = relative_path.split('/')
+          relative_path = child_path.pop
+          child_path.each do |dir|
+            absolute_path << dir
+          end
+        end
 
-      # When relative path is parent directory.
-      while relative_path.start_with?('../')
-        relative_path.delete_prefix! '../'
-        absolute_path.pop
+        file_name = relative_path
       end
 
       # Append default extension.
-      unless filename.end_with? '.rb'
-        filename << '.rb'
+      unless file_name.end_with? '.rb'
+        file_name << '.rb'
       end
 
-      filepath = File.join(absolute_path.join('/'), relative_path)
+      file_path = File.join(absolute_path.join('/'), file_name)
 
-      # Add pry binding beneath each lit message.
-      new_lines = ''
-      File.foreach(filepath) do |line|
-        new_lines << line
-        if line.strip.start_with? 'lit "'
-          new_lines << "binding.pry if LitCLI.is_prying?\n"
-          new_lines << "@@is_prying = false\n"
+      unless @@lit_processed_paths.include? file_path
+        @@lit_processed_paths.add file_path
+
+        new_lines = ''
+        line_count = 0
+        new_lines_count = 0
+
+        File.foreach(file_path) do |line|
+          line_count = line_count + 1
+
+          # Pass current directory into the next file's requires.
+          if line.strip.start_with? 'require_relative '
+            line = line.strip + ", '#{absolute_path.join('/')}'\n"
+            new_lines << line
+          # Add pry binding on each lit method.
+          elsif lit_line = Kernel.add_lit_binding(line)
+            new_lines << lit_line
+          else
+            new_lines << line
+          end
         end
+
+        eval(new_lines, get_binding(__dir__ = absolute_path), file_path)
+
+        return true
+      # Path has already been required.
+      else
+        return false
       end
+    end
 
-      eval(new_lines)
+    def get_binding(__dir__)
+      # Don't go to this binding when Pry session activated.
+      # The variables have already been evaluated by eval(). NEEDS CONFIRMATION.
+      # Setting file_path in eval() negates this fix but will keep just in case.
+      return binding unless LitCLI.is_prying?
     end
 
-    # TODO: Investigate RubyGems `require` before overriding.
-    # def require path
-    #   absolute_path = File.join(Dir.pwd, path)
-    #   #p "requiring #{absolute_path}"
-    #   #p __dir__
-    #   #p File.dirname(File.realpath(__FILE__))
-    #   #p File.realpath(__FILE__)
-    #
-    #   # Split client-side and server-side code.
-    #   new_lines = []
-    #   binding_line = "binding.pry if LitCLI.is_prying?"
-    #
-    #   # Add pry binding beneath each lit message.
-    #   p path
-    #   File.foreach(path) do |line|
-    #     new_lines << line
-    #     if line.strip.start_with? 'lit "'
-    #       new_lines << binding_line
-    #     end
-    #   end
-    #
-    #   eval(new_lines.join)
-    # end
+    def self.add_lit_binding(line)
+      block = "{ binding.pry if LitCLI.is_prying?; @@is_prying = false }"
 
+      ['lit ', 'lit(', '🔥 ', '🔥(', '🔥'].each do |needle|
+        if line.strip.start_with? needle
+          args = line.strip.delete_prefix(needle).delete_suffix(")").chomp
+          return "lit(#{args}) #{block} \n"
+        end
+      end
+
+      false
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lit-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Maedi Prichard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel