cr.rb 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2811ddb169f1ca4949a47d60e08006bd28917364665a3a671f5636d125a77748
-  data.tar.gz: 72da546f8d2b6db90048a80c9262656753336562c5818df03adbe9664b087049
+  metadata.gz: acfa8f2eec1e398a8c0cdd160f06011caf9f47222a03ee6782cd2bc34c39f472
+  data.tar.gz: 6e551fc99f60f805f4f625f3bc4b98504b7bce1f03b600a350fcc69062f7c9cf
 SHA512:
-  metadata.gz: f33e9d3f280699821c93d6af0e01230a8718205568abb5d7a20246d0196dc96ce0312a2648e21ef2a15b5cd04946e256caee1edac947eb2d3d8b8efeef334ebd
-  data.tar.gz: 22c013e6d42eb7db35a7dcf258d018e373d7f1a659a374abf0ece8b8085c2ef5fd7916d9132528af2802e96434fe57b59e145ee641434a661ac502868779eeed
+  metadata.gz: af63a8b63dbd7b0f218508f0e84d6183330349132957745f65ef054864b0e7c9500269012015f973f4981a68fc82bd7e26bb7aa33a9a5e6c8681591b3e06b426
+  data.tar.gz: cedfc4de30d4d7f6a15ddbd671da52917469524ed87b901692f388add29d1d6eaae627a95c1194bc65e29910beca3fd7f0fa50112797139c86e5260d53c2f573

data/bin/cr

@@ -1,16 +1,15 @@
 #!/usr/bin/env ruby
-# coding: utf-8
 # ------------------------------------------------------
 # File          : cr.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2021-07-08>
-# Last modified : <2022-11-29>
+# Last modified : <2023-02-05>
 #
 # cr:
 #
 #   This file is used to explain a CRyptic command
-# or an acronym's real meaning in computer world or 
-# other fields.  
+# or an acronym's real meaning in computer world or
+# other fields.
 #
 # ------------------------------------------------------
 
@@ -25,15 +24,15 @@ $CR_DEFAULT_DICTS = [
   "https://github.com/cryptic-resolver/cryptic_computer.git",
   "https://github.com/cryptic-resolver/cryptic_windows.git",
   "https://github.com/cryptic-resolver/cryptic_linux.git",
-  "https://github.com/cryptic-resolver/cryptic_electronics"
+  "https://github.com/cryptic-resolver/cryptic_technology"
 ]
 
 # The config file will override the default dicts, but not default library!
-if ENV['CRYPTIC_RESOLVER_CONFIG'] 
+if ENV['CRYPTIC_RESOLVER_CONFIG']
   file = ENV['CRYPTIC_RESOLVER_CONFIG']
   if test('f', file)
-    config = Tomlrb.load_file file 
-    
+    config = Tomlrb.load_file file
+
     CR_EXTRA_LIBRARY ||= config['EXTRA_LIBRARY']
 
     if config['DEFAULT_DICTS']
@@ -99,7 +98,7 @@ def is_there_any_dict?
     Dir.mkdir CR_DEFAULT_LIBRARY
   end
 
-  !Dir.empty? CR_DEFAULT_LIBRARY 
+  !Dir.empty? CR_DEFAULT_LIBRARY
 end
 
 
@@ -117,24 +116,24 @@ def add_default_dicts_if_none_exists
     else
       # *nix-like
       CR_DEFAULT_DICTS_USER_AND_NAMES.each_with_index do |name, i|
-        fork do 
+        fork do
           puts "cr: Pulling #{name}..."
           `git -C #{CR_DEFAULT_LIBRARY} clone #{CR_DEFAULT_DICTS[i]} -q`
         end
       end
-      Process.waitall      
+      Process.waitall
     end
 
     rescue Interrupt
       puts "cr: Cancel add default dicts"
       exit 1
     end
-    
+
     puts "cr: Add done"
     word_count(p: false)
-    puts 
+    puts
     puts "#{$DefaultLibWordCount} words added"
-    
+
     # Really added
     return true
   end
@@ -153,8 +152,8 @@ def update_dicts()
   puts "cr: Updating all dicts in Default library..."
 
   begin
-  Dir.chdir CR_DEFAULT_LIBRARY do 
-    
+  Dir.chdir CR_DEFAULT_LIBRARY do
+
     if RUBY_PLATFORM.include? "mingw"
       # Windows doesn't have fork
       Dir.children(CR_DEFAULT_LIBRARY).each do |dict|
@@ -164,7 +163,7 @@ def update_dicts()
     else
       # *nix
       Dir.children(CR_DEFAULT_LIBRARY).each do |dict|
-        fork do 
+        fork do
           puts "cr: Wait to update #{dict}..."
          `git -C ./#{dict} pull -q`
         end
@@ -195,7 +194,7 @@ end
 
 
 def add_dict(repo)
-  if repo.nil? 
+  if repo.nil?
     puts bold(red("cr: Need an argument!"))
     exit -1
   end
@@ -232,12 +231,12 @@ end
 
 
 def del_dict(repo)
-  if repo.nil? 
+  if repo.nil?
     puts bold(red("cr: Need an argument!"))
     exit -1
   end
-  Dir.chdir CR_DEFAULT_LIBRARY do 
-    begin 
+  Dir.chdir CR_DEFAULT_LIBRARY do
+    begin
       # Dir.rmdir repo        # Can't rm a filled dir
       # FileUtils.rmdir repo  # Can't rm a filled dir
       FileUtils.rm_rf repo
@@ -251,8 +250,8 @@ end
 
 
 def load_sheet(library, dict, sheet_name)
-  file = library + "/#{dict}/#{sheet_name}.toml" 
-  
+  file = library + "/#{dict}/#{sheet_name}.toml"
+
   if File.exist? file
     return Tomlrb.load_file file # gem 'tomlrb'
     # return TOML.load_file file # gem 'toml'
@@ -267,21 +266,21 @@ end
 #
 # A info looks like this
 #   emacs = {
-#     name = "Emacs" 
+#     name = "Emacs"
 #     desc = "edit macros"
 #     more = "a feature-rich editor"
 #     see  = ["Vim"]
 #   }
 #
-# @param info [Hash] the information of the given word (mapped to a keyword in TOML) 
+# @param info [Hash] the information of the given word (mapped to a keyword in TOML)
 #
 def pp_info(info)
   name = info['name'] || red("No name!")  # keyword `or` is invalid here in Ruby
-  
+
   desc = info['desc']
   more = info['more']
-  
-  if desc 
+
+  if desc
     puts "\n  #{name}: #{desc}"
     print "\n  ",more,"\n" if more
   else
@@ -292,12 +291,19 @@ def pp_info(info)
   if see_also = info['see']
     print "\n", purple("SEE ALSO ")
     if see_also.is_a?(Array)
-      see_also.each {|x| print underline(x),' '}
+      last_ndx = see_also.size - 1
+      see_also.each_with_index do |x,i|
+        if last_ndx == i
+          print underline(x)  # Last word doesn't show space
+        else
+          print underline(x),' '
+        end
+      end
     else
-      print underline(see_also),' '
+      print underline(see_also)
     end
     puts
-  end 
+  end
   puts
 end
 
@@ -313,9 +319,9 @@ end
 # So we can directly lookup to it
 #
 # Notice that, we must jump to a specific word definition
-# So in the toml file, you must specify the precise word. 
+# So in the toml file, you must specify the precise word.
 # If it has multiple meanings, for example
-# 
+#
 #   [blah]
 #   same = "xdg"  # this is wrong, because xdg has multiple
 #                 # definitions, and all of them specify a
@@ -333,27 +339,27 @@ def pp_same_info(library, dict, word, cache_content, same_key, own_name)
 
   # If it's a synonym for anther word,
   # we should lookup into this dict again, but maybe with a different file
-  
+
   # file name
   x = word.chr.downcase
-    
-  # 
+
+  #
   # dictionary maintainer must obey the rule for xxx.yyy word:
   #   xxx should be lower case
   #   yyy can be any case
-  # 
+  #
   # Because yyy should clearly explain the category info, IBM is better than ibm
   # Implementation should not be too simple if we want to stress the function we
-  # expect. 
-  # 
+  # expect.
+  #
   # 'jump to' will output to user, so this is important not only inside our sheet.
-  #   
+  #
   #     same = "XDM downloader=>xdm.Download"
   #
   # We split 'same' key into two parts via spaceship symbol `=>`, first part will
   # output to user, the second part is for internal jump.
   #
-    
+
   jump_to, same = same_key.split("=>")
   same =  jump_to if same.nil?
 
@@ -363,17 +369,17 @@ def pp_same_info(library, dict, word, cache_content, same_key, own_name)
   puts blue(bold(own_name)) + ' redirects to ' + blue(bold(jump_to))
 
   #
-  # As '.' is used to delimit a word and a category, what if 
+  # As '.' is used to delimit a word and a category, what if
   # we jump to a dotted word?
-  # 
+  #
   #   [eg]
-  #   same = "e.g." # this must lead to a wrong resolution to 
-  #                 # word 'e', category 'g' 
+  #   same = "e.g." # this must lead to a wrong resolution to
+  #                 # word 'e', category 'g'
   #
   # All you need is to be like this:
-  #   
+  #
   #   [eg]
-  #   same = "'e.g.'" # cr will notice the single quote 
+  #   same = "'e.g.'" # cr will notice the single quote
   #
 
   if same =~ /^'(.*)'$/
@@ -381,7 +387,7 @@ def pp_same_info(library, dict, word, cache_content, same_key, own_name)
   else
     same, category = same.split('.')
   end
-  
+
   if same.chr == x
     # No need to load another dictionary if match
     sheet_content = cache_content
@@ -416,7 +422,7 @@ end
 # Lookup the given word in a sheet (a toml file) and also print.
 # The core idea is that:
 #
-# 1. if the word is `same` with another synonym, it will directly jump to 
+# 1. if the word is `same` with another synonym, it will directly jump to
 #   a word in this dictionary, but maybe a different sheet.
 #
 # 2. load the toml file and check the given word
@@ -426,7 +432,7 @@ end
 #       [abcd.tYPe]
 #
 def lookup(library, dict, file, word)
-  sheet_content = load_sheet(library, dict, file) 
+  sheet_content = load_sheet(library, dict, file)
   return false if sheet_content.nil?
 
   info = sheet_content[word]
@@ -435,9 +441,9 @@ def lookup(library, dict, file, word)
   # Warn if the info is empty. For example:
   #   emacs = { }
   if info.size == 0
-    puts red("WARN: Lack of everything of the given word 
+    puts red("WARN: Lack of everything of the given word
       Please consider fixing this in the dict `#{dict}`")
-    exit 
+    exit
   end
 
 
@@ -446,7 +452,7 @@ def lookup(library, dict, file, word)
   type_1_exist_flag = false
 
   # if already jump, don't check the word itself
-  is_jump = false 
+  is_jump = false
 
   # synonym info print
   if same_key = info['same']
@@ -462,8 +468,8 @@ def lookup(library, dict, file, word)
   # To developer:
   #   The word should at least has one of `desc` and `more`
   #   But when none exists, this may not be considered wrong,
-  #   Because the type2 make the case too. 
-  #   
+  #   Because the type2 make the case too.
+  #
   #   So, just ignore it, even if it's really a mistake(insignificant)
   #   by dictionary maintainers.
   #
@@ -493,7 +499,7 @@ def lookup(library, dict, file, word)
       else
         pp_info(info0)
       end
-      
+
       # last meaning doesn't show this separate line
       print  blue(bold("OR")),"\n" unless categories.last == meaning
     end
@@ -511,33 +517,33 @@ end
 #
 #   1. Search the default library first
 #   2. Search the extra library if it does exist
-# 
+#
 # The `search` is done via the `lookup` function. It will print
 # the info while finding. If `lookup` always return false then
 # means lacking of this word in our dicts. So a welcomed
 # contribution is printed on the screen.
 #
 def resolve_word(word)
-  
+
   add_default_dicts_if_none_exists
 
   word = word.downcase # downcase! would lead to frozen error in Ruby 2.7.2
   # The index is the toml file we'll look into
   index = word.chr
-  case index 
-  when '0'..'9' 
+  case index
+  when '0'..'9'
     index = '0-9'
   end
 
   # cache lookup's results
   results = []
-  
+
   # First consider the default library
   default = Dir.children(CR_DEFAULT_LIBRARY)
   default.each do |dict|
     results << lookup(CR_DEFAULT_LIBRARY,dict,index,word)
   end
-  
+
   # Then is the extra library
   if CR_EXTRA_LIBRARY
     extra = Dir.children(CR_EXTRA_LIBRARY)
@@ -550,23 +556,28 @@ def resolve_word(word)
     puts <<-NotFound
 cr: Not found anything.
 
-You may 
-  1. Use `cr -u` to update all dicts 
+You could
+
+  #{blue("case 1: Update all dicts")}
+
+    #{yellow("$cr -u")}
+
+  #{blue("case 2: List available official and feature dicts")}
+
+    #{yellow("$cr -l")}
+
+    #{yellow("$cr -a repo")} (Add a specific dict to default lib)
+
+  #{blue("case 3: Contribute to theses dicts")}
 
-  2. Use 
-      
-    `cr -l`  to list available official dicts
-    
-    `cr -a repo`  to add some dicts
-  
-  3. Contribute to theses dicts
+    Visit: https://github.com/cryptic-resolver
 
 NotFound
 
   else
     return
   end
-  
+
 end
 
 
@@ -592,15 +603,15 @@ end
 # This `search_word_internal` routine is quite like `resolve_word`
 # Notice:
 #   We handle two cases
-#   
+#
 #   1. the 'pattern' is the regexp itself
 #   2. the 'pattern' is like '/blah/'
-#                       
+#
 #  The second is what Ruby and Perl users like to do, handle it!
 #
 def search_word_internal(pattern, library)
 
-  if pattern.nil? 
+  if pattern.nil?
     puts bold(red("cr: Need an argument!"))
     exit -1
   end
@@ -612,7 +623,7 @@ def search_word_internal(pattern, library)
   else
     regexp = %r[#{pattern}]
   end
-  
+
   found_or_not = false
 
   #
@@ -628,7 +639,7 @@ def search_word_internal(pattern, library)
     sheets.each do |sheet|
       sheet_content = load_sheet(library, dict, File.basename(sheet,'.toml'))
 
-      sheet_content.keys.each do 
+      sheet_content.keys.each do
         if _1 =~ regexp
           found_or_not = true
           similar_words_in_a_dict << _1
@@ -643,7 +654,7 @@ def search_word_internal(pattern, library)
       LsTable.ls(similar_words_in_a_dict) do |e|
         puts blue(e)
       end
-      puts 
+      puts
     end
   end
   return found_or_not
@@ -661,7 +672,7 @@ Usage:
   cr -c             => Print word count
   cr -l             => List local dicts and official dicts
   cr -u             => Update all dicts in Default library
-  
+
   cr -a repo.git    => Add a new dict
   cr -a user/repo   => Add a new dict from Github
   cr -a  repo       => Add an official dict from Github
@@ -687,18 +698,18 @@ end
 # 1. List Default library's dicts
 # 2. List Extra   library's dicts
 # 3. List official dicts
-# 
+#
 def list_dicts
-  Dir.chdir CR_DEFAULT_LIBRARY do 
+  Dir.chdir CR_DEFAULT_LIBRARY do
     puts blue("=> Default library: #{CR_DEFAULT_LIBRARY}")
     Dir.children(CR_DEFAULT_LIBRARY).each_with_index do |dict,i|
       puts "#{blue(i+1)}. #{bold(green(dict))}"
     end
   end
 
-  if CR_EXTRA_LIBRARY 
+  if CR_EXTRA_LIBRARY
     puts
-    Dir.chdir CR_EXTRA_LIBRARY do 
+    Dir.chdir CR_EXTRA_LIBRARY do
       puts blue("=> Extra library: #{CR_EXTRA_LIBRARY}")
       Dir.children(CR_EXTRA_LIBRARY).each_with_index do |dict,i|
         puts "#{blue(i+1)}. #{bold(green(dict))}"
@@ -721,9 +732,9 @@ $DefaultLibWordCount = 0
 $ExtraLibWordCount   = 0
 
 def count_dict_words(library, dict)
-  
+
   dict_dir = library + "/#{dict}"
-  
+
   wc = 0
 
   Dir.children(dict_dir).each do |entry|
@@ -757,6 +768,9 @@ def word_count(p:)
 
   if CR_EXTRA_LIBRARY
     extra_lib = Dir.children(CR_EXTRA_LIBRARY)
+    extra_lib.reject! do |f|
+      File.file? f
+    end
     # Count extra library
     unless extra_lib.empty?
       wc = 0
@@ -770,7 +784,7 @@ def word_count(p:)
   end
   $TwoLibWordCount = $DefaultLibWordCount + $ExtraLibWordCount
 
-  if p 
+  if p
   puts
   puts "#{$DefaultLibWordCount.to_s.rjust(4)} words in Default library"
   puts "#{$ExtraLibWordCount.to_s.rjust(4)  } words in  Extra  library"
@@ -790,12 +804,12 @@ when '-v'   then print_version
 when '-h'   then help
 when '-l'   then list_dicts
 when '-c'   then word_count(p: true)
-when '-u'   then update_dicts   
+when '-u'   then update_dicts
 when '-s'   then search_word ARGV.shift
 when '-a'   then add_dict ARGV.shift
-when '-d'   then del_dict ARGV.shift   
-when '--help' 
+when '-d'   then del_dict ARGV.shift
+when '--help'
   help
 else
   resolve_word arg
-end
+end

data/lib/cr.rb

@@ -2,7 +2,7 @@
 # File          : cr.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2022-04-15>
-# Last modified : <2022-11-29>
+# Last modified : <2023-02-05>
 #
 # cr:
 #
@@ -10,18 +10,22 @@
 #
 # ------------------------------------------------------
 
-CR_GEM_VERSION = "4.0.2"
+CR_GEM_VERSION = "4.0.3"
 
 
 CR_OFFICIAL_DICTS = <<-EOF
 Default:
   common       computer    windows
-  linux       electronics
+  linux       technology
 
 Field:
-   economy     medicine     math 
-  mechanical   science
+ electronics   economy     medicine
+  mechanical   science       math
 
 Specific:
     dos         x86        signal
-EOF
+
+Feature:
+  ccmywish/CRuby-Source-Code-Dictionary
+
+EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cr.rb
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - ccmywish
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: 'cr: Cryptic Resolver'