my_help 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7748831520dc7c031ae3a9896b230b3cac6ad2b
-  data.tar.gz: 84cd874af8c122770dfc8b05a340893769a920a1
+  metadata.gz: c300a6cf8118a5de14ad9a499ae09097da533f87
+  data.tar.gz: 213c929710cf37f80acf50a27a51a6932b5ce83f
 SHA512:
-  metadata.gz: 0f37baeda38f155012232fdef59801bee91af8f1ba07e90813a35745a6c226a60a0d0569f0a83fa96220aba97358f39819f3bed8fa22d1f8dd126b4285f0cb52
-  data.tar.gz: 3397b6059109407b2b24a6b7ed77d0d7d3462e814eff019d2a78f201f6e378efbd04ded5a940e6af6750775d34c19f462a90899b438a99c0ad83dba4e38944c9
+  metadata.gz: 8cf6f08dade31756b7155ed9eff41114b7aa868a8e9fe6725b7452835a8766c25e7ce8294ff5ff939080c521480a0f73ba44818ea2ff0f74fd2b8ea51feab696
+  data.tar.gz: 18daf94f375d54a5b10e956991248ac8bce6afda0a0071246e1d7cc988050b2e0f51b98a375bf06f0ec10e22f4cfb41fe450d35c370e0eabc1d8024a35025d08

data/Rakefile

@@ -59,13 +59,14 @@ task :my_help do
     p file
     p file_name=file.split('_')
     target_files = [file, file_name[0][0]+"_"+file_name[1][0]]
-    p cont_name = File.join(user_name,file)
-#    exe_cont << "require '#{cont_name}'\n"
+    p cont_name = File.join('lib',user_name,file)
     exe_cont << "require 'my_help'\n"
-    exe_cont << "EmacsHelp::Command.run(ARGV)\n"
+    exe_cont << "MyHelp::Command.run('#{cont_name}', ARGV)\n"
     target_files.each{|name|
+      p ''
       p target=File.join('exe',name)
       File.open(target,'w'){|file|
+        print exe_cont
         file.print exe_cont
       }
       FileUtils.chmod('a+x', target, :verbose => true)

data/exe/e_h

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'my_help'
-EmacsHelp::Command.run(ARGV)
+MyHelp::Command.run('lib/daddygongon/emacs_help', ARGV)

data/exe/emacs_help

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require 'my_help'
-EmacsHelp::Command.run(ARGV)
+MyHelp::Command.run('lib/daddygongon/emacs_help', ARGV)

data/lib/daddygongon/emacs_help

@@ -0,0 +1,100 @@
+---
+:head:
+- "\n  特殊キー操作\n"
+- "\tc-f, controlキーを押しながら    'f'\n"
+- "\t\tM-f, escキーを押した後一度離して'f'\n"
+- "\t操作の中断c-g, 操作の取り消し(Undo) c-x u \n"
+:cursor:
+  :opts:
+    :short: "-c"
+    :long: "--cursor"
+    :desc: Cursor移動
+  :title: |2-
+
+    カーソル移動cursor
+  :cont:
+  - c-f, move Forwrard,    前or右へ
+  - c-b, move Backwrard,   後or左へ
+  - c-a, go Ahead of line, 行頭へ
+  - c-e, go End of line,   行末へ
+  - c-n, move Next line,   次行へ
+  - c-p, move Previous line, 前行へ
+:page:
+  :opts:
+    :short: "-p"
+    :long: "--ページ"
+    :desc: Page移動
+  :title: |2-
+
+    ページ移動page
+  :cont:
+  - c-v, move Vertical,          次のページへ
+  - M-v, move reversive Vertical,前のページへ
+  - c-l, centerise Line,       現在行を中心に
+  - M-<, move Top of file,    ファイルの先頭へ
+  - M->, move Bottom of file, ファイルの最後尾へ
+:file:
+  :opts:
+    :short: "-f"
+    :long: "--ファイル"
+    :desc: File操作
+  :title: |2-
+
+    ファイル操作file
+  :cont:
+  - c-x c-f, Find file, ファイルを開く
+  - c-x c-s, Save file, ファイルを保存
+  - c-x c-w, Write file NAME, ファイルを別名で書き込む
+:edit:
+  :opts:
+    :short: "-e"
+    :long: "--編集"
+    :desc: Edit操作
+  :title: |2-
+
+    編集操作editor
+  :cont:
+  - c-d, Delete char, 一字削除
+  - c-k, Kill line,   一行抹消，カット
+  - c-y, Yank,        ペースト
+  - c-w, Kill region, 領域抹消，カット
+  - "領域選択は，先頭or最後尾でc-spaceした後，最後尾or先頭へカーソル移動"
+  - c-s, forward incremental Search WORD, 前へWORDを検索
+  - c-r, Reverse incremental search WORD, 後へWORDを検索
+  - M-x query-replace WORD1 <ret> WORD2：対話的置換(y or nで可否選択)
+:window:
+  :opts:
+    :short: "-w"
+    :long: "--ウィンドウ"
+    :desc: Window操作
+  :title: |2-
+
+    ウィンドウ操作window
+  :cont:
+  - c-x 2, 2 windows, 二つに分割
+  - c-x 1, 1 windows, 一つに戻す
+  - c-x 3, 3rd window sep,縦線分割
+  - c-x o, Other windows, 次の画面へ移動
+:buffer:
+  :opts:
+    :short: "-b"
+    :long: "--バッファ"
+    :desc: Buffer操作
+  :title: |2-
+
+    バッファー操作buffer
+  :cont:
+  - c-x b, show Buffer,   バッファのリスト
+  - c-x c-b, next Buffer, 次のバッファへ移動
+:quit:
+  :opts:
+    :short: "-q"
+    :long: "--終了"
+    :desc: "終了操作"
+  :title: |2-
+
+    終了操作quit
+  :cont:
+  - c-x c-c, Quit emacs, ファイルを保存して終了
+  - c-z, suspend emacs,  一時停止，fgで復活
+

data/lib/emacs_help.rb

@@ -1,20 +1,19 @@
 # -*- coding: utf-8 -*-
 require "optparse"
+require "yaml"
 require "emacs_help/version"
 
 module EmacsHelp
   class Command
+
     def self.run(argv=[])
-      print "\n特殊キー操作"
-      print "\tc-f, controlキーを押しながら    'f'\n"
-      print "\t\tM-f, escキーを押した後一度離して'f'\n"
-      print "\t操作の中断c-g, 操作の取り消し(Undo) c-x u \n"
       new(argv).execute
     end
 
     def initialize(argv=[])
+      @help_cont = YAML.load(File.read('lib/daddygongon/emacs_help'))
+      @help_cont[:head].each{|line| print line }
       @argv = argv
-      data_path = File.join(ENV['HOME'], '.hikirc')
     end
 
     def execute
@@ -24,13 +23,11 @@ module EmacsHelp
           opt.version = EmacsHelp::VERSION
           puts opt.ver
         }
-        opt.on('-c','--カーソル','Cursor移動') {cursor_move}
-        opt.on('-p','--ページ','Page移動') {page_move}
-        opt.on('-f','--ファイル','File操作') {file}
-        opt.on('-e','--編集','Edit操作') {edit}
-        opt.on('-w','--ウィンドウ','Window操作') {window}
-        opt.on('-b','--バッファ','Buffer操作') {buffer}
-        opt.on('-q','--終了','終了操作') {quit}
+        @help_cont.each_pair{|key,val|
+          next if key==:head
+          opts = val[:opts]
+          opt.on(opts[:short],opts[:long],opts[:desc]) {disp_from_help_cont(key)}
+        }
       end
       begin
         command_parser.parse!(@argv)
@@ -43,80 +40,17 @@ module EmacsHelp
     def disp(lines)
       lines.each{|line|
         if line.include?(',')
-          show line
+          puts "  #{line}"
         else
           puts "    #{line}"
         end
       }
     end
-    def show(line)
-      puts "  #{line}"
-    end
-
-    def quit
-      puts "\n終了操作quit"
-      cont = ["c-x c-c, Quit emacs, ファイルを保存して終了",
-              "c-z, suspend emacs,  一時停止，fgで復活"]
-      disp(cont)
-    end
-
-    def window
-      puts "\nウィンドウ操作window"
-      cont=["c-x 2, 2 windows, 二つに分割",
-            "c-x 1, 1 windows, 一つに戻す",
-            "c-x 3, 3rd window sep,縦線分割",
-            "c-x o, Other windows, 次の画面へ移動"]
-      disp(cont)
-    end
-
-    def buffer
-      puts "\nバッファー操作buffer"
-      cont =[ "c-x b, show Buffer,   バッファのリスト",
-              "c-x c-b, next Buffer, 次のバッファへ移動"]
-      disp(cont)
-    end
-
-    def edit
-      puts "\n編集操作editor"
-      cont = ["c-d, Delete char, 一字削除",
-              "c-k, Kill line,   一行抹消，カット",
-              "c-y, Yank,        ペースト",
-              "c-w, Kill region, 領域抹消，カット",
-              "領域選択は，先頭or最後尾でc-spaceした後，最後尾or先頭へカーソル移動",
-              "c-s, forward incremental Search WORD, 前へWORDを検索",
-              "c-r, Reverse incremental search WORD, 後へWORDを検索",
-              "M-x query-replace WORD1 <ret> WORD2：対話的置換(y or nで可否選択)"]
-      disp(cont)
-    end
-
-    def file
-      puts "\nファイル操作file"
-      cont =[ "c-x c-f, Find file, ファイルを開く",
-              "c-x c-s, Save file, ファイルを保存",
-              "c-x c-w, Write file NAME, ファイルを別名で書き込む"]
-      disp(cont)
-    end
-
-    def page_move
-      puts "\nページ移動page"
-      cont = ["c-v, move Vertical,          次のページへ",
-              "M-v, move reversive Vertical,前のページへ",
-              "c-l, centerise Line,       現在行を中心に",
-              "M-<, move Top of file,    ファイルの先頭へ",
-              "M->, move Bottom of file, ファイルの最後尾へ"]
-      disp(cont)
-    end
 
-    def cursor_move
-      puts "\nカーソル移動cursor"
-      cont = ["c-f, move Forwrard,    前or右へ",
-              "c-b, move Backwrard,   後or左へ",
-              "c-a, go Ahead of line, 行頭へ",
-              "c-e, go End of line,   行末へ",
-              "c-n, move Next line,   次行へ",
-              "c-p, move Previous line, 前行へ"]
-      disp(cont)
+    def disp_from_help_cont(key_word)
+      items =@help_cont[key_word]
+      puts items[:title]
+      disp(items[:cont])
     end
-
   end
 end

data/lib/my_help/version.rb

@@ -1,3 +1,3 @@
 module MyHelp
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/my_help.rb

@@ -1,6 +1,60 @@
+# -*- coding: utf-8 -*-
+require "optparse"
+require "yaml"
+require "emacs_help/version"
 require "my_help/version"
 require "emacs_help"
 
 module MyHelp
-  # Your code goes here...
+  class Command
+
+    def self.run(file,argv=[])
+      new(file, argv).execute
+    end
+
+    def initialize(file,argv=[])
+      @help_cont = YAML.load(File.read(file))
+#      @help_cont = YAML.load(File.read('lib/daddygongon/emacs_help'))
+      @help_cont[:head].each{|line| print line }
+      @argv = argv
+    end
+
+    def execute
+      @argv << '--help' if @argv.size==0
+      command_parser = OptionParser.new do |opt|
+        opt.on('-v', '--version','show program Version.') { |v|
+          opt.version = EmacsHelp::VERSION
+          puts opt.ver
+        }
+        @help_cont.each_pair{|key,val|
+          next if key==:head
+          opts = val[:opts]
+          opt.on(opts[:short],opts[:long],opts[:desc]) {disp_from_help_cont(key)}
+        }
+      end
+      begin
+        command_parser.parse!(@argv)
+      rescue=> eval
+        p eval
+      end
+      exit
+    end
+
+    def disp(lines)
+      lines.each{|line|
+        if line.include?(',')
+          puts "  #{line}"
+        else
+          puts "    #{line}"
+        end
+      }
+    end
+
+    def disp_from_help_cont(key_word)
+      items =@help_cont[key_word]
+      puts items[:title]
+      disp(items[:cont])
+    end
+  end
+
 end

data/my_help.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["shigeto_nishitani@me.com"]
 
   spec.summary       = %q{display emacs key bindings in Japanese.}
-  spec.description   = %q{Emulating CUI(CLI) help, user make and display his own help.}
+  spec.description   = %q{Emulating CUI(CLI) help, an user makes and displays his own helps.}
   spec.homepage      = "https://github.com/daddygongon/my_help"
   spec.license       = "MIT"
 
@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "hiki2md"
   spec.add_development_dependency "mathjax-yard"
   spec.add_development_dependency "hiki2latex"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shigeto R. Nishitani
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Emulating CUI(CLI) help, user make and display his own help.
+description: Emulating CUI(CLI) help, an user makes and displays his own helps.
 email:
 - shigeto_nishitani@me.com
 executables: