cr.rb 3.17.0 → 3.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcff493846a9384661cdbeccdb88a225d5f0a7b180f97e04feeda0ba3e1c5e4
-  data.tar.gz: a4916f5e641026b1905ccd88c3e7f4ab94f55aff93be0caca2b2a4e6cc75cbc6
+  metadata.gz: ca8565c920ad88810679a65744a52f0c9497ef3a75bab525fae5b501349912b7
+  data.tar.gz: f6d7f3c3f85caa6382f13492a94a34725600cb5ea57757442cd76a9b69360461
 SHA512:
-  metadata.gz: 100baa0634561310d3cbaa612b3cebb2b22d59215bdb4c0f19d74bbf6c5517fc10f80c75b289dd1fe3e2c3b1583a2198f5413a0018e8d9b135bbe0b65f23db45
-  data.tar.gz: 90a547412b1a4139dd49e93459ef0873501a3b796fee0b616922532746bdaec43d5eec8caca3820e9c3f5233c6fd826e452494952b7f1253d45cac76f1d6f6f3
+  metadata.gz: 7c0482249c89b01522d0cb563fe4e0e647c4c4cbb602090fb1ba740fc366c892c039b02242987031494b6077df0365ff5416ccb00eb61b929a085760349f5a00
+  data.tar.gz: c775012412a10c1fea53f43055f7bd95add6ba9954327d77f182f157556c346de160855348847004aa634700494bdc486eed937b632ae1b5cac31c0c90ca1da4

data/bin/cr

@@ -4,7 +4,7 @@
 # File          : cr.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2021-07-08>
-# Last modified : <2022-04-11>
+# Last modified : <2022-04-15>
 #
 # cr:
 #
@@ -14,6 +14,7 @@
 #
 # ------------------------------------------------------
 
+require 'cr'
 require 'tomlrb'
 require 'fileutils'
 
@@ -26,8 +27,6 @@ CRYPTIC_DEFAULT_DICTS = {
   medicine: "https://github.com/cryptic-resolver/cryptic_medicine.git"
 }
 
-CR_GEM_VERSION = "3.17.0"
-
 
 ####################
 # helper: for color
@@ -156,6 +155,9 @@ def add_dict(repo)
     exit -1
   end
 
+  # Ensure the cr home dir exists
+  FileUtils.mkdir_p(CRYPTIC_RESOLVER_HOME)
+
   begin
     puts "cr: Adding new dictionary..."
     `git -C #{CRYPTIC_RESOLVER_HOME} clone #{repo} -q`
@@ -211,26 +213,26 @@ end
 #
 # A info looks like this
 #   emacs = {
-#     disp = "Emacs" 
+#     name = "Emacs" 
 #     desc = "edit macros"
-#     full = "a feature-rich editor"
+#     more = "a feature-rich editor"
 #     see  = ["Vim"]
 #   }
 #
 # @param info [Hash] the information of the given word (mapped to a keyword in TOML) 
 #
 def pp_info(info)
-  disp = info['disp'] || red("No name!")  # keyword `or` is invalid here in Ruby
+  name = info['name'] || red("No name!")  # keyword `or` is invalid here in Ruby
   
   desc = info['desc']
-  full = info['full']
+  more = info['more']
   
   if desc 
-    puts "\n  #{disp}: #{desc}"
-    print "\n  ",full,"\n" if full
+    puts "\n  #{name}: #{desc}"
+    print "\n  ",more,"\n" if more
   else
-    puts "\n  #{disp}"
-    print "\n  ",full,"\n" if full
+    puts "\n  #{name}"
+    print "\n  ",more,"\n" if more
   end
 
   if see_also = info['see']
@@ -265,7 +267,7 @@ end
 #   same = "XDG downloader <=>xdg.Download" # this is correct
 #
 #   [blah]
-#   disp = "BlaH" # You may want to display a better name first
+#   name = "BlaH" # You may want to display a better name first
 #   same = "XDG downloader <=>xdg.Download" # this is correct
 #
 #
@@ -342,7 +344,7 @@ def pp_same_info(dict, word, cache_content, same_key, own_name)
     return false
   # double or more jumps
   elsif same_key = info['same']
-    own_name = info['disp']
+    own_name = info['name']
     return pp_same_info(dict, same, cache_content, same_key, own_name)
   else
     pp_info(info)
@@ -391,7 +393,7 @@ def lookup(dict, file, word)
 
   # synonym info print
   if same_key = info['same']
-    own_name = info['disp']
+    own_name = info['name']
     pp_dict(dict)
     pp_same_info(dict, word, sheet_content, same_key, own_name)
     # It's also a type 1
@@ -401,14 +403,14 @@ def lookup(dict, file, word)
 
   # normal info print
   # To developer:
-  #   The word should at least has one of `desc` and `full`
+  #   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. 
   #   
   #   So, just ignore it, even if it's really a mistake(insignificant)
   #   by dictionary maintainers.
   #
-  if !is_jump && (info.has_key?('desc') || info.has_key?('full'))
+  if !is_jump && (info.has_key?('desc') || info.has_key?('more'))
     pp_dict(dict)
     pp_info(info)
     type_1_exist_flag = true
@@ -416,7 +418,7 @@ def lookup(dict, file, word)
 
   # Meanings with category specifier
   # We call this meaning as type 2
-  categories = info.keys - ["disp", "desc", "full", "same", "see"]
+  categories = info.keys - ["name", "desc", "more", "same", "see"]
 
   if !categories.empty?
 
@@ -429,7 +431,7 @@ def lookup(dict, file, word)
     categories.each do |meaning|
       info0 = sheet_content[word][meaning]
       if same_key = info0['same']
-        own_name = info0['disp']
+        own_name = info0['name']
         pp_same_info(dict, word, sheet_content, same_key, own_name)
       else
         pp_info(info0)
@@ -580,15 +582,15 @@ def help
 cr: Cryptic Resolver v#{CR_GEM_VERSION} (#{$WordCount} words: default/#{$DefaultWordCount} user/#{user_words})
 
 usage:
-  cr -v                  => Print version
-  cr -h                  => Print this help
-  cr -c                  => Print word count
-  cr -l                  => List local dictionaries
-  cr -u                  => Update all dictionaries
-  cr -a xx.com/repo.git  => Add a new dictionary
-  cr -d cryptic_xx       => Delete a dictionary
-  cr -s pattern          => Search words matched with pattern
-  cr emacs               => Edit macros: a feature-rich editor
+  cr -v             => Print version
+  cr -h             => Print this help
+  cr -c             => Print word count
+  cr -l             => List local dictionaries
+  cr -u             => Update all dictionaries
+  cr -a repo.git    => Add a new dictionary
+  cr -d cryptic_xx  => Delete a dictionary
+  cr -s pattern     => Search words matched with pattern
+  cr emacs          => Edit macros: a feature-rich editor
 
 HELP
 

data/lib/cr.rb

@@ -0,0 +1,13 @@
+# ------------------------------------------------------
+# File          : cr.rb
+# Authors       : ccmywish <ccmywish@qq.com>
+# Created on    : <2022-04-15>
+# Last modified : <2022-04-15>
+#
+# cr:
+#
+#   This file is just a lib
+#
+# ------------------------------------------------------
+
+CR_GEM_VERSION = "3.18.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cr.rb
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.18.2
 platform: ruby
 authors:
 - ccmywish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -48,12 +48,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/cr
-homepage: https://github.com/cryptic-resolver/cr
+- lib/cr.rb
+homepage: https://github.com/cryptic-resolver/cr.rb
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/cryptic-resolver/cr/issues
-  source_code_uri: https://github.com/cryptic-resolver/cr
+  bug_tracker_uri: https://github.com/cryptic-resolver/cr.rb/issues
+  source_code_uri: https://github.com/cryptic-resolver/cr.rb
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -69,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.11
 signing_key: 
 specification_version: 4
 summary: 'cr: Cryptic Resolver'