my_help 0.4.5 → 0.5.0

data/lib/specific_help.rb

@@ -5,6 +5,7 @@ require "my_help/version"
 require 'fileutils'
 require "coderay"
 require 'colorize'
+require 'my_help/org2yml'
 
 module SpecificHelp
   class Command
@@ -15,9 +16,28 @@ module SpecificHelp
 
     def initialize(file,argv=[])
       @source_file = file
-      @help_cont = YAML.load(File.read(file))
-      @help_cont[:head].each{|line| print line.chomp+"\n" } if @help_cont[:head] != nil
-      @help_cont[:license].each{|line| print "#{line.chomp}\n" } if @help_cont[:license] != nil
+      case File.extname(file)
+      when '.yml'
+        @help_cont = YAML.load(File.read(file))
+        @help_cont[:head].each{|line| print line.chomp+"\n" } if @help_cont[:head] != nil
+        @help_cont[:license].each{|line| print "#{line.chomp}\n" } if @help_cont[:license] != nil
+      when '.org'
+        @help_cont = OrgToYaml.new(file).help_cont
+        [:head,:license].each do |sym|
+          target = @help_cont[sym]
+          if target != nil
+            if target[:cont].kind_of?(Array)
+              target[:cont].each{|line| print line.chomp+"\n" }
+            else
+              print target[:cont]
+            end
+          else
+            @help_cont[sym] = sym.to_s
+          end
+        end
+      else
+        puts "Not apply on #{file}"
+      end
       @argv = argv
     end
 
@@ -40,21 +60,23 @@ module SpecificHelp
           opt.on(opts[:short],opts[:long],opts[:desc]) {disp_help(key)}
         }
 
-        opt.on('--edit','edit help contentsを開く'){edit_help}
-        opt.on('--to_hiki','hikiのformatに変更する'){to_hiki}
-        opt.on('--all','すべてのhelp画面を表示させる'){all_help}
-        opt.on('--store [item]','store [item] でback upをとる'){|item| store(item)}
-        opt.on('--remove [item]','remove [item] back upしてるlistを消去する'){|item| remove(item) } 
-        opt.on('--add [item]','add new [item]で新しいhelpを作る'){|item| add(item) }
-        opt.on('--backup_list [val]','back upしているlistを表示させる'){|val| backup_list(val)}
-
-#        opt.on('--edit','edit help contents'){edit_help}
-#        opt.on('--to_hiki','convert to hikidoc format'){to_hiki}
-#        opt.on('--all','display all helps'){all_help}
-#        opt.on('--store [item]','store [item] in backfile'){|item| store(item)}
-#        opt.on('--remove [item]','remove [item] and store in backfile'){|item| remove(item) }
-#        opt.on('--add [item]','add new [item]'){|item| add(item) }
-#        opt.on('--backup_list [val]','show last [val] backup list'){|val| backup_list(val)}
+        if ENV['LANG']=='C'
+          opt.on('--edit','edit help contents'){edit_help}
+          opt.on('--to_hiki','convert to hikidoc format'){to_hiki}
+          opt.on('--all','display all helps'){all_help}
+          opt.on('--store [item]','store [item] in backfile'){|item| store(item)}
+          opt.on('--remove [item]','remove [item] and store in backfile'){|item| remove(item) }
+          opt.on('--add [item]','add new [item]'){|item| add(item) }
+          opt.on('--backup_list [val]','show last [val] backup list'){|val| backup_list(val)}
+        else
+          opt.on('--edit','edit help contentsを開く'){edit_help}
+          opt.on('--to_hiki','hikiのformatに変更する'){to_hiki}
+          opt.on('--all','すべてのhelp画面を表示させる'){all_help}
+          opt.on('--store [item]','store [item] でback upをとる'){|item| store(item)}
+          opt.on('--remove [item]','remove [item] back upしてるlistを消去する'){|item| remove(item) }
+          opt.on('--add [item]','add new [item]で新しいhelpを作る'){|item| add(item) }
+          opt.on('--backup_list [val]','back upしているlistを表示させる'){|val| backup_list(val)}
+        end
 
       end
       begin
@@ -154,8 +176,12 @@ module SpecificHelp
     def all_help
       @help_cont.each_pair{|key,val|
         if key==:head or key==:license
-          val[0]+=":"
-          disp(val)
+          if val.kind_of?(Hash)
+            disp(val[:cont][0]+=":")
+          else
+            val[0]+=":"
+            disp(val)
+          end
         else
           disp_help(key)
         end
@@ -169,22 +195,23 @@ module SpecificHelp
     end
 
     def hiki_disp(lines)
-      lines.each{|line| puts "*#{line}"}  if lines != nil
+      lines.each{|line| puts "* #{line}"}  if lines != nil
     end
 
     def disp_help(key_word)
       print_separater
       items =@help_cont[key_word]
       puts items[:title].magenta
-#      puts CodeRay.scan("-#{items[:title]}:", :Taskpaper).term
       disp(items[:cont])
       print_separater
     end
 
     def disp(lines)
-#      lines.each{|line| puts "  +#{line}"} if lines != nil
-      lines.each{|line| puts "*#{line}".blue}
-#      lines.each{|line| puts CodeRay.scan("+#{line}", :Taskpaper).term}
+      if lines.kind_of?(Array)
+        lines.each{|line| puts "* #{line}".blue}
+      else
+        print lines
+      end
     end
 
     def print_separater

data/lib/{specific_help.rb~ → specific_help_bu.rb}

@@ -4,67 +4,35 @@ require "yaml"
 require "my_help/version"
 require 'fileutils'
 require "coderay"
+require 'colorize'
+require "thor"
 
 module SpecificHelp
-  class Command
-
-    def self.run(file,argv=[])
-      new(file, argv).execute
-    end
-
-    def initialize(file,argv=[])
-      @source_file = file
-      @help_cont = YAML.load(File.read(file))
+  class Command < Thor
+=begin
+    def self.start(file,*args)
+      new(file, *args).execute
+    end
+=end
+
+    def initialize(*args)
+      super
+      puts "@initialize\n"
+#      file = File.join(ENV['HOME'],'.my_help','test_help.yml'
+#      @source_file = file
+      @source_file = File.join(ENV['HOME'],'.my_help','test_help.yml')
+#      file = "/Users/OyagiToshiharu/.my_help/test_help.yml"
+#      @source_file = file
+
+      @help_cont = YAML.load(File.read(@source_file))
       @help_cont[:head].each{|line| print line.chomp+"\n" } if @help_cont[:head] != nil
       @help_cont[:license].each{|line| print "#{line.chomp}\n" } if @help_cont[:license] != nil
-      @argv = argv
+      @argv = *args
     end
 
-    def execute
-      if @argv.size==0
-        if @source_file.include?('todo')
-          @argv << '--all'
-        else
-          @argv << '--help'
-        end
-      end
-      command_parser = OptionParser.new do |opt|
-        opt.on('-v', '--version','show program Version.') { |v|
-          opt.version = MyHelp::VERSION
-          puts opt.ver
-        }
-        @help_cont.each_pair{|key,val|
-          next if key==:head or key==:license
-          opts = val[:opts]
-          opt.on(opts[:short],opts[:long],opts[:desc]) {disp_help(key)}
-        }
-
-        opt.on('--edit','edit help contentsを開く'){edit_help}
-        opt.on('--to_hiki','hikiのformatに変更する'){to_hiki}
-        opt.on('--all','すべてのhelp画面を表示させる'){all_help}
-        opt.on('--store [item]','store [item] でback upをとる'){|item| store(item)}
-        opt.on('--remove [item]','remove [item] back upしてるlistを消去する'){|item| remove(item) } 
-        opt.on('--add [item]','add new [item]で新しいhelpを作る'){|item| add(item) }
-        opt.on('--backup_list [val]','back upしているlistを表示させる'){|val| backup_list(val)}
-
-#        opt.on('--edit','edit help contents'){edit_help}
-#        opt.on('--to_hiki','convert to hikidoc format'){to_hiki}
-#        opt.on('--all','display all helps'){all_help}
-#        opt.on('--store [item]','store [item] in backfile'){|item| store(item)}
-#        opt.on('--remove [item]','remove [item] and store in backfile'){|item| remove(item) }
-#        opt.on('--add [item]','add new [item]'){|item| add(item) }
-#        opt.on('--backup_list [val]','show last [val] backup list'){|val| backup_list(val)}
-
-      end
-      begin
-        command_parser.parse!(@argv)
-      rescue=> eval
-        p eval
-      end
-      exit
-    end
-
-    def backup_list(val)
+    desc 'backup NAME, --backup NAME','backup NAME help'
+    map "--backup" => "backup"
+    def backup(val)
       val = val || 10
       print "\n ...showing last #{val} stored items in backup.\n"
       backup=mk_backup_file(@source_file)
@@ -81,14 +49,8 @@ module SpecificHelp
       }
     end
 
-    def mk_backup_file(file)
-      path = File.dirname(file)
-      base = File.basename(file)
-      backup= File.join(path,"."+base)
-      FileUtils.touch(backup) unless File.exists?(backup)
-      return backup
-    end
-
+    desc 'store NAME, --store','store NAME help'
+    map "--store" => "store"
     def store(item)
       if item==nil
         print "spcify --store [item].\n"
@@ -112,6 +74,8 @@ module SpecificHelp
       File.open(backup,'w'){|file| file.print(YAML.dump(backup_cont))}
     end
 
+    desc 'add NAME, --add NAME','add NAME help'
+    map "--add" => "add"
     def add(item='new_item')
       print "Trying to add #{item}\n"
       new_item={:opts=>{:short=>'-'+item[0], :long=>'--'+item, :desc=>item},
@@ -120,6 +84,8 @@ module SpecificHelp
       File.open(@source_file,'w'){|file| file.print YAML.dump(@help_cont)}
     end
 
+    desc 'remove NAME, --remove NAME','remove NAME help'
+    map "--remove" => "remove"
     def remove(item)
       print "Trying to remove #{item}\n"
       store(item)
@@ -127,7 +93,10 @@ module SpecificHelp
       File.open(@source_file,'w'){|file| file.print YAML.dump(@help_cont)}
     end
 
-    def edit_help
+    desc 'edit, --edit','edit help'
+    map "--edit" => "edit"
+    def edit
+      puts "@edit\n"
       p help_file =@source_file
       begin
         p command= "emacs #{help_file}"
@@ -140,7 +109,9 @@ module SpecificHelp
       end
     end
 
-    def to_hiki
+    desc 'hiki, --hiki','hiki help'
+    map "--hiki" => "hiki"
+    def hiki
       @help_cont.each_pair{|key,val|
         if key==:head or key==:license
           hiki_disp(val)
@@ -150,7 +121,9 @@ module SpecificHelp
       }
     end
 
-    def all_help
+    desc 'all, --all','all help'
+    map "--all" => "all"
+    def all
       @help_cont.each_pair{|key,val|
         if key==:head or key==:license
           val[0]+=":"
@@ -161,33 +134,100 @@ module SpecificHelp
       }
     end
 
-    def hiki_help(key_word)
-      items =@help_cont[key_word]
-      puts "\n!!"+items[:title]+"\n"
-      hiki_disp(items[:cont])
-    end
+    no_commands do
 
-    def hiki_disp(lines)
-      lines.each{|line| puts "*#{line}"}  if lines != nil
-    end
+      def mk_backup_file(file)
+        path = File.dirname(file)
+        base = File.basename(file)
+        backup= File.join(path,"."+base)
+        FileUtils.touch(backup) unless File.exists?(backup)
+        return backup
+      end
 
-    def disp_help(key_word)
-      print_separater
-      items =@help_cont[key_word]
-#      puts items[:title]
-      puts CodeRay.scan("-#{items[:title]}:", :Taskpaper).term
-      disp(items[:cont])
-      print_separater
-    end
+      def hiki_help(key_word)
+        items =@help_cont[key_word]
+        puts "\n!!"+items[:title]+"\n"
+        hiki_disp(items[:cont])
+      end
 
-    def disp(lines)
-#      lines.each{|line| puts "  +#{line}"} if lines != nil
-#      lines.each{|line| puts CodeRay.scan("*#{line}", :diff).term}
-      lines.each{|line| puts CodeRay.scan("+#{line}", :Taskpaper).term}
-    end
+      def hiki_disp(lines)
+        lines.each{|line| puts "*#{line}"}  if lines != nil
+      end
+
+      def disp_help(key_word)
+        print_separater
+        items =@help_cont[key_word]
+        puts items[:title].magenta
+        #      puts CodeRay.scan("-#{items[:title]}:", :Taskpaper).term
+        disp(items[:cont])
+        print_separater
+      end
 
-    def print_separater
-      print "---\n"
+      def disp(lines)
+        #      lines.each{|line| puts "  +#{line}"} if lines != nil
+        lines.each{|line| puts "*#{line}".blue}
+        #      lines.each{|line| puts CodeRay.scan("+#{line}", :Taskpaper).term}
+      end
+      
+      def print_separater
+        print "---\n"
+      end
+
+=begin
+    def execute
+      puts "@execute\n"
+      if @argv.size==0
+        if @source_file.include?('todo')
+          @argv << '--all'
+        else
+          @argv << '--help'
+        end
+      end
+=end
+=begin
+      command_parser = OptionParser.new do |opt|
+        opt.on('-v', '--version','show program Version.') { |v|
+          opt.version = MyHelp::VERSION
+          puts opt.ver
+        }
+
+
+        @help_cont.each_pair{|key,val|
+          next if key==:head or key==:license
+          opts = val[:opts]
+          opt.on(opts[:short],opts[:long],opts[:desc]) {disp_help(key)}
+        }
+=end
+=begin
+        if ENV['LANG']=='C'
+          opt.on('--edit','edit help contents'){edit_help}
+          opt.on('--to_hiki','convert to hikidoc format'){to_hiki}
+          opt.on('--all','display all helps'){all_help}
+          opt.on('--store [item]','store [item] in backfile'){|item| store(item)}
+          opt.on('--remove [item]','remove [item] and store in backfile'){|item| remove(item) }
+          opt.on('--add [item]','add new [item]'){|item| add(item) }
+          opt.on('--backup_list [val]','show last [val] backup list'){|val| backup_list(val)}
+        else
+          opt.on('--edit','edit help contentsを開く'){edit_help}
+          opt.on('--to_hiki','hikiのformatに変更する'){to_hiki}
+          opt.on('--all','すべてのhelp画面を表示させる'){all_help}
+          opt.on('--store [item]','store [item] でback upをとる'){|item| store(item)}
+          opt.on('--remove [item]','remove [item] back upしてるlistを消去する'){|item| remove(item) }
+          opt.on('--add [item]','add new [item]で新しいhelpを作る'){|item| add(item) }
+          opt.on('--backup_list [val]','back upしているlistを表示させる'){|val| backup_list(val)}
+        end
+=end
+=begin
+      end
+      begin
+        command_parser.parse!(@argv)
+      rescue=> eval
+        p eval
+      end
+=end
+#      exit
+#    end
     end
   end
 end
+

data/lib/specific_help_opt.rb

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+require "optparse"
+require "yaml"
+require "my_help/version"
+require 'fileutils'
+require "coderay"
+require 'colorize'
+
+module SpecificHelpOpt
+  class Command
+    def self.run(file,argv=[])
+      new(file, argv).execute
+    end
+
+    def initialize(file,argv=[])
+      @source_file = file
+      @help_cont = YAML.load(File.read(file))
+#      @help_cont[:head].each{|line| print line.chomp+"\n" } if @help_cont[:head] != nil
+#      @help_cont[:license].each{|line| print "#{line.chomp}\n" } if @help_cont[:license] != nil
+       @argv = argv
+    end
+
+    def execute
+      if @argv.size==0
+        if @source_file.include?('todo')
+          @argv << '--all'
+        else
+          @argv << '--help'
+        end
+      end
+
+      command_parser = OptionParser.new do |opt|
+        opt.on('-v', '--version','show program Version.') { |v|
+          opt.version = MyHelp::VERSION
+          puts opt.ver
+        }
+        @help_cont.each_pair{|key,val|
+          next if key==:head or key==:license
+          opts = val[:opts]
+          opt.on(opts[:short],opts[:long],opts[:desc]) {disp_help(key)}
+        }
+      end
+      begin
+        command_parser.parse!(@argv)
+      rescue=> eval
+        p eval
+      end
+
+      end
+    
+    def disp_help(key_word)
+      print_separater
+      items =@help_cont[key_word]
+      puts items[:title].magenta
+      #      puts CodeRay.scan("-#{items[:title]}:", :Taskpaper).term
+      disp(items[:cont])
+      print_separater
+    end
+    
+    def disp(lines)
+        #      lines.each{|line| puts "  +#{line}"} if lines != nil
+      lines.each{|line| puts "*#{line}".blue}
+      #      lines.each{|line| puts CodeRay.scan("+#{line}", :Taskpaper).term}
+    end
+    
+    def print_separater
+        print "---\n"
+    end
+  end
+end
+

data/lib/specific_help_thor.rb

@@ -0,0 +1,172 @@
+# -*- coding: utf-8 -*-
+require "optparse"
+require "yaml"
+require "my_help/version"
+require 'fileutils'
+require "coderay"
+require 'colorize'
+require "thor"
+
+module SpecificHelp
+  class Command < Thor
+#    def self.start(file,*args)
+ #       new(file,*args).execute
+  #  end
+    def initialize(*args)
+      super
+#      p ENV['HELP_NAME']
+      file=File.join(ENV['HOME'],'.my_help',"#{ENV['HELP_NAME']}.yml")
+      puts "@initialize\n"
+
+      @source_file = file
+      @help_cont = YAML.load(File.read(@source_file))
+      @help_cont[:head].each{|line| print line.chomp+"\n" } if @help_cont[:head] != nil
+      @help_cont[:license].each{|line| print "#{line.chomp}\n" } if @help_cont[:license] != nil
+      @argv = *args
+    end
+
+    desc 'backup NAME, --backup NAME','backup NAME help'
+    map "--backup" => "backup"
+    def backup(val)
+      val = val || 10
+      print "\n ...showing last #{val} stored items in backup.\n"
+      backup=mk_backup_file(@source_file)
+      File.open(backup,'r'){|file|
+        backup_cont = YAML.load(File.read(backup))
+        backup_size = backup_cont.size
+        backup_size = backup_size>val.to_i ? val.to_i : backup_size
+        backup_keys = backup_cont.keys
+        backup_keys.reverse.each_with_index{|item,i|
+          break if i>=backup_size
+          line = item.to_s.split('_')
+          printf("%10s : %8s%8s\n",line[0],line[1],line[2])
+        }
+      }
+    end
+
+    desc 'store NAME, --store','store NAME help'
+    map "--store" => "store"
+    def store(item)
+      if item==nil
+        print "spcify --store [item].\n"
+        exit
+      else
+        print "Trying to store #{item}\n"
+      end
+      backup=mk_backup_file(@source_file)
+      unless store_item = @help_cont[item.to_sym] then
+        print "No #{item} in this help.  The items are following...\n"
+        keys = @help_cont.keys
+        keys.each{|key|
+          p key
+        }
+        exit
+      end
+      p store_name = item+"_"+Time.now.strftime("%Y%m%d_%H%M%S")
+      cont = {store_name.to_sym => store_item}
+      backup_cont=YAML.load(File.read(backup)) || {}
+      backup_cont[store_name.to_sym]=store_item
+      File.open(backup,'w'){|file| file.print(YAML.dump(backup_cont))}
+    end
+
+    desc 'add NAME, --add NAME','add NAME help'
+    map "--add" => "add"
+    def add(item='new_item')
+      print "Trying to add #{item}\n"
+      new_item={:opts=>{:short=>'-'+item[0], :long=>'--'+item, :desc=>item},
+          :title=>item, :cont=> [item]}
+      @help_cont[item.to_sym]=new_item
+      File.open(@source_file,'w'){|file| file.print YAML.dump(@help_cont)}
+    end
+    
+    desc 'remove NAME, --remove NAME','remove NAME help'
+    map "--remove" => "remove"
+    def remove(item)
+      print "Trying to remove #{item}\n"
+      store(item)
+      @help_cont.delete(item.to_sym)
+      File.open(@source_file,'w'){|file| file.print YAML.dump(@help_cont)}
+    end
+    
+    desc 'edit, --edit','edit help'
+    map "--edit" => "edit"
+    def edit
+      puts "@edit\n"
+      p help_file =@source_file
+      begin
+        p command= "emacs #{help_file}"
+        exec command
+      rescue => e
+        print "\nOption edit is not executable on windows. \n"
+        print "Type the following shell command;\n\n"
+        print "emacs /home/#{ENV['USER']}/.my_help/#{File.basename(@source_file)}\n\n"
+        print "M-x ruby-mode should be good for edit.\n"
+      end
+    end
+    
+    desc 'hiki, --hiki','hiki help'
+    map "--hiki" => "hiki"
+    def hiki
+      @help_cont.each_pair{|key,val|
+        if key==:head or key==:license
+          hiki_disp(val)
+        else
+          hiki_help(key)
+        end
+      }
+    end
+
+    desc 'all, --all','all help'
+    map "--all" => "all"
+    def all
+      @help_cont.each_pair{|key,val|
+        if key==:head or key==:license
+          val[0]+=":"
+          disp(val)
+        else
+          disp_help(key)
+        end
+      }
+    end
+
+    no_commands do
+
+      def mk_backup_file(file)
+        path = File.dirname(file)
+        base = File.basename(file)
+        backup= File.join(path,"."+base)
+        FileUtils.touch(backup) unless File.exists?(backup)
+        return backup
+      end
+
+      def hiki_help(key_word)
+        items =@help_cont[key_word]
+        puts "\n!!"+items[:title]+"\n"
+        hiki_disp(items[:cont])
+      end
+
+      def hiki_disp(lines)
+        lines.each{|line| puts "*#{line}"}  if lines != nil
+      end
+
+      def disp_help(key_word)
+        print_separater
+        items =@help_cont[key_word]
+        puts items[:title].magenta
+        #      puts CodeRay.scan("-#{items[:title]}:", :Taskpaper).term
+        disp(items[:cont])
+        print_separater
+      end
+
+      def disp(lines)
+        #      lines.each{|line| puts "  +#{line}"} if lines != nil
+        lines.each{|line| puts "*#{line}".blue}
+        #      lines.each{|line| puts CodeRay.scan("+#{line}", :Taskpaper).term}
+      end
+      
+      def print_separater
+        print "---\n"
+      end
+    end
+  end
+end