mdless 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4bb4133ae1d8d4e3607f02a75c8ef92edb6ca92
-  data.tar.gz: 3104daadc69c2dd78978247eb3bee0d607884a9f
+  metadata.gz: 618302eecf35ed202db845ca4ddd45fcb6f7df8c
+  data.tar.gz: 9413e7e0106c478d120d475efd4d62bde3075d29
 SHA512:
-  metadata.gz: fd92f5704dedca5c71a0571bcf34080cc0c122c888a4b3e65f20ae13bc353428a85a688ec07915ce699609cb6e6fec79fcb93b8c1d893cef388e2e4482febc71
-  data.tar.gz: 705a61c4a88dee79316c5cc61bb24a99ccfaed0c31d367092f4098768f96a1d2c6bdadbb4f022b8fdfbdf6450ede5833ff26458c1970f182afa128f431a293ef
+  metadata.gz: dba40280383d15349c27b69c91cb536ec2f63cdb787cba3da251738957a41e4e3b2a7a38bdf25d333d5cb452042e4d9b8516fe8983a8f17a0f31bd9151fa0ece
+  data.tar.gz: ecdd1dbdf0b44d29d4c34e74435ca38da3861c92df9d634ac2f90144f806c26313f46bf84cfe4fe51a6254479b26f062421c104825c806690a05fe07dbcc3928

data/README.md

@@ -18,7 +18,7 @@ I often use iTerm2 in visor mode, so `qlmanage -p` is annoying. I still wanted a
 - Inline image display (local, optionally remote) if using iTerm2 2.9+
 - Syntax highlighting when `pygmentize` is available
 - List headlines in document
-- Display section of the document via headline search
+- Display single section of the document based on headlines
 
 ## Installation
 
@@ -41,7 +41,7 @@ The pager used is determined by system configuration in this order of preference
 ### Options
 
     -s, --section=TITLE              Output only a headline-based section of 
-                                     the input
+                                     the input (numeric based on --list output)
     -w, --width=COLUMNS              Column width to format for (default terminal width)
     -p, --[no-]pager                 Formatted output to pager (default on)
     -P                               Disable pager (same as --no-pager)

data/lib/mdless/converter.rb

@@ -17,8 +17,8 @@ module CLIMarkdown
         opts.banner = "#{version} by Brett Terpstra\n\n> Usage: #{CLIMarkdown::EXECUTABLE_NAME} [options] path\n\n"
 
         @options[:section] = nil
-        opts.on( '-s', '--section=TITLE', 'Output only a headline-based section of the input' ) do |section|
-          @options[:section] = section
+        opts.on( '-s', '--section=TITLE', 'Output only a headline-based section of the input (numeric from -l)' ) do |section|
+          @options[:section] = section.to_i
         end
 
         @options[:width] = %x{tput cols}.strip.to_i
@@ -95,6 +95,7 @@ module CLIMarkdown
 
       @cols = @options[:width]
       @output = ''
+      @header_arr = []
 
       input = ''
       @ref_links = {}
@@ -138,6 +139,14 @@ module CLIMarkdown
       end
     end
 
+    def get_headers(input)
+      unless @headers && @headers.length > 0
+        @headers = input.scan(/^(#+)\s*(.*?)( #+)?\s*$/)
+      end
+      @headers
+    end
+
+
     def list_headers(input)
       h_adjust = highest_header(input) - 1
       input.gsub!(/^(#+)/) do |m|
@@ -150,35 +159,36 @@ module CLIMarkdown
         end
       end
 
-      headers = []
+      @headers = get_headers(input)
       last_level = 0
-      input.split(/\n/).each do |line|
-        if line =~ /^(#+)\s*(.*?)( #+)?\s*$/
-          level = $1.size - 1
-          title = $2
+      headers_out = []
+      @headers.each_with_index do |h,idx|
 
-          if level - 1 > last_level
-            level = last_level + 1
-          end
-          last_level = level
-
-          subdoc = case level
-          when 0
-            '  '
-          when 1
-            '- '
-          when 2
-            '+ '
-          when 3
-            '* '
-          else
-            '  '
-          end
-          headers.push(("  "*level) + (c([:x, :yellow]) + subdoc + title.strip + xc))
+        level = h[0].length - 1
+        title = h[1]
+
+        if level - 1 > last_level
+          level = last_level + 1
         end
+        last_level = level
+
+        subdoc = case level
+        when 0
+          ''
+        when 1
+          '- '
+        when 2
+          '+ '
+        when 3
+          '* '
+        else
+          '  '
+        end
+        line_no = '%2d: ' % (idx + 1)
+        headers_out.push(%Q{#{line_no}#{c([:x, :black])}#{".."*level}#{c([:x, :yellow])}#{subdoc}#{title.strip}#{xc}}.strip)
       end
 
-      @output += headers.join("\n")
+      @output += headers_out.join("\n")
     end
 
     def highest_header(input)
@@ -298,7 +308,7 @@ module CLIMarkdown
     end
 
     def convert_markdown(input)
-
+      @headers = get_headers(input)
       # yaml/MMD headers
       in_yaml = false
       if input.split("\n")[0] =~ /(?i-m)^---[ \t]*?(\n|$)/
@@ -364,14 +374,15 @@ module CLIMarkdown
             title = $2
 
             if in_section
-              if level > top_level
+              if level >= top_level
                 new_content.push(graf)
               else
+                in_section = false
                 break
               end
-            elsif title.downcase =~ /#{@options[:section]}/i
+            elsif title.downcase == "#{@headers[@options[:section] - 1][1].downcase}"
               in_section = true
-              top_level = level
+              top_level = level + 1
               new_content.push(graf)
             else
               next
@@ -669,7 +680,7 @@ module CLIMarkdown
       if File.exists?(File.expand_path(cli))
         File.executable?(File.expand_path(cli))
       else
-        system "which #{cli} &> /dev/null"
+        system "which #{cli}", :out => File::NULL
       end
     end
 
@@ -735,7 +746,11 @@ module CLIMarkdown
                 'less', 'more', 'cat', 'pager']
       pagers.select! do |f|
         if f
-          system "which #{f} &> /dev/null"
+          if f.strip =~ /[ |]/
+            f
+          else
+          system "which #{f}", :out => File::NULL
+          end
         else
           false
         end

data/lib/mdless/version.rb

@@ -1,3 +1,3 @@
 module CLIMarkdown
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: mdless
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: A CLI that provides a formatted and highlighted view of Markdown files
@@ -80,29 +80,29 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - mdless
-- --main
+- "--main"
 - README.md
-- --markup
+- "--markup"
 - markdown
-- -ri
+- "-ri"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A pager like less, but for Markdown files