helpline 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4796cced1ca30fb1effb576492307234872655a7fbc7daa4581c5f8cf3deb1c4
-  data.tar.gz: 9765b91769a092835c9f2c9d42fd2de068cdc9eb4119b5f0a6f08ea8bbf04d54
+  metadata.gz: bf6546d695b0f5183a37b1bd3f03b92badd158baf1b41de47710cd5620d1fe25
+  data.tar.gz: 8c66e7379d9cb8e2d02925fb80a33e44d9772fb6d40bcb41e0ec681e6c92092c
 SHA512:
-  metadata.gz: 0f2b9ea43201159fddb09c7b9b3f51f5f514037a9b9d0d6c5928f241acf4b8d11198cd9d4b9dc1fcb0bfbbe8294d9f274a78f7ae27352f57d3143dd4cd860236
-  data.tar.gz: a0b7b42b1b39b92a5db2025d192215af4be319b16e51386a9e75ebbe9ff078c9a02750cb91d6108f047201c1d1e556c4100e4541b9a2e6d14642fd8d86705d61
+  metadata.gz: 289c5a0bc28dd19cbfe0f25bcfc3d32776c7b4e9dcba21b763d6cd72dfa0425f09efc2de9758dd57025338e90e6115f336562700d4117adae27d44d27d109fa8
+  data.tar.gz: e9455987872ac5e3765703bf7f13cc204a22b1d5c237970943ff99c3d2bffe53a7e3b815cbf7df222bee1fad1e1fee45c21dfcb6276a917439ba672b4c5e842c

data/Makefile

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

data/exe/helpline

@@ -130,22 +130,20 @@ 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(/\]/,'')} "
 
     if res[0].length == 0
@@ -156,13 +154,18 @@ class HelpLine
       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
     }
 
@@ -180,6 +183,9 @@ class HelpLine
     sel = 0
     disp(list,sel)
     
+    lines = list.length
+    lines = LINES if lines > LINES
+
     inputchars = ''
     while true
       c = STDIN.getch
@@ -197,7 +203,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,6 +225,11 @@ class HelpLine
     desc = list[sel.to_i][0]
     cmd = list[sel][1]
 
+    Curses.move(lines,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|

data/lib/helpline/version.rb

@@ -1,3 +1,3 @@
 module Helpline
-  VERSION = "0.1.7"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 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