lit-cli 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39a417c815a30ecdf0e99aaa9aa47d22b4def3f2d891f6da1911414a7187a86b
-  data.tar.gz: 5bb7af898274544027202aedb33d9428401044867ad0693ae6314b1c361c9418
+  metadata.gz: d7d27ec65b3d6ead4109e2ec4509c30ad071645bb2f0cac4b8e9fd0ee27e1e2e
+  data.tar.gz: efd72529bd96e50d8e286ab9cf3fe610e6077728282a15bd640c5195d15a8562
 SHA512:
-  metadata.gz: 1b45c6ae31e1db4cf3ac3fd338e8a11df273618cd8aa8b7d870d3764c9ae86b472b5823504fec11956c33fcc7fe0ca044db544e6c872f167a9db7bbfeaf881b5
-  data.tar.gz: 47a8560f08cbd269877dcd1a6bd14b718a684b190991b80b439602fe766b15f84bc1c44826aafed8416277e2fb425f66d35d447f32676cacdc8d9ef4fa31a8a0
+  metadata.gz: c5ab9a686068313a84c120a354303ccdc2d9d24db4e6eafaf0ea45c9adedf8b59952b0503f52268b5765b45a5bb1f0bc0800d0b199d770a3f87b9c90e4d1b700
+  data.tar.gz: 548cb66165d4f9b9b396dbd7e2d554008d7450d2bafadfdb13a8fe19b61b104bf80428d1ae3c90120bc368bf8ce4d84484594237f82929bd37f8712797c7fe71

data/bin/lit

@@ -8,7 +8,7 @@
 #   lit rails server
 ################################################################################
 
-ENV['LIT_ENABLED'] = 'true'
+ENV['LIT_ENABLED'] = Time.now.to_i.to_s
 
 # Get flags from arguments.
 args = []

data/lib/config.rb

@@ -53,9 +53,6 @@ module LitCLI
       # Flag defaults when not supplied via command line.
       ##
 
-      # 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
 
@@ -65,12 +62,23 @@ module LitCLI
       # Integer or float representing amount of seconds to delay each lit() by.
       @delay = 0
 
+      ##
+      # PRIVATE.
+      ##
+
+      # Boolean on whether or not to step through each lit() breakpoint.
+      # Setting to true here wont enable Pry, best to enable via command line.
+      @step = false
+
       cli_configure()
     end
 
     # Override config from command line.
     def cli_configure()
-      @enabled = true if ENV['LIT_ENABLED'] == 'true'
+
+      # Enable lit via the command line.
+      @enabled = true if ENV['LIT_ENABLED'] && ENV['LIT_ENABLED'].to_i >= (Time.now.to_i() - 1)
+      return unless @enabled
 
       # Convert flag string to hash.
       flags = {}

data/lib/lit_cli.rb

@@ -12,46 +12,77 @@ module LitCLI
     if @@config.enabled
       return if LitCLI.filter_status? status
       return if LitCLI.filter_type? type
-      LitCLI.render(message, status, type, context)
-      LitCLI.step()
+
+      indent = LitCLI.render(message, status, type, context)
+
+      LitCLI.step(indent)
+      yield if block_given?
+
       LitCLI.delay()
     end
   end
   alias 🔥 lit
 
   def self.render(message, status, type, context)
-    text = "🔥"
+    output = "🔥"
 
     # Time.
     time = LitCLI.format(Time.now().strftime("%k:%M"), color: :cyan)
-    text << " #{time}"
+    output << " #{time}"
 
     # Status.
     config = @@config.statuses[status]
-    text << LitCLI.format(" #{config[:icon]} #{status.to_s}", config)
+    output << 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)
+        output << LitCLI.format(" #{config[:icon]} #{type.to_s}", config)
       else
-        text << LitCLI.format(" #{type.to_s}", config)
+        output << LitCLI.format(" #{type.to_s}", config)
       end
     end
 
     # Context.
-    text << LitCLI.format(" #{context}", styles: [:bold, :dim])
+    output << LitCLI.format(" #{context}", styles: [:bold, :dim])
+
+    # Line break.
+    while message.start_with?('^')
+      message.delete_prefix!('^').strip!
+      unless @@config.status || @@config.type
+        output = "\n" + output
+      end
+    end
+
+    # Indent.
+    indent = ''
+    while message.start_with?('>')
+      message.delete_prefix!('>').strip!
+      unless @@config.status || @@config.type
+        indent = indent + '  '
+        output = '  ' + output
+      end
+    end
+
+    # Highlight numbers and methods.
+    words = []
+    message.split(/(#\d+|\w+\(\))/).each do |word|
+      if word.start_with?('#') || word.end_with?(')')
+        words << @@pastel.yellow(word)
+      else
+        words << word
+      end
+    end
 
-    # Message.
-    text << " #{message}"
+    puts output << " " + words.join()
 
-    puts text
+    return indent
   end
 
-  def self.step()
+  def self.step(indent)
     if @@config.step
-      puts "🔥 Press ENTER to step or P to Pry:"
+      puts "#{indent}🔥 Press ENTER to step or P to Pry:"
       input = gets.chomp
       binding while input == nil
       @@is_prying = true if input.downcase == "p"
@@ -145,7 +176,7 @@ module LitCLI
   def self.configure()
     yield(@@config)
 
-    # Override config from command line.
+    # Override config from flags on command line.
     @@config.cli_configure()
   end
 

data/lib/lit_pry.rb

@@ -1,5 +1,5 @@
 # Only override kernel methods when Lit's @step flag is true.
-if ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
+if ENV['LIT_ENABLED'] && ENV['LIT_ENABLED'].to_i >= (Time.now.to_i() - 1) && ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
   require 'set'
 
   # TODO: Investigate RubyGems `require` before overriding.
@@ -61,24 +61,26 @@ if ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
         @@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
-
-          # Add pry binding beneath each lit message.
-          if line.strip.start_with? 'lit "'
-            new_lines << "binding.pry if LitCLI.is_prying?\n"
-            new_lines << "@@is_prying = false\n"
-          end
         end
 
         eval(new_lines, get_binding(__dir__ = absolute_path), file_path)
+
         return true
       # Path has already been required.
       else
@@ -92,5 +94,16 @@ if ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
       # Setting file_path in eval() negates this fix but will keep just in case.
       return binding unless LitCLI.is_prying?
     end
+
+    def self.add_lit_binding(line)
+      ['lit ', 'lit(', '🔥 ', '🔥(', '🔥'].each do |needle|
+        if line.strip.start_with? needle
+          args = line.strip.delete_prefix(needle).delete_suffix(")").chomp
+          return "lit(#{args}) { binding.pry if LitCLI.is_prying?; @@is_prying = false } \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.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Maedi Prichard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel