helpline 0.1.18 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da846a2097e73873989f053ae7acba666b64e9fb350ac543897ee2e10889311
-  data.tar.gz: 4237c2757bdec52c46225849dd08169b5aed63a4031c5ece0e5ee4175548f8d7
+  metadata.gz: 5b1990a34e246aa29e6f04d43d72541dc2dea4a1a9051f96541ce4d1b161006b
+  data.tar.gz: c09e2c0ab0e5ad4d3848c7a4b1a6ab37913e8990f96bc0f260b2e8cfd719aac8
 SHA512:
-  metadata.gz: 02b39b745ecd0c4088981a533283e2d4d5547b31ecd8d73e74146765d9cd7441460e2690c8d3e8c85ffe7425db30ce4535d7317e44c9283baf3182b39e947f01
-  data.tar.gz: 3c0c888681502eb0ce5e548a02fb53c95fba00cba92dce8d62420fe17e1bce618f13e59101068714ab7b9370352e1286941bc65e288d1e94c941ed5e4bcac823
+  metadata.gz: 58cdbfd97c3030da1ef9f496ccd85efc5429693b276d87e95a61059a7a0edbcabee793fd9b6ae0f278e4a8f36de707853e071c4846998d64b90199e1c5d92e1a
+  data.tar.gz: 04f66e3949c0d9aa0a9e96b83fc68da053825f1ad5ec25d3c177f8f8c180aa4fbcc059bda63350f70c5838111407f5b22cced14e1df1cbe1cd1b986cf747c6ba

data/exe/helpline

@@ -1,310 +1,40 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
 
-require 'json'
 require 'optparse'
 
-require 'scrapbox'
-require 're_expand'
-
-require 'io/console'
-require 'helpline/curses'
-
-puts
-
-class HelpLine
-  LINES = 12
-    
-  def datafile
-    File.expand_path("~/.helpline.json")
-  end
-  
-  def initialize
-    # @pagedata = {}
-    # @project = Scrapbox::Project.new("HelpLine")
-  end
-
-  def update(sources) # sources = ['HelpLine', '~/ScrapboxData/masui.json', ...]
-    dumpdata = {}
-    dumpdata['codes'] = []
-    dumpdata['defs'] = []
-    dumpdata['pages'] = []
-    
-    sources.each { |source|
-      pagedata = {}
-      source = File.expand_path(source)
-      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
-              dumpdata['codes'] << code.join("\n")
-            end
-            src = $1
-            code = []
-          elsif src then
-            dumpdata['codes'] << code.join("\n")
-            src = nil
-            code = []
-          else
-          end
-        }
-        if code.length > 0
-          dumpdata['codes'] << code.join("\n")
-        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
-
-  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 helpline(sources,test=nil,debug=nil)
-    data = JSON.parse(File.read(datafile))
-    unless data['pages'] # データ型式変換があったので
-      update sources
-      data = JSON.parse(File.read(datafile))
-    end
-
-    #
-    # 関数定義などを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 " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
-
-    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
-    }
-
-    # if options['t'] || options['test'] then
-    if test
-      puts list
-      exit
-    end
-
-    #
-    # 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 == "\x06" || inputchars == "\e[C" || inputchars == "\eOC"
-        #  Curses.right
-        inputchars = ''
-      elsif inputchars == "\x02" || inputchars == "\e[D" || inputchars == "\eOD"
-        #  Curses.left
-        inputchars = ''
-      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
+$:.unshift "lib"
+require 'helpline/helpline'
+require 'helpline/update'
+require 'helpline/generate'
+require 'helpline/run'
 
 # アップデート
 #   % helpline -u
 # データを指定してアップデート
-#   % helpline -u -s HelpLine,/Users/masui/ScrapboxData/masui-HelpLine.json
+#   % helpline -u HelpLine /Users/masui/ScrapboxData/masui-HelpLine.json
 # テスト
-#   % helpline -t
+#   % helpline -t args
 #
 
 helpline = HelpLine.new
 
 options = ARGV.getopts('utds:','update','test','source:','debug')
-update = options['u'] || options['update']
-test = options['t'] || options['test']
-debug = options['d'] || options['debug']
-sources = ['HelpLine']
-if options['s'] || options['source']
-  sources = (options['s'] || options['source']).split(/,/)
-end
 
-if !File.exist?(helpline.datafile) && !update
-  puts "#{helpline.datafile}を作成します..."
+#
+# update
+#
+if options['u'] || options['update'] # ~/.helpline.json更新
+  sources = (ARGV.length > 0 ? ARGV : ['HelpLine'])
   helpline.update sources
+  exit
 end
 
-if update then
-  helpline.update sources
-else
-  helpline.helpline sources, test, debug
+if options['t'] || options['test'] # テスト
+  puts helpline.generate " #{ARGV.join(' ')} "
+  exit
 end
+
+debug = options['d'] || options['debug']
+query = " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
+helpline.run query, debug

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.18"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.2.1
 platform: ruby
 authors:
 - Toshiyuki Masui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,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