my_help 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e9fbb25c42b30265ba6c9fa88f47db9ac984a7
-  data.tar.gz: db31a83a6d0fe0a631ae2f9ca80f02dbe2a654bb
+  metadata.gz: aa420fa4ea82a71a6820c504a4d877a4b337cd73
+  data.tar.gz: 6c213383e6361373051e40abfc1d0f88bff5eb63
 SHA512:
-  metadata.gz: 6326c44722969f0cbdf6969e044ca7603af7f46d56d91bedc1e479d240be542bc833e91299618a1101f96220e7045528f4f7fd9d3332498d316254044e10fe1a
-  data.tar.gz: be884e7ee9e5c6f15e7f89a4b7312e5ebcd3c66270d5630519974246926c0c9df8180d90ee61c51a11efeee5488196b812743d7bc18b388c12ea053a728de2e3
+  metadata.gz: 28c61a91b148e02b0584979c08db0c5220d96f97a99c2cb1bb51a1748d1b8288fc7b456a917f1dc62cd8a227293c582b0380b258c1256aaf4528cf9a28abd27f
+  data.tar.gz: e8b8fad0b2306d93ac6d62f373709f12364001b0e61c2bbb2ffd598148e68cf5414e77159ac3ff61a27306c08bfb1d8981ae4a1868281d2ec8e20b89642e0a44

data/Rakefile

@@ -47,7 +47,7 @@ task :clean_exe do
   files = Dir.entries('exe')
   files.each{|file|
     next if ["my_help",".","..",".DS_Store",
-             "emacs_help","e_h","git_help"].include?(file)
+             "emacs_help","e_h","todo_help"].include?(file)
     FileUtils.rm(File.join('./exe',file), :verbose=>true)
   }
 end

data/lib/daddygongon/todo_help.yml

@@ -16,27 +16,17 @@
   - "[sudo] gem uninstall my_help"
   - "自分[hogehoge]のgithubにある古いmy_helpをdelete"
   - "Fork from https://github.com/daddygongon/my_help"
+  - "[sudo] rm -rf my_help"
   - "git clone git@github.com:[hogehoge]/my_help.git"
   - "cd my_help"
+  - "rake to_yml"
   - "[sudo] bundle exec exe/my_help -c"
   - "[sudo] bundle exec exe/my_help -m"
   - "新しいterminalを開ける"
   - "my_help -l"
-
-:restart: #text here too
-  :opts:
-    :short: -r
-    :long: --restart
-    :desc: 新しいhelpをmake
-  :title: "my_helpのinstall"
-  :cont:
-  - "[sudo] gem uninstall my_help"
-  - "cd my_help"
-  - "[sudo] bundle exec exe/my_help -c"
-  - "[sudo] bundle exec exe/my_help -m"
-  - "could not find expected ':' while scanning a ...がでたら"
-  - "rm ~/.my_help/template_helpを試す"
-  - "あるいはemacs ~/.my_help/template_helpでyamlを修正"
+  - "rake add_yml"
+  - "--editで編集画面を開けてみて，色が付いてなかったら，"
+  - "mv ~/.emacs ~/.emacs.d/init.elを試してみる"
 
 :make: #text here too
   :opts:

data/lib/my_help/version.rb

@@ -1,3 +1,3 @@
 module MyHelp
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/my_help.rb

@@ -109,7 +109,7 @@ module MyHelp
 
     def clean_exe
       local_help_entries.each{|file|
-        next if ['emacs_help','e_h','todo_help','git_help'].include?(file)
+        next if ['emacs_help','e_h','todo_help','todo_help'].include?(file)
         file = File.basename(file,'.yml')
         [file, short_name(file)].each{|name|
           p target=File.join('exe',name)
@@ -130,7 +130,7 @@ module MyHelp
 
     def edit_help(file)
       p target_help=File.join(@local_help_dir,file)
-      system "emacs #{target_help}"
+      system "emacs #{target_help}.yml"
     end
 
     def local_help_entries
@@ -147,8 +147,16 @@ module MyHelp
       print "Specific help file:\n"
       local_help_entries.each{|file|
         file_path=File.join(@local_help_dir,file)
-        help = YAML.load(File.read(file_path))
         file = File.basename(file,'.yml')
+        begin
+          help = YAML.load(File.read(file_path))
+        rescue=> eval
+          p eval
+          print "\n YAML load error in #{file}."
+          print "  See the line shown above and revise by\n"
+          print "  emacs #{file_path}\n"
+          exit
+        end
         print "  #{file}\t:#{help[:head][0]}\n"
       }
     end

data/lib/specific_help.rb

@@ -43,15 +43,33 @@ module SpecificHelp
         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
-#      begin
-      command_parser.parse!(@argv)
-#      rescue=> eval
-#       p eval
-#      end
       exit
     end
 
+    def backup_list(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
+
     def mk_backup_file(file)
       path = File.dirname(file)
       base = File.basename(file)
@@ -61,14 +79,24 @@ module SpecificHelp
     end
 
     def store(item)
+      print "Trying to store #{item}\n"
       backup=mk_backup_file(@source_file)
-      store_item = @help_cont[item.to_sym]
+      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}
-      File.open(backup,'a'){|file| file.print(YAML.dump(cont))}
+      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
 
     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
@@ -76,6 +104,7 @@ module SpecificHelp
     end
 
     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)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-20 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,6 @@ email:
 executables:
 - e_h
 - emacs_help
-- git_help
 - my_help
 extensions: []
 extra_rdoc_files: []
@@ -146,7 +145,6 @@ files:
 - bin/setup
 - exe/e_h
 - exe/emacs_help
-- exe/git_help
 - exe/my_help
 - hikis/README_en.hiki
 - hikis/README_ja.hiki

data/exe/git_help

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'specific_help'
-help_file = File.join(ENV['HOME'],'.my_help','git_help.yml')
-SpecificHelp::Command.run(help_file, ARGV)