my_help 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 256d8c9ec84045cb103f0de05567c4107d7b97c48b26bbd3697df3db009e5dbc
-  data.tar.gz: 5be179861617eff7530d061669d36d61e4f9de3bea0bb4f32c6ff2117bb5a28d
+  metadata.gz: 871927da25328b86ac258c721aa91c4001caefcb8a0e07a170af5ac241561d07
+  data.tar.gz: 1a7639867760309d36cd71a0696dd2bde8ab2d9d78b912984abc88dd72458dc5
 SHA512:
-  metadata.gz: a5b5077ff038c414ffc5c6d13c8691d18d9706282931f406a5c36f6f61807699fa418628a0faa0a9dea422f6d17b7b3d53034edb9f71d349af5c88265d09bd04
-  data.tar.gz: 4050c4dda2c5e5f4e6ad0b43368a69963b5ef8e82eb8b522c119cdea2287f76efbd15f077ae86ff3a2e5b7b63e18685899e97be6632728844d885e1af520fa90
+  metadata.gz: 7a598090a7eaa81d6c355168a6a2e41d5ac816119a2c50813047dd37c169418af1198fac09fb1c739cb7d69066980eb5a7bd0766cd4a64d6982b5cb42712b68d
+  data.tar.gz: 972696bf11ff387fb23f5e954d0b24cf6c1d66b8776f92a0a222dc18103835f2b3108021f73715526ae5f1e468e595b221e6e0126ceea4498824e9a5ffa8cd3b

data/.gitignore

@@ -7,4 +7,4 @@
 *~
 \#*
 
-
+.ruby-version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my_help (0.8.4)
+    my_help (0.8.5)
       colorize
       command_line
       thor
@@ -9,56 +9,90 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.14.12)
+    activesupport (6.0.3.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    aruba (0.14.14)
       childprocess (>= 0.6.3, < 4.0.0)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
       ffi (~> 1.9)
       rspec-expectations (>= 2.99)
-      thor (~> 0.19)
-    backports (3.15.0)
-    builder (3.2.3)
+      thor (>= 0.19, < 2.0)
+    builder (3.2.4)
     childprocess (3.0.0)
     color_echo (3.1.1)
     colorize (0.8.1)
     command_line (1.1.0)
+    concurrent-ruby (1.1.7)
     contracts (0.16.0)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
-    ffi (1.11.3)
-    gherkin (5.1.0)
-    multi_json (1.14.1)
+    cucumber (5.1.2)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (2.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.1.0)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    diff-lcs (1.4.4)
+    ffi (1.13.1)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    middleware (0.1.0)
+    minitest (5.14.2)
     multi_test (0.1.2)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    thor (0.20.3)
+    rspec-support (3.9.3)
+    sys-uname (1.2.1)
+      ffi (>= 1.0.0)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -73,4 +107,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.org

@@ -135,3 +135,21 @@ testは[[/Users/bob/github/ruby_docs/testing_frameworks/test_unit/README.org]]
 「Rubyベストプラクティス」にあるmustを使ったextension
 を組み込んで，DSLにしている．
 [[https://github.com/practicingruby/rbp/blob/master/testing/test_unit_extensions.rb]]
+
+* rspec <2020-09-30 水>
+shuheiがrspecを組み込んでくれていたはずだが，うまく動いていないみたい．
+: gem install ffi -v "1.12.1"
+でerrorが出る．
+
+#+begin_example
+brew reinstall libffi
+set -gx PKG_CONFIG_PATH "/usr/local/opt/libffi/lib/pkgconfig"
+set -gx CPPFLAGS "-I/usr/local/opt/libffi/include"
+set -gx LDFLAGS "-L/usr/local/opt/libffi/lib"
+gem install ffi
+#+end_example
+で解消．
+: bundle update
+: bundle exec rspec
+で試したが，相対パスでなく絶対パス的な設定がされているようでダメ．
+

data/exe/my_help

@@ -24,7 +24,7 @@ class MyCLI < Thor
         puts e.to_s.red
       end
     else
-      begin 
+      begin
         puts $control.show_item(file, item) # list [file] [item]
       rescue => e
         puts e.to_s.red
@@ -61,35 +61,85 @@ class MyCLI < Thor
     invoke :setup
     $control.delete_help(help_name)
   end
-  desc "git [push|pull]", "git push or pull"
-  def git(push_or_pull)
-    p push_or_pull
-    invoke :setup
-    dir = $control.local_help_dir
-    Dir.chdir(dir) do
-      case push_or_pull
-      when 'push'
-        comms = ['git add -A',
-                 "git commit -m 'git push from my_help'",
-                 "git push origin master"]
-      when 'pull'
-        comms = ['git pull origin master']
-      else
-        raise "my_help git was called by the other than 'push or pull'"
-      end
-      comms.each do |comm|
-        c = command_line(comm)
-        puts c.stdout.blue
-        puts c.stderr.red
-      end
-    end
-  end
 
-#  desc "search {find_char}", "search FIND_CHAR"
-#  def search(find_char)
-#    invoke :setup
-#    $control.search_help(find_char)
-#  end
-end
+=begin
+     desc "git [push|pull]", "git push or pull"
+     def git(push_or_pull)
+       p push_or_pull
+       invoke :setup
+       dir = $control.local_help_dir
+       Dir.chdir(dir) do
+         case push_or_pull
+         when 'push'
+           comms = ['git add -A',
+                    "git commit -m 'git push from my_help'",
+                    "git push origin master"]
+         when 'pull'
+           comms = ['git pull origin master']
+         else
+           raise "my_help git was called by the other than 'push or pull'"
+         end
+         comms.each do |comm|
+           c = command_line(comm)
+           puts c.stdout.blue
+           puts c.stderr.red
+         end
+       end
+     end
+=end
+
+   desc "git [push|pull]", "git push or pull"
+   def git(push_or_pull,*args)
+     p push_or_pull
+     invoke :setup
+     argument_size =  args.size
+     Dir.chdir($control.local_help_dir) do
+       case push_or_pull
+       when 'push'
+         if argument_size == 0
+           comms = ['git add -A',
+                    "git commit -m 'git push from my_help'",
+                    "git push origin master"]
+         else
+           p args
+           argument_size.times do |i|
+             orgfile = args[i] + '.org'
+             file = File.join($control.local_help_dir,orgfile)
+             if File.exist?(file) == true
+               puts orgfile.green
+               dir = $control.local_help_dir
+               Dir.chdir(dir) do
+                 comm = 'git add ' + file
+                 puts c
+                 c = command_line(comm)
+                 puts c.stdout.blue
+                 puts c.stderr.red
+               end
+             else
+               puts (orgfile + " does not existed").red
+             end
+           end
+           comms = ["git commit -m 'git push from my_help'",
+                    "git push origin master"]
+         end
+       when 'pull'
+         comms = ['git pull origin master']
+       else
+         raise "my_help git was called by the other than 'push or pull'"
+       end
+       comms.each do |comm|
+         puts comm
+         c = command_line(comm)
+         puts c.stdout.blue
+         puts c.stderr.red
+       end
+     end
+   end
+   #  desc "search {find_char}", "search FIND_CHAR"
+   #  def search(find_char)
+   #    invoke :setup
+   #    $control.search_help(find_char)
+   #  end
+ end
 
-MyCLI.start(ARGV)
+ MyCLI.start(ARGV)

data/lib/my_help/my_help_controll.rb

@@ -1,9 +1,9 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
 require 'fileutils'
 require 'yaml'
 
 module MyHelp
-  class Control  
+  class Control
     attr_accessor :local_help_dir, :editor
     def initialize()
       # for configuration setups
@@ -12,7 +12,7 @@ module MyHelp
       @template_dir = File.expand_path("../../templates", __FILE__)
       @exe_dir = File.expand_path("../../exe", __FILE__)
       @local_help_dir = File.join(ENV['HOME'],'.my_help')
-      @editor = 'code' #'emacs' #'vim' #default editor
+      @editor = ENV['EDITOR'] || 'emacs' #'code', 'emacs' #'vim' #default editor
       # @mini_account = File
       set_help_dir_if_not_exists
       load_conf
@@ -54,7 +54,7 @@ module MyHelp
 
     def list_all
       output = "\nList all helps\n"
-        local_help_entries.each do |file|
+      local_help_entries.each do |file|
         file_path=File.join(@local_help_dir,file)
         title = file.split('.')[0]
         help = auto_load(file_path)
@@ -127,94 +127,96 @@ module MyHelp
     end
 
 =begin
-    def delete_help(file)
-      file = File.join(@local_help_dir,file+'.org')
-      print "Are you sure to delete "+file.blue+"?[Ynq] ".red
-      case STDIN.gets.chomp
-      when 'Y'
-        begin
-          FileUtils.rm(file,:verbose=>true)
-         rescue => error
-          puts error.to_s.red
+       def delete_help(file)
+         file = File.join(@local_help_dir,file+'.org')
+         print "Are you sure to delete "+file.blue+"?[Ynq] ".red
+         case STDIN.gets.chomp
+         when 'Y'
+           begin
+             FileUtils.rm(file,:verbose=>true)
+           rescue => error
+             puts error.to_s.red
+           end
+         when 'n', 'q' ; exit
          end
-      when 'n', 'q' ; exit
-      end
-    end
+       end
 =end
-
-    def delete_help(file)
-      file = File.join(@local_help_dir,file+'.org')
-      print "Are you sure to delete "+file.blue+"?[Yn] ".red
-      case STDIN.gets.chomp
-      when 'Y'
-        begin
-          FileUtils.rm(file,:verbose=>true)
-          return 0
-        rescue => error
-          puts error.to_s.red
-          return 1
-        end
-      when 'n', 'q' ; return 0
-      end
-    end
-
-    def search_help(word)
-      p find_char = word
-      system "ls #{@local_help_dir} | grep #{find_char}"
-    end
-
-    private
-    def select_item(help, item)
-      o_key = nil
-      help.each_pair do |key, cont|
-        next if key==:license or key==:head
-        if cont[:opts][:short] == item or cont[:opts][:long] == item
-          o_key = key
-          break
-        end
-      end
-      o_key
-    end
-
-    def disp_opts( conts )
-      output = ''
-      col = 0
-      conts.each_pair do |key, item|
-        col_length = case col
-                     when 0; output << item.rjust(5)+", "
-                     when 1; output << item.ljust(15)+": "
-                     else; output << item
-                     end
-        col += 1
-      end
-      output << "\n"
-    end
-
-    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/)
-        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 '.org'
-        cont = OrgToYaml.new(file_path).help_cont
-      else
-        puts "Not handling file types of #{file_path}"
-        cont = nil
-      end
-      cont
-    end
-  end
-end
+     def delete_help(file)
+       file = File.join(@local_help_dir,file+'.org')
+       if File.exist?(file) == true
+         print "Are you sure to delete "+file.blue+"?[Yn] ".red
+         case STDIN.gets.chomp
+         when 'Y'
+           begin
+             FileUtils.rm(file,:verbose=>true)
+             return 0
+           rescue => error
+             puts error.to_s.red
+             return 1
+           end
+         when 'n', 'q' ; return 0
+         end
+       else
+         print file + " is a non-existent file"
+       end
+     end
+
+     def search_help(word)
+       p find_char = word
+       system "ls #{@local_help_dir} | grep #{find_char}"
+     end
+
+     private
+     def select_item(help, item)
+       o_key = nil
+       help.each_pair do |key, cont|
+         next if key==:license or key==:head
+         if cont[:opts][:short] == item or cont[:opts][:long] == item
+           o_key = key
+           break
+         end
+       end
+       o_key
+     end
+
+     def disp_opts( conts )
+       output = ''
+       col = 0
+       conts.each_pair do |key, item|
+         col_length = case col
+                      when 0; output << item.rjust(5)+", "
+                      when 1; output << item.ljust(15)+": "
+                      else; output << item
+                      end
+         col += 1
+       end
+       output << "\n"
+     end
+     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/)
+         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 '.org'
+         cont = OrgToYaml.new(file_path).help_cont
+       else
+         puts "Not handling file types of #{file_path}"
+         cont = nil
+       end
+       cont
+     end
+   end
+ end

data/lib/my_help/org2yml.rb

@@ -37,7 +37,8 @@ class OrgToYaml
 
   def org_to_yaml(lines)
     lines.each do |line|
-      if m = line.match(/^\* (.+)/)
+      m = line.force_encoding(Encoding::UTF_8).match(/^\* (.+)/u)
+      if m
         next_cont m[1]
       else
         @conts << line

data/lib/my_help/version.rb

@@ -1,3 +1,3 @@
 module MyHelp
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/my_help.gemspec

@@ -1,6 +1,6 @@
 # Ensure we require the local version and not one we might have installed already
 require File.join([File.dirname(__FILE__),'lib','my_help','version.rb'])
-spec = Gem::Specification.new do |s| 
+spec = Gem::Specification.new do |s|
   s.name = 'my_help'
   s.version = MyHelp::VERSION
   s.author = 'Shigeot R. Nishitani'
@@ -17,10 +17,8 @@ spec = Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.add_development_dependency('rake')
-#  s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec')
   s.add_runtime_dependency('thor')
-#  s.add_runtime_dependency('gli','2.17.1')
   s.add_runtime_dependency "colorize"
   s.add_runtime_dependency "command_line"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_help
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Shigeot R. Nishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake