my_help 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d61f06babc7a337d682b36c7a5247574376af2
-  data.tar.gz: 81166728a653450f8af97f33141ccacf8fa0f13b
+  metadata.gz: 839a696209b23c64ee3e55a4c2af4efa3079df43
+  data.tar.gz: 3a23e3580942ed5eba481be1df105bc0c806cb41
 SHA512:
-  metadata.gz: 4c68fc3a49c482cff6f780e831a5e0539ea88c3feaca6133a6a60490a094dadd752d91cbd21ddf2cb6e68213d3238802a6e0c3fb5fc14791afb0e8925983a9aa
-  data.tar.gz: 0ea1fc9af2aff6a01e9f7ae4abad906057df950cefc897cc77da248ece179947b99cebea3f4d90e984e7f5b647eae19745ab4a2d226b2b0091c99f6bdb912520
+  metadata.gz: df1c06928b11be234f42fab1e875043547eeaa8db7f5ffa6c2979ac557f72fc826b656b3a4728de0b250ff44d3348d564aef4a826478157b093440fa29082b45
+  data.tar.gz: 17a2637f6727e5bba3e9313a49944bda1b9f4e930b3a9710c39a3b3e34d382f101fb5ba6de62d1144b989a015b2be173da5ea49f0deabec1acac045f2266e01f

data/.ruby-version

@@ -1 +1 @@
-2.4.3
+system

data/README.org

@@ -471,6 +471,9 @@ Removing template_help Successfully uninstalled my_help-0.3.2 ```
 
 clean_exeは，githubへuploadする時に，開発者個人のexeファイルをrmして整頓する．
 * development memo
+** <2018-03-14 Wed>全てをorgへ変更．
+どこにメモを置いたか忘れた．
+
 今は，元データのフォーマットとしてorgとyamlが混ざっている．
 編集に慣れてくると，orgのほうが柔軟性があって良さそう．
 codeはそのためグタグタ．そのうちに治るでしょう．

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+#require "rspec/core/rake_task"
 require 'fileutils'
 require 'open3'
 
@@ -81,7 +81,7 @@ task :clean_exe do
   files = Dir.entries('exe')
   files.each{|file|
     next if ["my_help",".","..",".DS_Store",
-             "emacs_help","e_h","my_todo"].include?(file)
+             "emacs_help","e_h","my_todo","org_help"].include?(file)
     FileUtils.rm(File.join('./exe',file), :verbose=>true)
   }
 end

data/exe/e_h

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
 require 'specific_help'
-if ENV['LANG'] == "C" then
-  help_file = File.join(ENV['HOME'],'.my_help','emacs_help_e.org')
-else
-  help_file = File.join(ENV['HOME'],'.my_help','emacs_help.org')
-end
+help_file = File.join(ENV['HOME'],'.my_help','emacs_help.org')
 SpecificHelp::Command.run(help_file, ARGV)

data/exe/my_todo

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

data/exe/org_help

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

data/lib/.#my_help.rb

@@ -0,0 +1 @@
+lib/bob@ShigetonoMacBook.local.98720

data/lib/my_help/org2yml.rb

@@ -14,8 +14,9 @@ class OrgToYaml
 
   def make_options(line)
     head, desc = line.split(':')
-    desc ||= head
-    { short: "-#{head[0]}", long: "--#{head}", desc: desc.to_s }
+    desc ||= head.to_s
+    short = "-#{head[0]}"
+    { short: short, long: "--#{head}", desc: desc }
   end
 
   def next_cont(head)

data/lib/my_help/version.rb

@@ -1,3 +1,3 @@
 module MyHelp
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/lib/my_help/yml2org.rb

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-require "optparse"
 require "yaml"
 
 class YmlToOrg
@@ -7,26 +6,25 @@ class YmlToOrg
 
   def initialize(file)
     @contents = ''
-    yml_to_org(YAML.load(File.read(file)))
-  end
-
-  def head_and_licence(key, cont)
-    cont.each { |line| @contents << "- #{line}\n" }
+    cont = ''
+    if file.kind_of?(String)
+      cont = YAML.load(File.read(file))
+    elsif file.kind_of?(Hash)
+      cont = file
+    end
+    yml_to_org(cont)
   end
 
   def plain_element(key, cont)
-    cont[:cont].each { |line| @contents << "- #{line}\n" }
+    @contents << cont[:cont].join("\n")+"\n" if cont.include?(:cont)
   end
 
   def yml_to_org(help_cont)
+    pp help_cont
     @contents << "#+STARTUP: indent nolineimages\n" # nofold
     help_cont.each_pair do |key, cont|
       @contents << "* #{key.to_s}\n"
-      if key == :head or key == :license
-        head_and_licence(key, cont)
-      else
-        plain_element(key, cont)
-      end
+      plain_element(key, cont)
     end
   end
 end

data/lib/specific_help.rb

@@ -3,9 +3,9 @@ require "optparse"
 require "yaml"
 require "my_help/version"
 require 'fileutils'
-require "coderay"
 require 'colorize'
 require 'my_help/org2yml'
+require 'my_help/yml2org'
 
 module SpecificHelp
   class Command
@@ -16,27 +16,10 @@ module SpecificHelp
 
     def initialize(file,argv=[])
       @source_file = file
-      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}"
+      @help_cont = OrgToYaml.new(file).help_cont
+      [:head,:license].each do |sym|
+        target = @help_cont[sym]
+        print target[:cont] if target != nil
       end
       @argv = argv
     end
@@ -60,7 +43,6 @@ 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','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) }
@@ -126,9 +108,9 @@ module SpecificHelp
     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]}
+          :title=>item, :cont=> item}
       @help_cont[item.to_sym]=new_item
-      File.open(@source_file,'w'){|file| file.print YAML.dump(@help_cont)}
+      File.open(@source_file,'w'){|f| f.print YmlToOrg.new(@help_cont).contents}
     end
 
     def remove(item)
@@ -139,7 +121,7 @@ module SpecificHelp
     end
 
     def edit_help
-      p help_file =@source_file
+       help_file =@source_file
       begin
         p command= "emacs #{help_file}"
         exec command
@@ -147,20 +129,9 @@ module SpecificHelp
         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
 
-    def to_hiki
-      @help_cont.each_pair{|key,val|
-        if key==:head or key==:license
-          hiki_disp(val)
-        else
-          hiki_help(key)
-        end
-      }
-    end
-
     def all_help
       @help_cont.each_pair{|key,val|
         if key==:head or key==:license
@@ -176,16 +147,6 @@ module SpecificHelp
       }
     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]
@@ -205,5 +166,6 @@ module SpecificHelp
     def print_separater
       print "---\n"
     end
+
   end
 end

data/lib/templates/org_help.org

@@ -0,0 +1,61 @@
+#+STARTUP: indent nolineimages
+* head
+- emacs org-modeのhelp
+- [[http://akisute3.hatenablog.com/entry/2013/12/28/144918][org-mode による論文作成入門]]
+- [[http://d.hatena.ne.jp/tamura70/20100209/org]]
+- org-modeでc-h mでhelpがでる．
+- https://orgmode.org/worg/org-tutorials/orgtutorial_dto.html
+* license
+-      cc by Shigeto R. Nishitani, 2017
+* item
+- m-x org-mode
+- emacs hogehoge.orgで起動
+- - でitem追加
+- * でitem追加
+- #+STARTUP: indent nolineimages nofold
+- #+BEGIN_QUOTE -- #+END_QUOTE
+- #+BEGIN_SRC bash -- #+END_SRC
+- #+TITLE: 格子欠陥について最近の研究から
+- #+AUTHOR: 関西学院大学・理工学部・情報科学科　西谷滋人 2017
+* key_bind
+- tabでtoggle
+- shift-tabで全部に対するtoggle
+- shift-矢印でkeyを切り替え
+- M-shift-<left, right>アウトラインのレベルをツリーごと移動
+- beamer出力はc-c c-eでlbを選択
+* markdown
+- in emacs, M-x org-md-export-as-markdown
+- pandoc -f markdown -t org -o tmp.md sample.org
+- 行の折り返し，M-x toggle-truncate-lines
+* format
+- #+OPTIONS: ^:{}でsub, superを抑制．
+* list
+- 項目- 子項目1
+- 番号付き1. 2.
+- 名前付き   - 名前1 :: 内容1
+* link
+- [[file:./tmp/tmp.txt][Link to file]]
+- to edit, c-c c-l
+- to open, c-c c-o
+* latex
+- latex出力はc-c c-eでllを選択
+- 日本語と数式が混じる時には，$の前後に半角スペースを入れる
+- [[https://www-he.scphys.kyoto-u.ac.jp/member/shotakaha/dokuwiki/doku.php?id=toolbox:emacs:org:export:latex:start~]]
+- https://orgmode.org/worg/org-tutorials/org-latex-export.html
+* todo
+- c-c c-tでno_head->TODO->DONEをloop
+- m-x agenda-modeでschedule操作可能コマンドを表示
+* verbose
+- ': 'を頭に
+- #+BEGIN_EXAMPLE...#+END_EXAMPLE
+* date_and_time
+- c-c .でカレンダーと日付表示<2018-03-14 Wed>
+- +7とか-1を入力してreturnするとその日付が出力
+- c-u c-c . で日付と時間の入力<2018-03-14 Wed 12:38>こんな感じ
+* agenda
+- (setq org-agenda-files (list "~/org/work.org"
+                             "~/org/school.org" 
+                             "~/org/home.org"))
+-  C-c a t to enter the global todo list.
+* move
+- c-c c-u 上位のlevelへ

data/my_help.gemspec

@@ -29,13 +29,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "yard"
-  spec.add_development_dependency "hiki2md"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "aruba", '~> 1.3.20'
+#  spec.add_development_dependency "minitest", "~> 5.0"
+#  spec.add_development_dependency "yard"
+#  spec.add_development_dependency "hiki2md"
+#  spec.add_development_dependency "rspec", "~> 3.0"
+#  spec.add_development_dependency "aruba", '~> 1.3.20'
   spec.add_dependency "systemu"
-  spec.add_dependency "coderay"
   spec.add_dependency "colorize"
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Shigeto R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,76 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hiki2md
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.20
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.20
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coderay
-  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: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -156,8 +72,9 @@ email:
 executables:
 - e_h
 - emacs_help
-- m_h
 - my_help
+- my_todo
+- org_help
 extensions: []
 extra_rdoc_files: []
 files:
@@ -559,8 +476,10 @@ files:
 - docs/yagi/thor_task.ipynb
 - exe/e_h
 - exe/emacs_help
-- exe/m_h
 - exe/my_help
+- exe/my_todo
+- exe/org_help
+- lib/.#my_help.rb
 - lib/emacs_help.rb
 - lib/my_help.rb
 - lib/my_help/org2yml.rb
@@ -575,6 +494,7 @@ files:
 - lib/specific_help_thor.rb
 - lib/templates/emacs_help.org
 - lib/templates/my_todo.org
+- lib/templates/org_help.org
 - lib/templates/template_help.org
 - lib/todo.rb
 - make_docker.sh

data/exe/m_h

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require 'specific_help'
-if ENV['LANG'] == "C" then
-  help_file = File.join(ENV['HOME'],'.my_help','md_help_e.org')
-else
-  help_file = File.join(ENV['HOME'],'.my_help','md_help.org')
-end
-SpecificHelp::Command.run(help_file, ARGV)