cr.rb 4.1.5 → 4.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1f71eca516d37dabb6a73e90451407b6c936b2d0139b2b6b92fbadd07005454
-  data.tar.gz: ddedd7585a404db9aa922b829ffc359eaa10162fc950077fff5bec427905539a
+  metadata.gz: 949739f802d237a6c0a78c9e89f5a95c8a3234d191ac58e68fbc068e24e11696
+  data.tar.gz: 74eea272deaa47f8475104f5158798ccd88bffc55fab9de88d547f6d82271913
 SHA512:
-  metadata.gz: 7bd500805cde6c9b3a28edd6fb0f1209254362f1701871af85f6d8631e5586e653dcb183707caa04c41e7dc54248503a0b420db6358e16397fc3aca623079b6a
-  data.tar.gz: c2e28a15e1e1daf5b8435d01e62c633719eac7cb3e88bca724e13eeaaa1dac483b05bfa360510042b7743c323a33a638ca503f2b1e616e6a431d8622d125fcc3
+  metadata.gz: 9c915a7b5392dc258fdbb9d404e4fd889f26e0513ffe1a7e99ba8a39010a0dc1009bd6927740944ffa70494c5fc7f47f894ac279f0db85249b8b44a42f8bfecd
+  data.tar.gz: 05a7af173eeaa85bcbf6525ec36f7afe27ea90720862c21e6814d8a4e6cf10d84ba11821f42ec76053dde3a1f172055e8cbd71c0ebebf9007a42f3423c3a79fe

data/exe/cr

@@ -3,7 +3,7 @@
 # File          : cr.rb
 # Authors       : Aoran Zeng <ccmywish@qq.com>
 # Created on    : <2021-07-08>
-# Last modified : <2023-05-09>
+# Last modified : <2023-05-14>
 #
 # cr:
 #
@@ -29,12 +29,13 @@ module CrypticResolver::CLI
 
     case option
     when '-l'   then reslvr.list_dicts
-    when '-c'   then reslvr.word_count
+    when '-c'   then reslvr.count_words
     when '-u'   then reslvr.update_dicts
-    when '-s'   then reslvr.search_word args.shift
-    when '-a'   then reslvr.add_dict args.shift
-    when '-d'   then reslvr.del_dict args.shift
-    else reslvr.resolve_word option end
+    when '-s'   then reslvr.search_related_words args.shift
+    when '-a'   then reslvr.add_dict             args.shift
+    when '-d'   then reslvr.del_dict             args.shift
+    else             reslvr.resolve_word         option
+    end
   end
 
 

data/lib/cr/counter.rb

@@ -1,21 +1,18 @@
 # ---------------------------------------------------------------
 # File          : counter.rb
 # Authors       : Aoran Zeng <ccmywish@qq.com>
-# Created on    : <2023-05-09>
-# Last modified : <2023-05-09>
+# Created on    : <2022-03-06>
+# Last modified : <2023-05-14>
 #
 # counter:
 #
 #   Count words in dictionaries.
-#
-# ----------
-# Changelog:
-#
-# <2023-05-09> Moved from lib/cr.rb
 # ---------------------------------------------------------------
 
 class CrypticResolver::Resolver::Counter
 
+  using Rainbow
+
   attr_accessor :word_count_of_two_libs,  # def_lib + extra_lib
                 :word_count_of_def_lib,
                 :word_count_of_extra_lib,

data/lib/cr/version.rb

@@ -2,7 +2,7 @@
 # File          : version.rb
 # Authors       : Aoran Zeng <ccmywish@qq.com>
 # Created on    : <2023-02-12>
-# Last modified : <2023-05-09>
+# Last modified : <2023-07-29>
 #
 # version:
 #
@@ -11,6 +11,6 @@
 
 module CrypticResolver
 
-  GEM_VERSION = "4.1.5"
+  GEM_VERSION = "4.1.7"
 
 end

data/lib/cr.rb

@@ -2,22 +2,20 @@
 # File          : cr.rb
 # Authors       : Aoran Zeng <ccmywish@qq.com>
 # Created on    : <2022-04-15>
-# Last modified : <2023-05-09>
+# Last modified : <2023-07-29>
 #
 # cr:
 #
 #   This file is the lib of `cr.rb``
 # ------------------------------------------------------
 
-require 'colorator'
+require 'rainbow/refinement'
 require_relative 'cr/version'
 
-class String
-  def underline = "\e[4m#{self}\e[0m"
-end
-
 class CrypticResolver::Resolver
 
+  using Rainbow
+
   require_relative 'cr/counter'
 
   # Notice that we only update the Default library, not Extra library
@@ -277,8 +275,6 @@ A info looks like this
   end
 
 
-
-  #
   # Lookup the given word in a sheet (a toml file) and also print.
   # The core idea is that:
   #
@@ -367,7 +363,6 @@ A info looks like this
   end
 
 
-  #
   # The main procedure of `cr`
   #
   #   1. Search the default library first
@@ -422,16 +417,15 @@ A info looks like this
   end
 
 
-  #
   # Delegate to `search_word_internal`
   #
-  def search_word(pattern)
+  def search_related_words(pattern)
     found_or_not1 = false
     found_or_not2 = false
 
-    found_or_not1 = search_word_internal(pattern, DEFAULT_LIB_PATH)
+    found_or_not1 = search_related_words_internal(pattern, DEFAULT_LIB_PATH)
     if @extra_lib_path
-      found_or_not2 = search_word_internal(pattern, @extra_lib_path)
+      found_or_not2 = search_related_words_internal(pattern, @extra_lib_path)
     end
 
     if (found_or_not1 == false) && (found_or_not2 == false)
@@ -439,8 +433,9 @@ A info looks like this
     end
   end
 
+
+  # This routine is quite like `resolve_word`
   #
-  # This `search_word_internal` routine is quite like `resolve_word`
   # Notice:
   #   We handle two cases
   #
@@ -449,7 +444,7 @@ A info looks like this
   #
   #  The second is what Ruby and Perl users like to do, handle it!
   #
-  def search_word_internal(pattern, library)
+  def search_related_words_internal(pattern, library)
 
     if pattern.nil?
       abort "cr: Need an argument!".bold.red
@@ -532,7 +527,7 @@ A info looks like this
   end
 
 
-  def word_count
+  def count_words
     @counter.count!(display: true)
   end
 
@@ -542,12 +537,15 @@ end
 
 class CrypticResolver::Resolver
 
+  using Rainbow
+
   require 'tomlrb'
   require 'fileutils'
+  require 'standard_path'
 
   # attr_accessor   :default_dicts  # Default dictionaries lists
 
-  DEFAULT_LIB_PATH = File.expand_path("~/.cryptic-resolver")
+  DEFAULT_LIB_PATH = StandardPath.app_data 'Cryptic-Resolver'
 
   ORIGINAL_DEFAULT_DICTS = [
     "https://github.com/cryptic-resolver/cryptic_common.git",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cr.rb
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.7
 platform: ruby
 authors:
 - Aoran Zeng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: colorator
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: standard_path
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: |
   This command line tool `cr` is used to record and explain cryptic commands, acronyms(initialism), abbreviations and so forth in daily life.
   Not only can it be used in computer filed via our default sheet cryptic_computer, but also you can use this to manage your own knowledge base easily.
@@ -89,5 +103,5 @@ requirements: []
 rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
-summary: 'cr: Cryptic Resolver'
+summary: Resolve cryptic commands/acronyms on the command line
 test_files: []