my_help 1.2.5 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fbe3cc902e69de5a60eaeaa7d14dd022d9e62762c8a49614a196e1ee5140e7b
-  data.tar.gz: 007a657cf27a611ff2283ad3d06646663623f87a42c4aff01386652b347efbcf
+  metadata.gz: cb657df4836581b1f682cf5cffabdb89215f4f6f51a5836aa2dfdb7d86d11a20
+  data.tar.gz: 8e2d7673d363db127caeba1323837a7a2a1ef989f25461ec0dd28ee33f594d7c
 SHA512:
-  metadata.gz: 29765172ae78544814be3103168a972456dbaf7db01a53b0587db7c90e6d9cf5352f3be5dd7a064b94e5c9450b55bab2dd5f988c8c50d2fe1eca5462c11e6582
-  data.tar.gz: 45abc775d1b7099f640e52123ff6f851f338e8cb47b5a3645eb67a4ba059284238dc51cad0d371c6a2da875ed8a17dcf034fe74341b45925e4d7a7284de04e6d
+  metadata.gz: 41f84a96ab9e2b1794805587c13c14489e3e85f849d756875e0f1a0bf0fe780db5e009adebbac32efa0b85ce1209e21d8b4d54d4ebe546c2edfd590b4d789f49
+  data.tar.gz: 3309a3cfd356061482fae41107396fb9a319e0b9a6bc4dd2e98fa88048ed044f2f2c29a37aadfc3ed9f8e9acb32cba2724e29cff09f3eedbd6d33af7702ec661

data/lib/my_help/cli.rb

@@ -15,8 +15,6 @@ module MyHelp
 
     package_name 'my_help'
     map "-v" => :version
-    map "--version" => :version
-
     desc "version", "show version"
 
     def version
@@ -31,13 +29,6 @@ module MyHelp
     def add_defaults
       puts "Adding defaults org files in .my_help"
       config = get_config
-      if config[:template_dir] !=
-         File.expand_path("../templates", __dir__)
-        puts "inconsistency for :template_dir"
-        config.configure(:template_dir=>
-                         File.expand_path("../templates", __dir__))
-        config.save_config
-      end
       help_dir = options["help_dir"] || config[:local_help_dir]
       p current_orgs = Dir.glob(File.join(help_dir, "*.org")).
                          map!{|f| File.basename(f)}
@@ -103,7 +94,7 @@ module MyHelp
     end
 
     desc "new  [HELP]", "mk new HELP"
-
+    map "-n" => :new
     def new(*args)
       c = get_config
       help_name = args[0]
@@ -112,6 +103,21 @@ module MyHelp
       #     puts res.stdout
     end
 
+    desc "place [TEMPLATE]", "place template on cwd"
+    map "-p" => :place
+    def place(*args)
+      config = get_config
+      p help_name = File.basename( (args[0] || 'template.org'),
+                                   '.org')
+      t_file = File.join('.', help_name+".org")
+      if File.exist?(t_file)
+        puts "File #{t_file} exists, set file_name."
+      else
+        FileUtils.cp(File.join(config[:template_dir],'template.org'),
+                     t_file, verbose: true)
+      end
+    end
+
     desc "delete [HELP]", "delete HELP"
 
     def delete(*args)

data/lib/my_help/config.rb

@@ -21,8 +21,19 @@ module MyHelp
       configure_with(@config[:conf_file])
       #      YAML.dump(@config, File.open(@config[:conf_file], 'w'))
       # no good for multiple testers.
+      check_template_dir
     end
 
+
+    def check_template_dir
+      temp_path = File.expand_path("../templates", __dir__)
+
+      if config[:template_dir] != temp_path
+        puts "inconsistency for :template_dir"
+        config[:template_dir]= temp_path
+        save_config
+      end
+    end
     # Configure through hash
     def configure(opts = nil)
       return if opts == nil

data/lib/my_help/git_cli.rb

@@ -3,6 +3,7 @@ module MyHelp
     def get_config #(args)
       parent_help_dir = options["help_dir"] || ""
       parent_help_dir = ENV["HOME"] unless File.exist?(parent_help_dir)
+      # Forget necessity of these 
       return Config.new(parent_help_dir)
     end
   end

data/lib/my_help/list.rb

@@ -16,7 +16,7 @@ module MyHelp
       if item == nil && name == nil
         list_helps()
       else
-        path = File.exists?(name + @ext) ? name + @ext :
+        path = File.exist?(name + @ext) ? name + @ext :
           File.join(@path, name + @ext)
         list_help_with(path, name, item)
       end
@@ -32,15 +32,27 @@ module MyHelp
     def list_helps()
       files = File.join(@path, "*#{@ext}")
       Dir.glob(files).inject("") do |out, file|
-        #        p [out, file]
+#                p [out, file]
         help_info = read_help(file)
         head = help_info[:items]["head"] ?
-                 help_info[:items]["head"].split("\n")[0] :
-                 ''
+                 help_info[:items]["head"].split("\n")[0] : ''
+        # "head "ではだめ．．．やれやれ<24/10/02> revised
         out << "%10s: %s\n" % [help_info[:name], head]
+#        out << "%s: %s\n" % [help_info[:name], head]
+#        out << "%20s: %s\n" % [pad_with_bytes(help_info[:name],20), head]
       end
     end
 
+    def pad_with_bytes(str, length, padstr=" ")
+      p str="日本語"
+      p str_bytes = str.bytesize
+      p pad_bytes = length - str_bytes
+      p pad = padstr * (pad_bytes / padstr.bytesize)
+      exit
+      return pad + str
+    end
+
+
     # defaultで@path/name.@extのヘルプを読み込んで，itemを表示
     #
     def list_help_with(path, name, item)
@@ -52,6 +64,7 @@ module MyHelp
           item, desc = item.split(":")
           desc ||= ""
           output << "- %20s : %s\n" % [item, desc]
+#          output << "%s: %s\n" % [pad_with_bytes(item, 40), desc]
         end
       else
         output << find_near(item)

data/lib/my_help/org2hash.rb

@@ -40,7 +40,12 @@ module MyHelp
 
     def read_item(line)
       m = line.match(/\* (.+)/)
-      return m ? m[1] : nil
+      item = if m
+               m[1].match(/head\s*/) ? "head" : m[1]
+             else
+               nil
+             end
+      return item
     end
   end
 end

data/lib/my_help/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MyHelp
-  VERSION = "1.2.5"
+  VERSION = "1.2.7"
 end

data/lib/templates/emacs_j.org

@@ -9,33 +9,6 @@
 　-   c-g,操作を中断する
 　-   c-x u, 直前に行った操作を取り消す
 * license:      cc by Kaede Ogawa & Shigeto R. Nishitani, 2024
-* basic
-** 初期
-- emacs [FILE]
-** 終了操作
-- c-x c-c, ファイルを保存して、Emacsを終了する
-- c-z, Emacsを一時停止する, fgで再開する
-** カーソル移動
-- c-f, カーソルを1文字前に移動
-- c-b, カーソルを1文字後ろに移動
-- c-a, 行の先頭に移動
-- c-e, 行の末尾に移動
-- c-n, 次の行に移動
-- c-p, 前の行に移動
-- c-v, 次のページに移動
-- M-v, 前のページに移動
-- c-l, カーソル行を画面の中央に移動(2回目は画面の上端に、3回目は画面の下端に移動する)
-- M-<, ファイルの先頭に移動
-- M->, ファイルの末尾に移動
-** 編集操作
-- c-d, カーソルの右側の1文字を削除
-- c-k, カーソル位置から行の末尾までの文字を削除
-- c-y, 直前に削除した文字を貼り付け
-- c-w, 選択された領域を削除
-- 領域選択は、先頭 or 最後尾で c-space した後、最後尾 or 先頭へカーソル移動
-- c-s, 前へ WORD を検索
-- c-r, 後へ WORD を検索
-- M-x query-replace WORD1 <ret> WORD2, 文字列の置換(y or n で可否選択)
 * カーソル移動
 - c-f, カーソルを1文字前に移動
 - c-b, カーソルを1文字後ろに移動

data/lib/templates/template.org

@@ -0,0 +1,9 @@
+#+OPTIONS: ^:{}
+#+STARTUP: indent nolineimages overview num
+#+TITLE: template for org-file
+#+AUTHOR: Shigeto R. Nishitani
+#+EMAIL:     (concat "shigeto_nishitani@mac.com")
+#+LANGUAGE:  jp
+#+OPTIONS:   H:4 toc:t num:2
+#+SETUPFILE: https://fniessen.github.io/org-html-themes/org/theme-readtheorg.setup
+

data/my_help.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "command_line"
   spec.add_runtime_dependency "colorize"
-  spec.add_development_dependency "aruba"
+#  spec.add_development_dependency "aruba"
+  spec.add_development_dependency "yard"
+  spec.add_development_dependency "rubocop"
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors:
 - Shigeto R. Nishiani
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,6 +165,7 @@ files:
 - lib/templates/example.org
 - lib/templates/my_help_j.org
 - lib/templates/org_j.org
+- lib/templates/template.org
 - my_help.gemspec
 - my_help_install.org
 homepage: https://github.com/daddygongon/my_help