githelp 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2399358a578fc4982f40df664fa591f07be16622a7557213ca3ff949870c7ba9
-  data.tar.gz: d6bb36c95bd36c6bf61a7daa8da22d0ec17299550dd5138505a3aa52d8a77871
+  metadata.gz: 0dfa9adad7bd2f69ed8ea736bd211e3709ccf32a86e1a98fa10677620c6ef4e4
+  data.tar.gz: b44b567936f41913773977f3331dbbeff6a462f5932ebd51a5f2d7aeffe83300
 SHA512:
-  metadata.gz: 979c3fc27e26ef71241263d29a9dbd76370d5d3e7d5b28be9f507f31674e829ecd01bb2380afb5e7c1de864ac78b0b1f7de42f70486acc5b39c05a86a02b144e
-  data.tar.gz: 8595537506f2f4e8e53b84aedc68c9a22e13c30e606d3a1c10c56f4df251c6d759cee6561696ea4b6e8765e6fbe0703fd0846bd05ed900fcecf987102b659080
+  metadata.gz: a58961c4276d2d0082de92a82e1a06e5a3d368bc53bbd4f1384b4f8b4067d6a863856b757df2c51a93112c8eb19b64634e08ab12431116b7e0523fe264c822eb
+  data.tar.gz: e90623ed545071fc6a3f4f691f3bd1dc83a4989d649bdcc1c106357e29076e33e12f95eb0d3d38ef2177531360eb6ec761b6a18f7efc4684059a910280da2bc5

data/exe/githelp

@@ -33,6 +33,7 @@ class GitHelp
     dumpdata = {}
     dumpdata['codes'] = []
     dumpdata['defs'] = []
+    dumpdata['pages'] = []
     
     #
     # 関数/定数を評価"
@@ -52,6 +53,7 @@ class GitHelp
     puts "-----------------GitHelpデータを検出"
     @pagedata.each { |title,pagedata|
       puts "...#{title}"
+      dumpdata['pages'] << title
       processing_defs = false
       codeindent = nil
       pagedata.each { |line|
@@ -74,7 +76,7 @@ class GitHelp
             puts "'$'で始まる用例定義なしでコマンドを定義しようとしています"
             exit
           end
-          dumpdata['defs'] << line
+          dumpdata['defs'] << "#{line} {#{dumpdata['pages'].length-1}}"
           processing_defs = true
         else
           processing_defs = false
@@ -89,6 +91,10 @@ class GitHelp
 
   def githelp(pager)
     data = JSON.parse(File.read(datafile))
+    unless data['pages'] # データ型式変換があったので
+      getdata
+      data = JSON.parse(File.read(datafile))
+    end
 
     #
     # 関数定義などをeval
@@ -129,21 +135,34 @@ class GitHelp
     }
 
     if pager == 'peco' then
+      no = {}
       res = IO.popen(pager, "r+") {|io|
         list.each_with_index { |entry,ind|
-          io.puts "#[#{ind}] #{entry[0]}"
+          entry[0].sub!(/\s*{(\d*)}$/,'')
+          entry[1].sub!(/\s*{(\d*)}$/,'')
+          no[entry[0]] = $1.to_i
+          io.puts "[#{ind}] #{entry[0]}"
           io.puts "   #{entry[1]}"
         }
         io.close_write
         io.gets
       }
       if res
-        if res =~ /^\#\[(\d+)\]/
+        if res =~ /^\[(\d+)\]/
+          desc = list[$1.to_i][0]
           cmd = list[$1.to_i][1]
         else
+          desc = ''
+          list.each { |entry|
+            desc = entry[0] if entry[1].sub(/^\s*/,'') == res.chomp.sub(/^\s*/,'')
+          }
           cmd = res.sub(/^\s*/,'')
         end
-        print "「#{cmd.chomp}」 を実行しますか? "
+
+        puts "データ: http://scrapbox.io/GitHelp/#{data['pages'][no[desc]]}"
+        puts
+        puts "#{desc} ために"
+        print "コマンド「#{cmd.chomp}」 を実行しますか? (Y) "
         ans = STDIN.gets
         if ans =~ /^y/i || ans == "\n"
           system cmd
@@ -152,7 +171,7 @@ class GitHelp
     else
       res = IO.popen(pager, "w") {|io|
         list.each_with_index { |entry,ind|
-          io.puts "#[#{ind}] #{entry[0]}"
+          io.puts "[#{ind}] #{entry[0]}"
           io.puts "   #{entry[1]}"
         }
       }

data/lib/githelp/version.rb

@@ -1,3 +1,3 @@
 module GitHelp
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: githelp
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Toshiyuki Masui