helpline 0.1.15 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 760363f5b884ce3e92d4b1042523badb5fad023c16ff8c711b2086cc2ef9228f
-  data.tar.gz: ab7aee925de3dbd892f7580eb59786e743bb8c753d9e418e7a8b064250ed2195
+  metadata.gz: c2ec697caa86da979b533f2002d7fa313b1fec88eb31e8f89a8b3176e09cccb5
+  data.tar.gz: 74d191374b68cda1545ac70f1e4ca4abea2fd0a867cb66c72fc66d29c8fab7e7
 SHA512:
-  metadata.gz: bd879e357e439e47e4c25f6b21387a188ca55ef5221338523fe2d13cb9c223a9b1a799db681ab8ebfabd0640ceda1e2b3d691314917d4f7ef421f388b3e8d218
-  data.tar.gz: 72a406cbc00419e80007b846c4f5ffb5be92e40304bcaa08230b6d5029555df87e3dd60f664ad0eb2dad7ae931ff0a86a2bffcfb9d42fd74c08d9bce330e1b20
+  metadata.gz: bd4ff55951f5f64ffec395028f4069c74c3251409850d3e7200738bb03a461b2677eef60b1e17f385cf3a3f7511b00405636466e1e759d622dcd4bfeefcb8eab
+  data.tar.gz: 3801b7240aea007585935c50bcc3c74b6fd06410a4801a0f909b9852a301c4ced1e963ef0957e60e56f82420d4601620f8a96cd235ed6c4c1a82ccc942bbfea7

data/00README

@@ -1 +1,8 @@
-Electron版(JS)とRuby版(gem版)が一緒になっているので良くない...
+Electron版(JS)とRuby版(gem版)が一緒になっているので良くない...
+
+
+* gemリリース方法
+ - lib/helpline/version.rb の番号をふやす
+ - git でコミット
+ - make release
+ 

data/Makefile

@@ -1,54 +1,16 @@
-.PHONY: data.js glossary.js test
-
-run: browserify
-	npm start .
-
-browserify:
-	browserify helpline.js -o helpline_browserify.js
-
-build-mac: install browserify
-	npm run build
-	cp -r build/mac/HelpLine.app /Applications
-upload:
-	scp build/HelpLine-0.0.1.dmg pitecan.com:/www/www.pitecan.com/tmp/HelpLine.dmg
-
-build-chromebook: browserify install
-	npm run build
-
-#dmg: build-mac
-#	-/bin/rm -f HelpLine.dmg
-#	hdiutil create -srcfolder build/mac/HelpLine.app -volname HelpLine HelpLine.dmg
-
-#install: npm browserify cursorpos electron
-install:
-	npm install
-
-electron:
-	npm install electron
-
+.PHONY: test
 #
-# Scrapboxからデータ更新
-#
-update: data.js glossary.js
-data.js:
-	ruby getdata.rb > data.js
-glossary.js:
-	ruby getglossary.rb > glossary.js
-
-clean:
-	-/bin/rm -r -f node_modules
-	-/bin/rm -r -f build
-	-/bin/rm -f HelpLine.dmg
-
-all: update build-mac
-
-
-#
-# gem
+# Gem版
 #
 release:
 	rake release
 
+update:
+	helpline --update
+
+update-local:
+	helpline --update ~/ScrapboxData/HelpLine.json ~/ScrapboxData/masui-helpline.json
+
 #
 # テスト
 #

data/Makefile.electron

@@ -0,0 +1,43 @@
+.PHONY: data.js glossary.js test
+
+run: browserify
+	npm start .
+
+browserify:
+	browserify helpline.js -o helpline_browserify.js
+
+build-mac: install browserify
+	npm run build
+	cp -r build/mac/HelpLine.app /Applications
+upload:
+	scp build/HelpLine-0.0.1.dmg pitecan.com:/www/www.pitecan.com/tmp/HelpLine.dmg
+
+build-chromebook: browserify install
+	npm run build
+
+#dmg: build-mac
+#	-/bin/rm -f HelpLine.dmg
+#	hdiutil create -srcfolder build/mac/HelpLine.app -volname HelpLine HelpLine.dmg
+
+#install: npm browserify cursorpos electron
+install:
+	npm install
+
+electron:
+	npm install electron
+
+#
+# Scrapboxからデータ更新
+#
+update: data.js glossary.js
+data.js:
+	ruby getdata.rb > data.js
+glossary.js:
+	ruby getglossary.rb > glossary.js
+
+clean:
+	-/bin/rm -r -f node_modules
+	-/bin/rm -r -f build
+	-/bin/rm -f HelpLine.dmg
+
+all: update build-mac

data/exe/helpline

@@ -1,275 +1,43 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
+#
+# HelpLineのメインプログラム
+#
 
-require 'json'
 require 'optparse'
 
-require 'scrapbox'
-require 're_expand'
+$:.unshift "lib"
+require 'helpline/helpline'
+require 'helpline/update'
+require 'helpline/generate'
+require 'helpline/run'
 
-require 'io/console'
-require 'helpline/curses'
+# アップデート
+#   % helpline -u
+# データを指定してアップデート
+#   % helpline -u HelpLine /Users/masui/ScrapboxData/masui-HelpLine.json
+# テスト
+#   % helpline -t args
+#
 
-puts
-
-class HelpLine
-  LINES = 12
-    
-  def datafile
-    File.expand_path("~/.helpline.json")
-  end
-  
-  def initialize
-    @pagedata = {}
-    @project = Scrapbox::Project.new("HelpLine")
-  end
-
-  def getdata
-    #
-    # ページデータ取得
-    #
-    puts "-----------------ページデータを取得"
-    @project.pages.each { |title,page|
-      puts "...#{title}"
-      @pagedata[title] = page.text.split(/\n/)
-    }
-
-    dumpdata = {}
-    dumpdata['codes'] = []
-    dumpdata['defs'] = []
-    dumpdata['pages'] = []
-    
-    #
-    # 関数/定数を評価"
-    #
-    puts "-----------------関数/定数を取得"
-    @pagedata.each { |title,pagedata|
-      puts "...#{title}"
-      pagedata. each { |line|
-        if line =~ /code:(.*\.rb)$/ then
-          src = $1
-          puts "=========== #{src}"
-          page = Scrapbox::Page.new(@project,title)
-          dumpdata['codes'] << page.code(src)
-        end
-      }
-    }
-    puts "-----------------HelpLineデータを検出"
-    @pagedata.each { |title,pagedata|
-      puts "...#{title}"
-      dumpdata['pages'] << title
-      processing_defs = false
-      codeindent = nil
-      pagedata.each { |line|
-        if !codeindent
-          if line =~ /^(\s*)code:/
-            codeindent = $1.length
-            next
-          end
-        else
-          line =~ /^(\s*)/
-          if line.length < codeindent
-            codeindent = nil
-          else
-            next
-          end
-        end
-        if line =~ /^\s*[\$\%]/
-          puts 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)
-    # Curses.down
-    # Curses.tol
-  end
-  
-  def helpline(options)
-    data = JSON.parse(File.read(datafile))
-    unless data['pages'] # データ型式変換があったので
-      getdata
-      data = JSON.parse(File.read(datafile))
-    end
-
-    #
-    # 関数定義などをeval
-    #
-    data['codes'].each { |code|
-      eval code
-    }
-
-    g = ExpandRuby::Generator.new # re_expandのジェネレータ
-
-    #
-    # HelpLineエントリ
-    #
-
-    # File.open("/tmp/defs","w"){ |f|  # ログを残す場合
-    
-    entries = []
-    data['defs'].each { |line|
-      if line =~ /^\s*\$\s*(.*)$/ # $....
-        entries << $1
-      elsif line =~ /^\s*\%\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')
-        }
-        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'] then
-      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
+helpline = HelpLine.new
 
-    desc = list[sel.to_i][0]
-    cmd = list[sel][1]
+options = ARGV.getopts('utds:','update','test','source:','debug')
 
-    Curses.move(lines*2,0)
-    Curses.tol
+debug = options['d'] || options['debug']
 
-    #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
+# データ更新
+if options['u'] || options['update'] # ~/.helpline.json更新
+  sources = (ARGV.length > 0 ? ARGV : ['HelpLine'])
+  helpline.update sources
+  exit
 end
 
-# is_repository = system 'git rev-parse --git-dir > /dev/null >& /dev/null'
-# unless is_repository
-#   STDERR.puts "Gitレポジトリで実行して下さい"
-#   exit
-# end
-
-options = ARGV.getopts('ut')
-
-helpline = HelpLine.new
-
-if !File.exist?(helpline.datafile) && !options['u']
-  puts "#{helpline.datafile}を作成します..."
-  helpline.getdata
+# テスト
+if options['t'] || options['test'] # テスト
+  puts helpline.generate " #{ARGV.join(' ')} ", debug
+  exit
 end
 
-if options['u'] then
-  helpline.getdata
-else
-  helpline.helpline(options)
-end
+query = " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
+helpline.run query, debug

data/lib/helpline/generate.rb

@@ -0,0 +1,77 @@
+# -*- 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')
+            # puts "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,114 @@
+# -*- 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 = {}
+      projectname = ''
+      if File.exist?(source)
+        puts "-----------------ページデータをJSONデータ(#{source})から取得"
+        data = JSON.parse(File.read(source))
+        projectname = data['name']
+        data['pages'].each { |page|
+          title = page['title']
+          puts "...#{title}"
+          pagedata[title] = page['lines']
+        }
+      elsif source =~ /^[a-zA-Z\-]+$/ # たぶんHelpLineプロジェクト
+        puts "-----------------ページデータをScrapbox(#{source})から取得"
+        projectname = 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,data|
+        # puts "...#{title}"
+        dumpdata['pages'] << title
+        processing_defs = false
+        cmd_defined = false
+        data.each { |line|
+          if line =~ /^[\$\?]/
+            dumpdata['defs'] << "#{line} {#{dumpdata['pages'].length-1}}"
+            cmd_defined = false
+            processing_defs = true
+          elsif line =~ /^\%/
+            if !processing_defs
+              puts "'$'で始まる用例定義なしでコマンドを定義しようとしています (#{title})"
+              exit
+            end
+            dumpdata['defs'] << "#{line} {#{dumpdata['pages'].length-1}}"
+            cmd_defined = true
+            processing_defs = false
+          elsif processing_defs && !cmd_defined
+            dumpdata['defs'] << "% open 'https://Scrapbox.io/#{projectname}/#{title}' {#{dumpdata['pages'].length-1}}"
+            cmd_defined = false
+            processing_defs = false
+          else
+            cmd_defined = false
+            processing_defs = false
+          end
+        }
+        if processing_defs && !cmd_defined
+          dumpdata['defs'] << "% open 'https://Scrapbox.io/#{projectname}/#{title}' {#{dumpdata['pages'].length-1}}"
+        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.15"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.2
 platform: ruby
 authors:
 - Toshiyuki Masui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - HelpLine.json
 - LICENSE.txt
 - Makefile
+- Makefile.electron
 - README.md
 - Rakefile
 - _config.yml
@@ -110,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