lit-cli 0.5.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d016a1786059f76f691d0dd55ab4a8d2e408f4b2ee5bca3d8e42ea29012d379
-  data.tar.gz: 5f0756f25977560051e7b07b86ae795584e954fa14eeb4533f56505c60d9cdfd
+  metadata.gz: 6f467ef2808f341c61ebfa6ae5cbe7cbe354c4e9d2068aa8de96ee0e4b69175e
+  data.tar.gz: 36cbff3ecfa9c4585e6a1fed552bbdc35f2ef7d8ef51890439dd333049cb9008
 SHA512:
-  metadata.gz: b902f2d26e1b868be3026783a2f99e10a34ca1be0851cd73b5c16c2a4ef23fad146b5f9f51ddaca41975b249833c6f382cd47468f21ef6c2ecfa1638a9a2382e
-  data.tar.gz: 01c08ebe1937ed4d31240aed5bcda06c4d5f85b9d6c28c23ca21b939e547e6267fc7e6248d7f3d14972bd5e9b1ea27dc74df5c38fd3d39f2aaa0a09e5340fef2
+  metadata.gz: caa0776bab81bc74a9c166e966f4fe12eabcd291e7147b036a6893520d083a0b1e2addde2ac76d3ff965f6cca629b6b2372ee154b47861c08cacf714bdae512d
+  data.tar.gz: 9204b7bdec4d2365fc5b17d513df0cbea56d4051a59baa8e3182b22b0e07d7c7658b45cf18ed0d12b2cf1bfab207ecc6d8176a6a4d8ab190447df979cc759ab7

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

@@ -33,12 +33,12 @@ module LitCLI
     def initialize()
 
       @statuses = {
-        :info => { icon: "ℹ", color: :blue },
-        :pass => { icon: "✔", color: :green },
-        :warn => { icon: "⚠", color: :yellow },
-        :fail => { icon: "⨯", color: :red },
-        :error => { icon: "!", color: :red },
-        :debug => { icon: "?", color: :purple },
+        :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
@@ -70,7 +70,10 @@ module LitCLI
 
     # 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'] == Time.now.to_i.to_s
+      return unless @enabled
 
       # Convert flag string to hash.
       flags = {}

data/lib/lit_cli.rb

@@ -8,18 +8,22 @@ module LitCLI
   @@config = Config.new
   @@is_prying = false
 
-  def lit(message, status = :info, type = nil)
+  def lit(message, status = :info, type = nil, context = nil)
     if @@config.enabled
       return if LitCLI.filter_status? status
       return if LitCLI.filter_type? type
-      LitCLI.render(message, status, type)
+
+      LitCLI.render(message, status, type, context)
+
       LitCLI.step()
+      yield if block_given?
+
       LitCLI.delay()
     end
   end
   alias 🔥 lit
 
-  def self.render(message, status, type)
+  def self.render(message, status, type, context)
     text = "🔥"
 
     # Time.
@@ -40,6 +44,9 @@ module LitCLI
       end
     end
 
+    # Context.
+    text << LitCLI.format(" #{context}", styles: [:bold, :dim])
+
     # Message.
     text << " #{message}"
 
@@ -91,6 +98,8 @@ module LitCLI
           text = text.upcase
         when :downcase
           text = text.downcase
+        when :capitalize
+          text = text.capitalize
         end
       end
       # Then apply styling.
@@ -140,7 +149,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,70 +1,109 @@
 # 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.
-    # SEE: https://github.com/ruby/ruby/blob/v2_6_3/lib/rubygems/core_ext/kernel_require.rb
-    #
-    # 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)
+      ['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.5.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Maedi Prichard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel