helpline 0.1.14 → 0.2.1

data/keydef.zsh

@@ -2,7 +2,7 @@
 # Ctrl-Jでhelplineを呼ぶようにする
 #
 function run-help() {
-    /usr/local/bin/helpline "${BUFFER}" < $TTY
+    helpline "${BUFFER}" < $TTY
     BUFFER=$(cat /tmp/helpline.cmd)
     CURSOR=${#BUFFER}
     zle redisplay

data/lib/helpline/curses.rb

@@ -105,5 +105,12 @@ class Curses
     @x += s.length
   end
 
+  def Curses.print_bold(s)
+    print "\e[0m"
+    print "\e[1m"
+    print s
+    print "\e[0m"
+    @x += s.length
+  end
 end
   

data/lib/helpline/generate.rb

@@ -0,0 +1,76 @@
+# -*- ruby -*-
+#
+# * datafileを読み、引数とマッチするものをリストする
+#   引数はARGVに入っている
+#
+
+require 'json'
+require 're_expand'
+
+class HelpLine
+  def generate(query,debug=nil)
+    data = JSON.parse(File.read(datafile))
+
+    #
+    # 関数定義などをeval
+    #
+    data['codes'].each { |code|
+      eval code
+    }
+
+    g = ExpandRuby::Generator.new # re_expandのジェネレータ
+
+    #
+    # HelpLineエントリ
+    #
+
+    logfile = (debug ? "/tmp/helpline-defs" : "/dev/null")
+    File.open(logfile,"w"){ |f|  # ログを残す場合
+      entries = []
+      data['defs'].each { |line|
+        if line =~ /^[\$\?]\s*(.*)$/ # $....
+          entries << $1
+        elsif line =~ /^\%\s*(.*)$/ # %....
+          cmd = $1
+          entries.each { |l|
+            desc = eval('"' + l + '"')
+            f.puts "desc: #{desc}"
+            g.add desc.force_encoding('utf-8'), cmd.force_encoding('utf-8')
+          }
+          f.puts "cmd:  #{cmd}"
+          entries = []
+        end
+      }
+    }
+
+    res = g.generate query
+
+    File.open("/tmp/helpline.cmd","w"){ |f|
+      f.puts ARGV.join(' ')
+    }
+    
+    if res[0].length == 0
+      puts "ヘルプがみつかりません"
+      exit
+    end
+
+    git_repository = File.exist?(".git")
+    listed = {}
+    list = res[0].find_all { |a| # 0 ambig
+      # a = ["現在の状況を表示する {56}", "git status {56}"], etc.
+      if a[0] =~ /voidvoidvoid/
+        false
+      elsif a[0] =~ /^git:/ && !git_repository
+        false
+      else
+        if listed[a[1]]
+          false
+        else
+          listed[a[1]] = true
+        end
+      end
+    }
+
+    list
+  end
+end

data/lib/helpline/helpline.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+class HelpLine
+  def datafile
+    File.expand_path("~/.helpline.json")
+  end
+end

data/lib/helpline/run.rb

@@ -0,0 +1,97 @@
+# -*- ruby -*-
+#
+# * HelpLineのメインルーチン
+# * datafileを読み、引数とマッチするものをリストする
+#   引数はARGVに入っている
+#
+
+require 'io/console'
+require 'helpline/curses'
+
+class HelpLine
+  LINES = 12
+  
+  def disp(list,sel)
+    Curses.move(0,0)
+    lines = list.length
+    lines = LINES if lines > LINES
+    (0...lines).each { |i|
+      Curses.move(i*2,0)
+      s = "#{list[i][0]}"
+      if i == sel
+        Curses.print_inverse s
+      else
+        Curses.print_bold s
+      end
+      Curses.move(i*2+1,0)
+      Curses.print "  % " + list[i][1]
+    }
+    Curses.move(sel*2,0)
+  end
+  
+  def run(query,debug=nil)
+    puts
+    
+    list = generate(query,debug)
+    #
+    # HelpLineメニュー表示し、カーソル移動で選択
+    #
+    help_number = {}
+    list.each_with_index { |entry,ind|
+      entry[0].sub!(/\s*{(\d*)}$/,'')
+      entry[1].sub!(/\s*{(\d*)}$/,'')
+      help_number[entry[0]] = $1.to_i
+    }
+
+    sel = 0
+    disp(list,sel)
+    
+    lines = list.length
+    lines = LINES if lines > LINES
+
+    inputchars = ''
+    while true
+      c = STDIN.getch
+      inputchars += c
+      
+      if inputchars == "\e"
+      # process ESC
+      elsif inputchars[0] == "\e" && inputchars.length == 2
+      # 何もしない
+      elsif inputchars == "\x0e" || inputchars == "\e[B" || inputchars == "\eOB"
+        Curses.down
+        sel = (sel + 1) if sel < lines-1
+        inputchars = ''
+      elsif inputchars == "\x10" || inputchars == "\e[A" || inputchars == "\eOA"
+        Curses.up
+        sel = sel - 1 if sel > 0
+        inputchars = ''
+      else
+        inputchars = ''
+      end
+      STDIN.flush
+      disp(list,sel)
+      
+      exit if c== 'q' || c == "\x03"
+
+      if c == "\r" || c == "\n"
+        break
+      end
+    end
+
+    desc = list[sel.to_i][0]
+    cmd = list[sel][1]
+
+    Curses.move(lines*2,0)
+    Curses.tol
+
+    #Curses.move(0,0)
+    ##Curses.down
+    
+    # Curses.print_inverse("「#{desc}」を実行")
+    # puts " (ソース: http://scrapbox.io/HelpLine/#{data['pages'][help_number[desc]]})"
+    File.open("/tmp/helpline.cmd","w"){ |f|
+      f.puts cmd
+    }
+  end
+end

data/lib/helpline/update.rb

@@ -0,0 +1,111 @@
+# -*- ruby -*-
+#
+# HelpLineデータを読み込んでdatafileにセーブする
+#
+
+require 'json'
+require 'scrapbox'
+
+class HelpLine
+  def update(sources) # sources = ['HelpLine', '~/ScrapboxData/masui.json', ...]
+    dumpdata = {}
+    dumpdata['codes'] = []
+    dumpdata['defs'] = []
+    dumpdata['pages'] = []
+
+    sources.each { |source|
+      pagedata = {}
+      if File.exist?(source)
+        puts "-----------------ページデータをJSONデータ(#{source})から取得"
+        data = JSON.parse(File.read(source))
+        data['pages'].each { |page|
+          title = page['title']
+          puts "...#{title}"
+          pagedata[title] = page['lines']
+        }
+      elsif source =~ /^[a-zA-Z\-]+$/ # たぶんHelpLineプロジェクト
+        puts "-----------------ページデータをScrapbox(#{source})から取得"
+        project = Scrapbox::Project.new(source)
+        project.pages.each { |title,page|
+          puts "...#{title}"
+          pagedata[title] = page.text.split(/\n/)
+        }
+      else
+        next
+      end
+      
+      #
+      # 関数/定数を評価"
+      #
+      puts "-----------------関数/定数を取得"
+      src = nil
+      code = []
+      pagedata.each { |title,lines|
+        # puts "...#{title}"
+        lines.each { |line|
+          if src && line =~ /^\s+/ then
+            code << line
+          elsif line =~ /^code:(.*\.rb)$/ then
+            if code.length > 0
+              puts "...#{title}"
+              puts code[0]
+              dumpdata['codes'] << code.join("\n")
+            end
+            src = $1
+            code = []
+          elsif src then
+            puts "...#{title}"
+            puts code[0]
+            dumpdata['codes'] << code.join("\n")
+            src = nil
+            code = []
+          else
+          end
+        }
+        if code.length > 0
+          puts "...#{title}"
+          puts code[0]
+          dumpdata['codes'] << code.join("\n")
+          src = nil
+          code = []
+        end
+      }
+      puts "-----------------HelpLineデータを検出"
+      pagedata.each { |title,pagedata|
+        # puts "...#{title}"
+        dumpdata['pages'] << title
+        processing_defs = false
+        codeindent = nil
+        pagedata.each { |line|
+          if !codeindent
+            if line =~ /^code:/
+              codeindent = 0
+              next
+            end
+          else
+            line =~ /^(\s*)/
+            if $1.length < codeindent + 1
+              codeindent = nil
+            else
+              next
+            end
+          end
+          if line =~ /^[\$\%\?]/
+            if line =~ /^\%/ && !processing_defs
+              puts "'$'で始まる用例定義なしでコマンドを定義しようとしています"
+              exit
+            end
+            dumpdata['defs'] << "#{line} {#{dumpdata['pages'].length-1}}"
+            processing_defs = true
+          else
+            processing_defs = false
+          end
+        }
+      }
+    }
+      
+    File.open(datafile,"w"){ |f|
+      f.puts dumpdata.to_json
+    }
+  end
+end

data/lib/helpline/version.rb

@@ -1,3 +1,3 @@
 module Helpline
-  VERSION = "0.1.14"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.1
 platform: ruby
 authors:
 - Toshiyuki Masui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,8 +91,10 @@ files:
 - ".gitignore"
 - 00README
 - Gemfile
+- HelpLine.json
 - LICENSE.txt
 - Makefile
+- Makefile.electron
 - README.md
 - Rakefile
 - _config.yml
@@ -109,6 +111,10 @@ files:
 - keydef.zsh
 - lib/helpline.rb
 - lib/helpline/curses.rb
+- lib/helpline/generate.rb
+- lib/helpline/helpline.rb
+- lib/helpline/run.rb
+- lib/helpline/update.rb
 - lib/helpline/version.rb
 - main.js
 - package.json