mdless 2.0.17 → 2.0.19

data/lib/mdless/taskpaper.rb

@@ -3,7 +3,7 @@
 module CLIMarkdown
   module TaskPaper
     TASK_RX = /^(?<indent>(?:    |\t)*?)(?<marker>-)(?<task>\s+\S.*?)$/
-    PROJECT_RX = /^(?<indent>(?:    |\t)*?)(?<project>[^- \t].*?:)(?<tags> @\S+)*$/
+    PROJECT_RX = /^(?<indent>(?:    |\t)*?)(?<project>[^- \t].*?:)(?<tags> +@\S+)*$/
     NOTE_RX = /^(?<indent>(?:    |\t)+)(?<note>(?<!- ).*?(?!:))$/
 
     class << self
@@ -13,8 +13,8 @@ module CLIMarkdown
       def color(key)
         val = nil
         keys = key.split(/[ ,>]/)
-        if @theme.key?(keys[0])
-          val = @theme[keys.shift]
+        if MDLess.theme.key?(keys[0])
+          val = MDLess.theme[keys.shift]
         else
           @log.error("Invalid theme key: #{key}") unless keys[0] =~ /^text/
           return c([:reset])
@@ -36,25 +36,95 @@ module CLIMarkdown
         end
       end
 
+      def remove_meta(input)
+        first_line = input.split("\n").first
+        if first_line =~ /(?i-m)^---[ \t]*?$/
+          input.sub!(/(?im)^---[ \t]*\n([\s\S]*?)\n[-.]{3}[ \t]*\n/, '')
+        elsif first_line =~ /(?i-m)^[\w ]+:\s+\S+/
+          input.sub!(/(?im)^([\S ]+:[\s\S]*?)+(?=\n\n)/, '')
+        end
+        input
+      end
+
       def is_taskpaper?(input)
-        projects = input.split(PROJECT_RX)
+        return true if MDLess.file =~ /\.taskpaper$/
+
+        projects = sections(input)
+
         tasks = 0
         if projects.count > 1
-          projects.each do |proj|
-            tasks += proj.scan(TASK_RX).count
+          projects.each do |proj, content|
+            tasks += content['content'].scan(TASK_RX).count
           end
         end
 
-        tasks >= 6
+        if tasks >= 6
+          return true
+        else
+          tst = remove_meta(input)
+          tst = tst.gsub(PROJECT_RX, '')
+          tst = tst.gsub(TASK_RX, '')
+          tst = tst.gsub(/^ *\n$/, '')
+          return tst.strip.length == 0
+        end
+      end
+
+      def section(input, string)
+        sects = sections(input)
+        sects_to_s(sects.filter { |k, _| k.downcase =~ string.downcase.to_rx })
+      end
+
+      def sects_to_s(sects)
+        sects.map do |k, v|
+          "#{k}#{v['content']}"
+        end.join("\n")
+      end
+
+      def indent(input, idnt)
+        input.split(/\n/).map do |line|
+          line.sub(/^#{idnt}/, '')
+        end.join("\n")
+      end
+
+      def sections(input)
+        heirarchy = {}
+        sects = input.to_enum(:scan, /(?mix)
+                                      (?<=\n|\A)(?<indent>(?:    |\t)*?)
+                                      (?<project>[^- \t\n].*?:)\s*(?=\n)
+                                      (?<content>.*?)
+                                      (?=\n\k<indent>\S.*?:|\Z)$/).map { Regexp.last_match }
+        sects.each do |sect|
+          heirarchy[sect['project']] = {}
+          heirarchy[sect['project']]['content'] = indent(sect['content'], sect['indent'])
+          heirarchy = heirarchy.merge(sections(sect['content']))
+        end
+
+        heirarchy
       end
 
-      def highlight(input, theme)
-        @theme = theme
+      def list_projects(input)
+        projects = input.to_enum(:scan, PROJECT_RX).map { Regexp.last_match }
+        projects.delete_if { |proj| proj['project'] =~ /^[ \n]*$/ }
+        projects.map! { |proj| "#{color('taskpaper marker')}#{proj['indent']}- #{color('taskpaper project')}#{proj['project'].sub(/:$/, '')}" }
+        projects.join("\n")
+      end
+
+      def highlight(input)
         mc = color('taskpaper marker')
         tc = color('taskpaper task')
         pc = color('taskpaper project')
         nc = color('taskpaper note')
 
+        if MDLess.options[:section]
+          matches = []
+          MDLess.options[:section].each do |sect|
+            matches << section(input, sect)
+          end
+          input = matches.join("\n")
+        end
+
+        input.gsub!(/\t/, '    ')
+
         input.gsub!(PROJECT_RX) do
           m = Regexp.last_match
           "#{m['indent']}#{pc}#{m['project']}#{m['tags']}"

data/lib/mdless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CLIMarkdown
-  VERSION = '2.0.17'
+  VERSION = '2.0.19'
 end

data/lib/mdless.rb

@@ -4,11 +4,13 @@ require 'open3'
 require 'fileutils'
 require 'logger'
 require 'tty-which'
+require 'tty-screen'
 require 'mdless/version.rb'
 require 'mdless/colors'
 require 'mdless/tables'
 require 'mdless/hash'
 require 'mdless/string'
+require 'mdless/array'
 require 'mdless/taskpaper'
 require 'mdless/theme'
 require 'redcarpet'
@@ -18,3 +20,47 @@ require 'mdless/converter'
 module CLIMarkdown
   EXECUTABLE_NAME = 'mdless'
 end
+
+module MDLess
+  class << self
+    include CLIMarkdown::Theme
+    attr_accessor :options, :cols, :file
+
+    def log
+      @log ||= Logger.new($stderr)
+    end
+
+    def log_level(level)
+      @log.level = level
+    end
+
+    def theme
+      @theme ||= load_theme(@options[:theme])
+    end
+
+    def pygments_styles
+      @pygments_styles ||= read_pygments_styles
+    end
+
+    def pygments_lexers
+      @pygments_lexers ||= read_pygments_lexers
+    end
+
+    def read_pygments_styles
+      MDLess.log.info 'Reading Pygments styles'
+      pyg = TTY::Which.which('pygmentize')
+      res = `#{pyg} -L styles`
+      res.scan(/\* ([\w-]+):/).map { |l| l[0] }
+    end
+
+    def read_pygments_lexers
+      MDLess.log.info 'Reading Pygments lexers'
+      pyg = TTY::Which.which('pygmentize')
+      res = `#{pyg} -L lexers`
+      lexers = res.scan(/\* ([\w-]+(?:, [\w-]+)*):/).map { |l| l[0] }
+      lexers_a = []
+      lexers.each { |l| lexers_a.concat(l.split(/, /)) }
+      lexers_a
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.19
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-26 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +92,7 @@ files:
 - README.md
 - bin/mdless
 - lib/mdless.rb
+- lib/mdless/array.rb
 - lib/mdless/colors.rb
 - lib/mdless/console.rb
 - lib/mdless/converter.rb