lit-cli 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 839f03037b67dd56c7b7d4c38ba26138082594823cc32dbc7217c78363d34088
-  data.tar.gz: 3ab13437fcb2e6884ccd9465d85c72c0f3f7623b2e4076cd21ea22ba369a160b
+  metadata.gz: 39a417c815a30ecdf0e99aaa9aa47d22b4def3f2d891f6da1911414a7187a86b
+  data.tar.gz: 5bb7af898274544027202aedb33d9428401044867ad0693ae6314b1c361c9418
 SHA512:
-  metadata.gz: 97d737397a07cfd123166f9c233757e0db4606072c75f22235c85d421474bc05bf94ef2ec8e216420b3c1cca9aecd1615c9ad20ade4b76ee6dde3770d36ba89f
-  data.tar.gz: 7e832c959dd947b99609f2e0ff8e30bb45a8f117b13a617a4671bb4236ee6a1a455f595b8eb35d9d682bc06abe9411e336b2f82553e328cd574215481b565770
+  metadata.gz: 1b45c6ae31e1db4cf3ac3fd338e8a11df273618cd8aa8b7d870d3764c9ae86b472b5823504fec11956c33fcc7fe0ca044db544e6c872f167a9db7bbfeaf881b5
+  data.tar.gz: 47a8560f08cbd269877dcd1a6bd14b718a684b190991b80b439602fe766b15f84bc1c44826aafed8416277e2fb425f66d35d447f32676cacdc8d9ef4fa31a8a0

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

data/lib/lit_pry.rb

@@ -1,70 +1,96 @@
 # 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 relative path is parent directory.
-      while relative_path.start_with?('../')
-        relative_path.delete_prefix! '../'
-        absolute_path.pop
+        # 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
+
+        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)
+
+      unless @@lit_processed_paths.include? file_path
+        @@lit_processed_paths.add file_path
+
+        new_lines = ''
+        File.foreach(file_path) do |line|
+
+          # 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
+          else
+            new_lines << line
+          end
 
-      # 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"
+          # 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
-      end
 
-      eval(new_lines)
+        eval(new_lines, get_binding(__dir__ = absolute_path), file_path)
+        return true
+      # Path has already been required.
+      else
+        return false
+      end
     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 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
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Maedi Prichard