lit-cli 0.6.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 865eec42e3e343a9432bc24ee852290159545a83c0d80c835555d3a7de965355
-  data.tar.gz: ca99ccd747ac4091e93d1e703183ea63f122ed46b6883bd24588ad0c6ccdf809
+  metadata.gz: 1bff5862a0ee594b96b966d6ad15ef676d05596d482d24fdc8a306a56c3da7fb
+  data.tar.gz: 1c9f6b6abbab643a39240b2eb8ce683ed837d61a3ca8566f35503ace57d9dbe5
 SHA512:
-  metadata.gz: 64c4afe108dfadbdf6690963a1fb891ecf9dcf4bfd28402087cbeeafc37796e00d9564ce9d436139a1832af211330a61f428d15d5bb07add496347584245191e
-  data.tar.gz: dee1223cefa077ce2b38cf060169ad1bb882b9fec8aac7a42e76834a77fc2a8b6c53d30a62b6695750388742bca48633b59d4656fac1c3dbe563e1e1e2e46d41
+  metadata.gz: addedd58a2dfe45a83b19597441735848a9014b9c379ce0864116bf2adfb325f0748d0d3733d5c6df6ca6a5d8731bb91bc86eed887d32ecc001270e64bc9268c
+  data.tar.gz: 03637e11d55ac63c0fe89d28355ce34cdda0159790069a59e8c2039bd803f83771d17cdf6a1b4e3eaa0da8c37d8b18aa65254184e449fbe3749661fb874953bb

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

@@ -13,9 +13,9 @@ module LitCLI
       return if LitCLI.filter_status? status
       return if LitCLI.filter_type? type
 
-      LitCLI.render(message, status, type, context)
+      indent = LitCLI.render(message, status, type, context)
 
-      LitCLI.step()
+      LitCLI.step(indent)
       yield if block_given?
 
       LitCLI.delay()
@@ -24,41 +24,71 @@ module LitCLI
   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])
 
-    # Message.
-    text << " #{message}"
+    # 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
 
-    puts text
+    # 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
+
+    puts output << " " + words.join()
+
+    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"
+      if input.downcase == "p"
+        puts @@pastel.dim("Enter X to exit Pry or !!! to exit program.")
+        @@is_prying = true
+      end
     end
   end
 
@@ -149,7 +179,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.
@@ -60,7 +60,6 @@ if ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
       unless @@lit_processed_paths.include? file_path
         @@lit_processed_paths.add file_path
 
-        binding = "{ binding.pry if LitCLI.is_prying?; @@is_prying = false }"
         new_lines = ''
         line_count = 0
         new_lines_count = 0
@@ -72,14 +71,11 @@ if ENV['LIT_FLAGS'] && ENV['LIT_FLAGS'].include?('step')
           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
-            # Add pry binding beneath each lit message.
-            if line.strip.start_with? 'lit '
-              lit_args = line.strip.delete_prefix('lit ').delete_suffix("\n")
-              new_lines << "lit(#{lit_args}) #{binding} \n"
-            else
-              new_lines << line
-            end
+            new_lines << line
           end
         end
 
@@ -98,5 +94,30 @@ 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
+
+##
+# Add custom Pry command for a nicer exiting experience.
+# @see https://github.com/pry/pry/wiki/Custom-commands
+##
+command_description = "Alias for `exit`"
+
+Pry::Commands.block_command "x", command_description do
+  run "exit"
+end
+
+Pry::Commands.block_command "X", command_description do
+  run "exit"
+end

metadata

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