my_help 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 329496bbae92a57e90f94b719ddd2be82e2ef5d3
-  data.tar.gz: 813ed1f72d37fa2d93c529ed7eea68340373d1ca
+  metadata.gz: 2acf848b3e98662747f041251d65751f61991ab6
+  data.tar.gz: 96ddb81c7b0a6cc3baff1dc0f1bf866966d5d06c
 SHA512:
-  metadata.gz: ec29d078e2e359b1b207359f83eb1ee2bcc844fab35995f97e3c42936904cd31f71e33f0ef9ff16603f6fe205c6bb160a03f4caa5e33f2a705a77bf1175bf602
-  data.tar.gz: 994d20e42858e1df0192f6b91efc8df0c3f5da0b037c961e4065824ac0d35d6eeef6cf66c5d542ff2867a4dcc67a3e6daa5c86cbd0a899441bddfb5168506d9b
+  metadata.gz: a7ced46cde76b762d5bd7ade8cd53ae5f0dd83b038bab5e9b5bdf57827198bbf192a919cec9acbb94a8eef5fb38bed05aef3fc3ea56459ef9f4c5c79d2a615f8
+  data.tar.gz: b137ed36475e5338fd83fb992e869e7422ca8f0b35565ab5bb490cb81bb70a83978eac46fbfd88c84966bcd6ed6aa6dbbb8ca7d211ee447817742a10255c31ad

data/.gitignore

@@ -6,6 +6,5 @@
 /pkg/
 *~
 \#*
-/before_gli/
-Dockerfile
+
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my_help (0.0.1)
+    my_help (0.7.1)
       colorize
       gli (= 2.17.1)
 

data/README.org

@@ -90,9 +90,9 @@ COMMANDS
 としてください．このlistにargsやitemを加えて行くとわかると思います．
 
 : my_help list
-: my_help list emacs_help
-: my_help list emacs_help -f
-: my_help list emacs_help file
+: my_help list emacs
+: my_help list emacs -f
+: my_help list emacs file
 として動かしてみてください．
 
 

data/lib/my_help/my_help_controll.rb

@@ -11,7 +11,7 @@ module MyHelp
       return if File::exists?(@local_help_dir)
       FileUtils.mkdir_p(@local_help_dir, :verbose=>true)
       Dir.entries(@template_dir).each{|file|
-        next if file=='template_help.org'
+        next if file=='help_template.org'
         file_path=File.join(@local_help_dir,file)
         next if File::exists?(file_path)
         FileUtils.cp((File.join(@template_dir,file)),@local_help_dir,:verbose=>true)
@@ -69,16 +69,19 @@ module MyHelp
         help = auto_load(file_path)
         next if help.nil?
         desc = help[:head][:cont].split("\n")[0]
-        print "  #{title}\t: #{desc}\n".blue
+        print title.rjust(10).blue
+        print ": #{desc}\n".blue
       end
     end
 
     def edit_help(file)
-      target_help = File.join(@local_help_dir,file)
-      ['.yml','.org'].each do |ext|
-        p target_help += ext if local_help_entries.member?(file+ext)
+      target_help = File.join(@local_help_dir,file+'.org')
+      if local_help_entries.member?(target_help)
+        system "emacs #{target_help}"
+      else
+        puts "file #{target_help} does not exits in #{@local_help_dir}."
+        puts "init #{file} first."
       end
-      system "emacs #{target_help}"
     end
 
     def init_help(file)
@@ -88,10 +91,10 @@ module MyHelp
       end
       p target_help=File.join(@local_help_dir,file+'.org')
       if File::exists?(target_help)
-        puts "File exists. --delete it first to initialize it."
+        puts "File exists. delete it first to initialize it."
         exit
       end
-      p template = File.join(@template_dir,'template_help.org')
+      p template = File.join(@template_dir,'help_template.org')
       FileUtils::Verbose.cp(template,target_help)
     end
 
@@ -113,19 +116,21 @@ module MyHelp
     def local_help_entries
       entries= []
       Dir.entries(@local_help_dir).each{|file|
-        next unless file.include?('_')
-        next if file[0]=='#' or file[-1]=='~' or file[0]=='.'
-        next if file.match(/(.+)_e\.org/) # OK?
-        next if file.match(/(.+)\.html/)
-        entries << file
+#        next unless file.include?('_')
+#        next if file[0]=='#' or file[-1]=='~' or file[0]=='.'
+#        next if file.match(/(.+)_e\.org/) # OK?
+        #        next if file.match(/(.+)\.html/)
+        if file.match(/(.+)\.org$/) # OK?
+          entries << file
+        end
       }
       return entries
     end
 
     def auto_load(file_path)
       case File.extname(file_path)
-      when '.yml'
-        cont = YAML.load(File.read(file_path))
+#      when '.yml'
+#        cont = YAML.load(File.read(file_path))
       when '.org'
         cont = OrgToYaml.new(file_path).help_cont
       else

data/lib/my_help/version.rb

@@ -1,3 +1,3 @@
 module MyHelp
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/{before_gli/lib/templates/my_todo.org → lib/templates/todo.org}

@@ -3,9 +3,9 @@
 - my todo
 * license
 -      cc by Shigeto R. Nishitani, 2016
-* daily(今日のtodo)
+* daily
 - ご飯を食べる
 - 10時には寝床へ入る
-* weekly(週間todo)
+* weekly
 - 毎日8時間寝る
 - 毎朝ちゃんと食べる

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Your Name Here
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,47 +102,15 @@ files:
 - README_en.org
 - Rakefile
 - Rakefile_gli
-- before_gli/Dockerfile.template
-- before_gli/Gemfile
-- before_gli/Gemfile.lock
-- before_gli/bin/console
-- before_gli/bin/setup
-- before_gli/exe/e_h
-- before_gli/exe/emacs_help
-- before_gli/exe/m_t
-- before_gli/exe/my_help
-- before_gli/exe/my_todo
-- before_gli/exe/o_h
-- before_gli/exe/org_help
-- before_gli/lib/emacs_help.rb
-- before_gli/lib/my_help.rb
-- before_gli/lib/my_help/my_help_controll.rb
-- before_gli/lib/my_help/org2yml.rb
-- before_gli/lib/my_help/specific_help.rb
-- before_gli/lib/my_help/test.rb
-- before_gli/lib/my_help/version.rb
-- before_gli/lib/my_help/yml2org.rb
-- before_gli/lib/my_help_new.rb
-- before_gli/lib/my_help_thor.rb
-- before_gli/lib/specific_help.rb
-- before_gli/lib/specific_help_bu.rb
-- before_gli/lib/specific_help_opt.rb
-- before_gli/lib/specific_help_thor.rb
-- before_gli/lib/templates/emacs_help.org
-- before_gli/lib/templates/my_todo.org
-- before_gli/lib/templates/org_help.org
-- before_gli/lib/templates/template_help.org
-- before_gli/make_docker.sh
-- before_gli/my_help.gemspec
 - bin/my_help
 - lib/my_help.rb
 - lib/my_help/my_help_controll.rb
 - lib/my_help/org2yml.rb
 - lib/my_help/version.rb
-- lib/templates/emacs_help.org
-- lib/templates/my_todo.org
-- lib/templates/org_help.org
-- lib/templates/template_help.org
+- lib/templates/emacs.org
+- lib/templates/help_template.org
+- lib/templates/org.org
+- lib/templates/todo.org
 - my_help.gemspec
 - my_help.rdoc
 homepage: http://your.website.com

data/before_gli/Dockerfile.template

@@ -1,13 +0,0 @@
-FROM alpine:3.7
-
-RUN apk update && apk upgrade
-RUN apk --update add \
-  openssh git build-base libffi libffi-dev \
-  ruby ruby-dev ruby-rake ruby-bundler
-
-# RUN git clone https://github.com/daddygongon/my_help.git
-COPY . ~/my_help
-WORKDIR ~/my_help
-
-RUN bundle update
-RUN bundle exec exe/my_help -m && rake install:local

data/before_gli/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in my_help.gemspec
-gemspec
-gem 'aruba', '~> 0.14.2'

data/before_gli/Gemfile.lock

@@ -1,63 +0,0 @@
-PATH
-  remote: .
-  specs:
-    my_help (0.6.2)
-      colorize
-      systemu
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aruba (0.14.5)
-      childprocess (>= 0.6.3, < 0.10.0)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      ffi (~> 1.9.10)
-      rspec-expectations (>= 2.99)
-      thor (~> 0.19)
-    backports (3.11.1)
-    builder (3.2.3)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    colorize (0.8.1)
-    contracts (0.16.0)
-    cucumber (3.1.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.1.0)
-      cucumber-expressions (~> 5.0.4)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.1.0)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.13)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
-    ffi (1.9.23)
-    gherkin (5.0.0)
-    multi_json (1.13.1)
-    multi_test (0.1.2)
-    rake (10.5.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    systemu (2.6.5)
-    thor (0.20.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (~> 0.14.2)
-  bundler (~> 1.11)
-  my_help!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.16.1

data/before_gli/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "my_help"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/before_gli/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/before_gli/exe/e_h

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

data/before_gli/exe/emacs_help

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

data/before_gli/exe/m_t

@@ -1,4 +0,0 @@
-#!/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/before_gli/exe/my_help

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-require "my_help_new"
-MyHelp::Command.run(ARGV)
-
-#require "my_help_thor"
-#MyHelp::Command.start(ARGV)

data/before_gli/exe/my_todo

@@ -1,4 +0,0 @@
-#!/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/before_gli/exe/o_h

@@ -1,4 +0,0 @@
-#!/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/before_gli/exe/org_help

@@ -1,4 +0,0 @@
-#!/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/before_gli/lib/emacs_help.rb

@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-require "optparse"
-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=[])
-      @argv = argv
-      data_path = File.join(ENV['HOME'], '.hikirc')
-    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
-        }
-        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}
-        opt.on('--edit','edit help contents'){edit_help}                                                               
-        opt.on('--edit','edit help contentsを開く'){edit_help}
-        #        opt.on('--to_hiki','convert to hikidoc format'){to_hiki}                                                       
-        opt.on('--to_hiki','hikiのformatに変更する'){to_hiki}
-        #        opt.on('--all','display all helps'){all_help}                                                                  
-        opt.on('--all','すべてのhelp画面を表示させる'){all_help}
-        #        opt.on('--store [item]','store [item] in backfile'){|item| store(item)}                                        
-        opt.on('--store [item]','store [item] でback upをとる'){|item| store(item)}
-        #        opt.on('--remove [item]','remove [item] and store in backfile'){|item| remove(item) }                          
-        opt.on('--remove [item]','remove [item] back upしてるlistを消去する'){|item| remove(item) }
-        #       opt.on('--add [item]','add new [item]'){|item| add(item) }                                                      
-        opt.on('--add [item]','add new [item]で新しいhelpを作る'){|item| add(item) }
-        #        opt.on('--backup_list [val]','show last [val] backup list'){|val| backup_list(val)}                            
-        opt.on('--backup_list [val]','back upしているlistを表示させる'){|val| backup_list(val)}
-
-      end
-      begin
-        command_parser.parse!(@argv)
-      rescue=> eval
-        p eval
-      end
-      exit
-    end
-
-    def disp(lines)
-      lines.each{|line|
-        if line.include?(',')
-          show 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)
-    end
-
-  end
-end

data/before_gli/lib/my_help/my_help_controll.rb

@@ -1,134 +0,0 @@
-module MyHelp
-  class Control
-    def initialize(argv)
-      @argv = argv
-      @template_dir = File.expand_path("../../templates", __FILE__)
-      @exe_dir = File.expand_path("../../exe", __FILE__)
-      @local_help_dir = File.join(ENV['HOME'],'.my_help')
-      @system_inst_dir = RbConfig::CONFIG['bindir']
-      set_help_dir_if_not_exists
-    end
-
-    def set_help_dir_if_not_exists
-      return if File::exists?(@local_help_dir)
-      FileUtils.mkdir_p(@local_help_dir, :verbose=>true)
-      Dir.entries(@template_dir).each{|file|
-        next if file=='template_help.org'
-        file_path=File.join(@local_help_dir,file)
-        next if File::exists?(file_path)
-        FileUtils.cp((File.join(@template_dir,file)),@local_help_dir,:verbose=>true)
-      }
-    end
-
-    def show(file, item)
-      file_path=File.join(@local_help_dir,file+'.org')
-      help = auto_load(file_path)
-      print help[:head][:cont]
-      print '-'*5+"\n"
-      print item.red+"\n"
-      print help[item.to_sym][:cont]
-    end
-
-    def list_helps(file)
-      if file.nil?
-        list_all
-      else
-        list_help(file)
-      end
-    end
-
-    def list_help(file)
-      file_path=File.join(@local_help_dir,file+'.org')
-      help = auto_load(file_path)
-      help.each_pair do |key, conts|
-        print conts[:cont] if key==:head
-        disp_opts( conts[:opts] )
-      end
-    end
-
-    def disp_opts( conts )
-      col = 0
-      conts.each_pair do |key, item|
-        col_length = case col
-                     when 0; print item.rjust(5)+", "
-                     when 1; print item.ljust(15)+": "
-                     else; print item
-                     end
-        col += 1
-      end
-      print("\n")
-    end
-
-    def list_all
-      print "List all helps\n"
-      local_help_entries.each do |file|
-        file_path=File.join(@local_help_dir,file)
-        title = file.split('.')[0]
-        help = auto_load(file_path)
-        next if help.nil?
-        desc = help[:head][:cont].split("\n")[0]
-        print "  #{title}\t: #{desc}\n".blue
-      end
-    end
-
-    def edit_help(file)
-      target_help = File.join(@local_help_dir,file)
-      ['.yml','.org'].each do |ext|
-        p target_help += ext if local_help_entries.member?(file+ext)
-      end
-      system "emacs #{target_help}"
-    end
-
-    def init_help(file)
-      p target_help=File.join(@local_help_dir,file+'.org')
-      if File::exists?(target_help)
-        puts "File exists. --delete it first to initialize it."
-        exit
-      end
-      p template = File.join(@template_dir,'template_help.org')
-      FileUtils::Verbose.cp(template,target_help)
-    end
-
-    def delete_help(file)
-      file = File.join(@local_help_dir,file+'.org')
-      print "Are you sure to delete "+file.blue+"?[Ynq] ".red
-      case gets.chomp
-      when 'Y'
-        begin
-          FileUtils.rm(file,:verbose=>true)
-        rescue => error
-          puts error.to_s.red
-        end
-      when 'n', 'q' ; exit
-      end
-    end
-
-    private
-    def local_help_entries
-      entries= []
-      Dir.entries(@local_help_dir).each{|file|
-        next unless file.include?('_')
-        next if file[0]=='#' or file[-1]=='~' or file[0]=='.'
-        next if file.match(/(.+)_e\.org/) # OK?
-        next if file.match(/(.+)\.html/)
-        entries << file
-      }
-      return entries
-    end
-
-    def auto_load(file_path)
-      case File.extname(file_path)
-      when '.yml'
-        cont = YAML.load(File.read(file_path))
-      when '.org'
-        cont = OrgToYaml.new(file_path).help_cont
-      else
-        puts "Not handling file types of #{file_path}"
-        cont = nil
-      end
-      cont
-    end
-
-
-  end
-end