helpline 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267bd0196064dc182896a4e031db4da50a354117d670459f4fd25a8f3fd966b3
-  data.tar.gz: 50b312aa455fe920fcbb3ebbc883730dcb61776d1ddf31e696134be0c604fc40
+  metadata.gz: 3e2b93dc79e46d3eeb5f2867f20f42d1e188aecf6e81128b9819d01f97e65132
+  data.tar.gz: 18d0062e75b35b3dc88ca362818928e2ba456996fd1dd48a3383a5ba1c0a8ac4
 SHA512:
-  metadata.gz: 7d1319a55f1202a129871688f9132ec099cf8b7ad1c4a4002f6c566cea53d9db005d2b96ca2d870a947c364fea5f58304026c52f1bf9e0d88a1f529ebc27f932
-  data.tar.gz: 3cd64a1e71c308f4358c6ebee71101e05345c017bfcefc617bfdba92cff75213534c73cd7d42dc9702e7adc6f28359c31a62ca523880cec5cf8b4590239985b1
+  metadata.gz: 6610decc65beb0c5bbfd1a05075ed6e77f4f0ab18a96ae6f6c9c7584d145ce27499f1c318679a083ca1105a52d8ebac855c04398dc8f9e62722cbb940e6510d4
+  data.tar.gz: ae28a2b29a2aa21a06e758ecd38fa280411f3f62ea38bb070c9cc63bb3f6b3e5fbfe015fc180264666b0557978c932c210c45a34731dd50457ee6c64c88a5f8b

data/.gitignore

@@ -5,3 +5,6 @@ build/
 package-lock.json
 *.dmg
 *_browserify.js
+pkg/
+
+Gemfile.lock

data/00README

@@ -0,0 +1 @@
+Electron版(JS)とRuby版(gem版)が一緒になっているので良くない...

data/exe/helpline

@@ -8,7 +8,7 @@ require 'scrapbox'
 require 're_expand'
 
 require 'io/console'
-require './curses'
+require 'helpline/curses'
 
 puts
 
@@ -16,7 +16,7 @@ class HelpLine
   LINES = 12
     
   def datafile
-    File.expand_path("~/.helpline")
+    File.expand_path("~/.helpline.json")
   end
   
   def initialize
@@ -149,7 +149,7 @@ class HelpLine
 
     if res[0].length == 0
       puts "ヘルプがみつかりません"
-      File.open("/tmp/helpline","w"){ |f|
+      File.open("/tmp/helpline.cmd","w"){ |f|
         f.puts ARGV.join(' ')
       }
       exit
@@ -188,17 +188,17 @@ class HelpLine
       # process ESC
       elsif inputchars[0] == "\e" && inputchars.length == 2
       # 何もしない
-      elsif inputchars == "\x06" || inputchars == "\e[C"
+      elsif inputchars == "\x06" || inputchars == "\e[C" || inputchars == "\eOC"
         #  Curses.right
         inputchars = ''
-      elsif inputchars == "\x02" || inputchars == "\e[D"
+      elsif inputchars == "\x02" || inputchars == "\e[D" || inputchars == "\eOD"
         #  Curses.left
         inputchars = ''
-      elsif inputchars == "\x0e" || inputchars == "\e[B"
+      elsif inputchars == "\x0e" || inputchars == "\e[B" || inputchars == "\eOB"
         Curses.down
         sel = (sel + 1) if sel < LINES-1
         inputchars = ''
-      elsif inputchars == "\x10" || inputchars == "\e[A"
+      elsif inputchars == "\x10" || inputchars == "\e[A" || inputchars == "\eOA"
         Curses.up
         sel = sel - 1 if sel > 0
         inputchars = ''

data/helpline.gemspec

@@ -14,15 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://masui.github.io/HelpLine/"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  #else
-  #  raise "RubyGems 2.0 or newer is required to protect against " \
-  #    "public gem pushes."
-  #end
-
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -33,4 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+
+  spec.add_runtime_dependency "re_expand"
+  spec.add_runtime_dependency "scrapbox"
 end

data/keydef.zsh

@@ -1,8 +1,9 @@
 #
-# Ctrl-Hでhelplineを呼ぶようにする
+# Ctrl-Jでhelplineを呼ぶようにする
 #
 function run-help() {
-    BUFFER=$(/Applications/HelpLine.app/Contents/MacOS/helpline "${BUFFER}")
+    /usr/local/bin/helpline "${BUFFER}" < $TTY
+    BUFFER=$(cat /tmp/helpline.cmd)
     CURSOR=${#BUFFER}
     zle redisplay
 }

data/{curses.rb → lib/helpline/curses.rb}

@@ -1,4 +1,7 @@
-
+#
+# カーソル移動ライブラリ
+# cursesを使うほどではないので
+#
 
 # ESC [ Pl A
 # カーソルをPl行上へ移動

data/lib/helpline/version.rb

@@ -1,3 +1,3 @@
 module Helpline
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helpline
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Toshiyuki Masui
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: re_expand
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: scrapbox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HelpLine - show command help menu from keywords, using ExpandHelp.
 email:
 - masui@pitecan.com
@@ -61,13 +89,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- 00README
 - Gemfile
 - LICENSE.txt
 - Makefile
 - README.md
 - Rakefile
 - _config.yml
-- curses.rb
 - data.js
 - exe/helpline
 - getdata.rb
@@ -77,10 +105,10 @@ files:
 - helpline.gemspec
 - helpline.html
 - helpline.js
-- helpline.rb
 - index.html
 - keydef.zsh
 - lib/helpline.rb
+- lib/helpline/curses.rb
 - lib/helpline/version.rb
 - main.js
 - package.json

data/helpline.rb

@@ -1,248 +0,0 @@
-#!/usr/bin/env ruby
-# -*- ruby -*-
-
-require 'json'
-require 'optparse'
-
-require 'scrapbox'
-require 're_expand'
-
-require 'io/console'
-require './curses'
-
-puts
-
-class HelpLine
-  LINES = 12
-    
-  def datafile
-    File.expand_path("~/.helpline")
-  end
-  
-  def initialize
-    @pagedata = {}
-    @project = Scrapbox::Project.new("HelpLine")
-  end
-
-  def getdata
-    #
-    # ページデータ取得
-    #
-    puts "-----------------ページデータを取得"
-    @project.pages.each { |title,page|
-      puts "...#{title}"
-      @pagedata[title] = page.text.split(/\n/)
-    }
-
-    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)
-        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
-          else
-            next
-          end
-        end
-        if line =~ /^\s*[\$\%]/
-          puts line
-          if line =~ /^\%/ && !processing_defs
-            puts "'$'で始まる用例定義なしでコマンドを定義しようとしています"
-            exit
-          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
-    }
-  end
-
-  def disp(list,sel)
-    Curses.move(0,0)
-    lines = list.length
-    lines = LINES if lines > LINES
-    (0...lines).each { |i|
-      Curses.move(i,0)
-      s = "[#{i}] #{list[i][0]}"
-      if i == sel
-        Curses.print_inverse s
-      else
-        Curses.print s
-      end
-    }
-    Curses.down
-    Curses.tol
-  end
-  
-  def helpline
-    data = JSON.parse(File.read(datafile))
-    unless data['pages'] # データ型式変換があったので
-      getdata
-      data = JSON.parse(File.read(datafile))
-    end
-
-    #
-    # 関数定義などをeval
-    #
-    data['codes'].each { |code|
-      eval code
-    }
-
-    g = ExpandRuby::Generator.new # re_expandのジェネレータ
-
-    #
-    # HelpLineエントリ
-    #
-    lines = []
-    data['defs'].each { |line|
-      if line =~ /^\s*\$\s*(.*)$/ # $....
-        lines << $1
-      elsif line =~ /^\s*\%\s*(.*)$/ # %....
-        cmd = $1
-        lines.each { |l|
-          desc = eval('"' + l + '"')
-          g.add desc.force_encoding('utf-8'), cmd.force_encoding('utf-8')
-        }
-        lines = []
-      end
-    }
-
-    # puts "GENERATE #{params.split('|').join(' ')} "
-
-    res = g.generate " #{ARGV.join(' ').sub(/\[/,'').sub(/\]/,'')} "
-
-    if res[0].length == 0
-      puts "ヘルプがみつかりません"
-      File.open("/tmp/helpline","w"){ |f|
-        f.puts ARGV.join(' ')
-      }
-      exit
-    end
-
-    listed = {}
-    list = res[0].find_all { |a| # 0 ambig
-      # a = ["現在の状況を表示する {56}", "git status {56}"], etc.
-      if listed[a[1]]
-        false
-      else
-        listed[a[1]] = true
-      end
-    }
-
-    #
-    # HelpLineメニュー表示し、カーソル移動で選択
-    #
-    
-    help_number = {}
-    list.each_with_index { |entry,ind|
-      entry[0].sub!(/\s*{(\d*)}$/,'')
-      entry[1].sub!(/\s*{(\d*)}$/,'')
-      help_number[entry[0]] = $1.to_i
-    }
-
-    sel = 0
-    disp(list,sel)
-    
-    inputchars = ''
-    while true
-      c = STDIN.getch
-      inputchars += c
-      
-      if inputchars == "\e"
-      # process ESC
-      elsif inputchars[0] == "\e" && inputchars.length == 2
-      # 何もしない
-      elsif inputchars == "\x06" || inputchars == "\e[C"
-        #  Curses.right
-        inputchars = ''
-      elsif inputchars == "\x02" || inputchars == "\e[D"
-        #  Curses.left
-        inputchars = ''
-      elsif inputchars == "\x0e" || inputchars == "\e[B"
-        Curses.down
-        sel = (sel + 1) if sel < LINES-1
-        inputchars = ''
-      elsif inputchars == "\x10" || inputchars == "\e[A"
-        Curses.up
-        sel = sel - 1 if sel > 0
-        inputchars = ''
-      else
-        inputchars = ''
-      end
-      STDIN.flush
-      disp(list,sel)
-      
-      exit if c== 'q' || c == "\x03"
-
-      if c == "\r" || c == "\n"
-        break
-      end
-    end
-
-    desc = list[sel.to_i][0]
-    cmd = list[sel][1]
-
-    Curses.print_inverse("「#{desc}」を実行")
-    puts " (ソース: http://scrapbox.io/HelpLine/#{data['pages'][help_number[desc]]})"
-    File.open("/tmp/helpline","w"){ |f|
-      f.puts cmd
-    }
-  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('u')
-
-helpline = HelpLine.new
-
-if !File.exist?(helpline.datafile) && !options['u']
-  puts "#{helpline.datafile}を作成します..."
-  helpline.getdata
-end
-  
-if options['u'] then
-  helpline.getdata
-else  
-  helpline.helpline
-end