helpline 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1990a34e246aa29e6f04d43d72541dc2dea4a1a9051f96541ce4d1b161006b
-  data.tar.gz: c09e2c0ab0e5ad4d3848c7a4b1a6ab37913e8990f96bc0f260b2e8cfd719aac8
+  metadata.gz: c2ec697caa86da979b533f2002d7fa313b1fec88eb31e8f89a8b3176e09cccb5
+  data.tar.gz: 74d191374b68cda1545ac70f1e4ca4abea2fd0a867cb66c72fc66d29c8fab7e7
 SHA512:
-  metadata.gz: 58cdbfd97c3030da1ef9f496ccd85efc5429693b276d87e95a61059a7a0edbcabee793fd9b6ae0f278e4a8f36de707853e071c4846998d64b90199e1c5d92e1a
-  data.tar.gz: 04f66e3949c0d9aa0a9e96b83fc68da053825f1ad5ec25d3c177f8f8c180aa4fbcc059bda63350f70c5838111407f5b22cced14e1df1cbe1cd1b986cf747c6ba
+  metadata.gz: bd4ff55951f5f64ffec395028f4069c74c3251409850d3e7200738bb03a461b2677eef60b1e17f385cf3a3f7511b00405636466e1e759d622dcd4bfeefcb8eab
+  data.tar.gz: 3801b7240aea007585935c50bcc3c74b6fd06410a4801a0f909b9852a301c4ced1e963ef0957e60e56f82420d4601620f8a96cd235ed6c4c1a82ccc942bbfea7

data/Makefile

@@ -1,3 +1,4 @@
+.PHONY: test
 #
 # Gem版
 #
@@ -8,7 +9,7 @@ update:
 	helpline --update
 
 update-local:
-	helpline --update --debug --source ~/ScrapboxData/HelpLine.json,~/ScrapboxData/masui-helpline.json
+	helpline --update ~/ScrapboxData/HelpLine.json ~/ScrapboxData/masui-helpline.json
 
 #
 # テスト

data/exe/helpline

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
+#
+# HelpLineのメインプログラム
+#
 
 require 'optparse'
 
@@ -21,20 +24,20 @@ helpline = HelpLine.new
 
 options = ARGV.getopts('utds:','update','test','source:','debug')
 
-#
-# update
-#
+debug = options['d'] || options['debug']
+
+# データ更新
 if options['u'] || options['update'] # ~/.helpline.json更新
   sources = (ARGV.length > 0 ? ARGV : ['HelpLine'])
   helpline.update sources
   exit
 end
 
+# テスト
 if options['t'] || options['test'] # テスト
-  puts helpline.generate " #{ARGV.join(' ')} "
+  puts helpline.generate " #{ARGV.join(' ')} ", debug
   exit
 end
 
-debug = options['d'] || options['debug']
 query = " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
 helpline.run query, debug

data/lib/helpline/generate.rb

@@ -36,6 +36,7 @@ class HelpLine
             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 = []

data/lib/helpline/update.rb

@@ -15,9 +15,11 @@ class HelpLine
 
     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}"
@@ -25,6 +27,7 @@ class HelpLine
         }
       elsif source =~ /^[a-zA-Z\-]+$/ # たぶんHelpLineプロジェクト
         puts "-----------------ページデータをScrapbox(#{source})から取得"
+        projectname = source
         project = Scrapbox::Project.new(source)
         project.pages.each { |title,page|
           puts "...#{title}"
@@ -71,36 +74,36 @@ class HelpLine
         end
       }
       puts "-----------------HelpLineデータを検出"
-      pagedata.each { |title,pagedata|
+      pagedata.each { |title,data|
         # 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 "'$'で始まる用例定義なしでコマンドを定義しようとしています"
+        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}}"
-            processing_defs = true
+            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
       }
     }
       

data/lib/helpline/version.rb

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

metadata

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