helpline 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13cbb8ab1cdc392967b923b617a74f32fecf8611a773a5e3e90ebdb00780a8c
-  data.tar.gz: f79fc13c44a79abab9e47777dc79addd7969d528020f0998629c3e16c0d91935
+  metadata.gz: 3b2bc48034db45fc57d3f69b5d992dc7ab045e7acf82d48fe0f225398ee6fdb9
+  data.tar.gz: f2f1cfcfb59fd2c7cbafd8ac650cf569caac793d3ebf3821b8032a9529370acf
 SHA512:
-  metadata.gz: e63285e9c8bd43c2b9a5be748a23c48dda8188f88867f9fcce595d3863faf591d17abc155a281178b51fe9ac2db75ad810ce7ec0f2cf84901d3ba007c8558d69
-  data.tar.gz: 339f2677a690a08a7a2ea7c4fb76737451f64ceae9dde0efb437c64016f40c68aba379564867ca3334ebfbdaee4e0d9765ce60f1df22c1344a70f87847eba8c4
+  metadata.gz: 3c646c3edc7b3c5ca9120db0802e446ffdae29e76e475d228feb23fcc5a43568a7f237be646f2f8e1ff1399d6b43dbe69e0d186324d4c3ad6456528cfda4a19a
+  data.tar.gz: 791d893b90bc215c7ee063db030d17f7b0549af829683d59d59a7af54e3a4bc4650462a1854f261681e39211d17695af2b3f940039ce19682f035a8dfb13ef5f

data/exe/helpline

@@ -20,74 +20,100 @@ class HelpLine
   end
   
   def initialize
-    @pagedata = {}
-    @project = Scrapbox::Project.new("HelpLine")
+    # @pagedata = {}
+    # @project = Scrapbox::Project.new("HelpLine")
   end
 
-  def getdata
-    #
-    # ページデータ取得
-    #
-    puts "-----------------ページデータを取得"
-    @project.pages.each { |title,page|
-      puts "...#{title}"
-      @pagedata[title] = page.text.split(/\n/)
-    }
-
+  def update(sources) # sources = ['HelpLine', '~/ScrapboxData/masui.json', ...]
     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)
+    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
+      indent = ''
+      code = []
+      pagedata.each { |title,lines|
+        puts "...#{title}"
+        lines.each { |line|
+          if src && line =~ /^#{indent}\s+/ then
+            code << line
+          elsif line =~ /^code:(.*\.rb)$/ then
+            src = $2
+            indent = $1
+            code = []
+          elsif src then
+            dumpdata['codes'] << code.join("\n")
+            src = nil
+            indent = ''
+            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 =~ /^(\s*)code:/
-            codeindent = $1.length
-            next
-          end
-        else
-          line =~ /^(\s*)/
-          if line.length < codeindent
-            codeindent = nil
+      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 = $1.length
+              next
+            end
           else
-            next
+            line =~ /^(\s*)/
+            if line.length < codeindent
+              codeindent = nil
+            else
+              next
+            end
           end
-        end
-        if line =~ /^\s*[\$\%\?]/
-          puts line
-          if line =~ /^\%/ && !processing_defs
-            puts "'$'で始まる用例定義なしでコマンドを定義しようとしています"
-            exit
+          if line =~ /^\s*[\$\%\?]/
+            if line =~ /^\%/ && !processing_defs
+              puts "'$'で始まる用例定義なしでコマンドを定義しようとしています"
+              exit
+            end
+            dumpdata['defs'] << "#{line} {#{dumpdata['pages'].length-1}}"
+            processing_defs = true
+          else
+            processing_defs = false
           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
     }
@@ -109,14 +135,12 @@ class HelpLine
       Curses.print "  % " + list[i][1]
     }
     Curses.move(sel*2,0)
-    # Curses.down
-    # Curses.tol
   end
   
-  def helpline(options)
+  def helpline(sources,test=nil,debug=nil)
     data = JSON.parse(File.read(datafile))
     unless data['pages'] # データ型式変換があったので
-      getdata
+      update sources
       data = JSON.parse(File.read(datafile))
     end
 
@@ -133,23 +157,24 @@ class HelpLine
     # 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
+    logfile = (debug ? "/tmp/helpline-defs" : "/dev/null")
+    File.open(logfile,"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')
+          }
+          f.puts "cmd:  #{cmd}"
+          entries = []
+        end
+      }
     }
-    # }
 
     res = g.generate " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
 
@@ -179,7 +204,8 @@ class HelpLine
       end
     }
 
-    if options['t'] then
+    # if options['t'] || options['test'] then
+    if test
       puts list
       exit
     end
@@ -253,23 +279,32 @@ class HelpLine
   end
 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 -u
+# データを指定してアップデート
+#   % helpline -u -s HelpLine,/Users/masui/ScrapboxData/masui-HelpLine.json
+# テスト
+#   % helpline -t
+#
 
 helpline = HelpLine.new
 
-if !File.exist?(helpline.datafile) && !options['u']
+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}を作成します..."
-  helpline.getdata
+  helpline.update sources
 end
 
-if options['u'] then
-  helpline.getdata
+if update then
+  helpline.update sources
 else
-  helpline.helpline(options)
+  helpline.helpline sources, test, debug
 end

data/lib/helpline/version.rb

@@ -1,3 +1,3 @@
 module Helpline
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Toshiyuki Masui