helpline 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b46831b912140d384be779ff12f530462457a20899e8fe96f073436655831fc
-  data.tar.gz: ef8ff02acc4e8f25b4bed9b07b25d9c736a8ff6a90096d657f8905cf09cbb821
+  metadata.gz: b3d0d6469df1e6602a463e963d91e0bba1b627e2e7e08bb57ff74ec664bb1bac
+  data.tar.gz: 1559e82dc0f79050052a7dccef65e4a176e77fd6caefa12aa7f5db5f99a82041
 SHA512:
-  metadata.gz: fbe21e1d7af765a12be93d1c0d6cafca68bf9c58d7261da12d6a2306a5be3e60b708e94e6ff84650cfd996e9153ee627312cb6cfe8874f2cbb55757014dfed27
-  data.tar.gz: f8d7372ae4f8b6710c0a2e4d15de931868bd7f3f17f6533fdc3e9aabb753fa68a9923565e675de5d225f566b45e56d2364b4ac4689c819784b0179b44ef3a32e
+  metadata.gz: 1645897171adc53bf7ee7042c9b2726720dca573c762dce8d34fd73ff4d6ec817b5f7e15dd5fe563c48b3f103113ce4dbdb150a6c857df507fbbe6b06aca9dcc
+  data.tar.gz: a30e309a07810fb870a7ddb3d9fdec1b0785fb7cdf8b65f79d39c832875f4f0a021745f03ef4407489dcb2b8cb6e9541bd36aa2351926f454c2a4e0d6f44b151

data/Makefile

@@ -42,3 +42,12 @@ clean:
 
 all: update build-mac
 
+
+#
+# gem
+#
+release:
+	rake release
+
+
+

data/exe/helpline

@@ -130,46 +130,48 @@ class HelpLine
     #
     # HelpLineエントリ
     #
-    lines = []
+    entries = []
     data['defs'].each { |line|
       if line =~ /^\s*\$\s*(.*)$/ # $....
-        lines << $1
+        entries << $1
       elsif line =~ /^\s*\%\s*(.*)$/ # %....
         cmd = $1
-        lines.each { |l|
+        entries.each { |l|
           desc = eval('"' + l + '"')
           g.add desc.force_encoding('utf-8'), cmd.force_encoding('utf-8')
         }
-        lines = []
+        entries = []
       end
     }
 
-    # puts "GENERATE #{params.split('|').join(' ')} "
-
     res = g.generate " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
 
+    File.open("/tmp/helpline.cmd","w"){ |f|
+      f.puts ARGV.join(' ')
+    }
     if res[0].length == 0
       puts "ヘルプがみつかりません"
-      File.open("/tmp/helpline.cmd","w"){ |f|
-        f.puts ARGV.join(' ')
-      }
       exit
     end
 
+    git_repository = File.exist?(".git")
     listed = {}
     list = res[0].find_all { |a| # 0 ambig
       # a = ["現在の状況を表示する {56}", "git status {56}"], etc.
-      if listed[a[1]]
+      if a[0] =~ /^git:/ && !git_repository
         false
       else
-        listed[a[1]] = true
+        if listed[a[1]]
+          false
+        else
+          listed[a[1]] = true
+        end
       end
     }
 
     #
     # HelpLineメニュー表示し、カーソル移動で選択
     #
-    
     help_number = {}
     list.each_with_index { |entry,ind|
       entry[0].sub!(/\s*{(\d*)}$/,'')
@@ -180,6 +182,9 @@ class HelpLine
     sel = 0
     disp(list,sel)
     
+    lines = list.length
+    lines = LINES if lines > LINES
+
     inputchars = ''
     while true
       c = STDIN.getch
@@ -197,7 +202,7 @@ class HelpLine
         inputchars = ''
       elsif inputchars == "\x0e" || inputchars == "\e[B" || inputchars == "\eOB"
         Curses.down
-        sel = (sel + 1) if sel < LINES-1
+        sel = (sel + 1) if sel < lines-1
         inputchars = ''
       elsif inputchars == "\x10" || inputchars == "\e[A" || inputchars == "\eOA"
         Curses.up
@@ -219,10 +224,11 @@ class HelpLine
     desc = list[sel.to_i][0]
     cmd = list[sel][1]
 
-    Curses.move(lines.length,0)
+    Curses.move(lines,0)
+    Curses.tol
+
     #Curses.move(0,0)
     ##Curses.down
-    ##Curses.tol
     Curses.print_inverse("「#{desc}」を実行")
     puts " (ソース: http://scrapbox.io/HelpLine/#{data['pages'][help_number[desc]]})"
     File.open("/tmp/helpline.cmd","w"){ |f|

data/lib/helpline/version.rb

@@ -1,3 +1,3 @@
 module Helpline
-  VERSION = "0.1.8"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - Toshiyuki Masui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler