cr.rb 4.1.2 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4956248002fc5393f2a85f894239434599f1c10535f90f8f7f80c5996a7b395
-  data.tar.gz: 4000408dedca70e9234130de2fbf66df60e6973c895f806667e6401e458b5090
+  metadata.gz: 624c2bec73d0e1c7af063aec76ce582a38a2b73c56d8680a3d67a8f293b8695b
+  data.tar.gz: 49b1c1aa5c178087d94e70d3110c7a7e3b479478723be80c5ff67467c05d1634
 SHA512:
-  metadata.gz: 425899ebb33d5fc54080dc4c50583e678442d8f6110f1dfbe1134e96ea5d1d9c2c34665575b0145ec374fdd71d88f8646817be930f44ece8437d9967b2de92c2
-  data.tar.gz: 84f8c04209eec1c16183eabb511b9a9fd686008e0aaa1cc8525238f61f50195a0b8623010dd7a6fbfab9f7eea0391d06c73fcd123ac77e8fa77a729c4f3cbe41
+  metadata.gz: 83b2810d78b2081006474f50df69ab8765327c8c9715d491204548ac4bd5f0c17edb30c5b551a9d30c0d825d93b8d709258a13dc359aa3fce9c9e9c0379893dd
+  data.tar.gz: 98c6ac9a3eb0273097d24144013477c7d11cc20ed3818ac79c1779e72b0aad932573b0e39bda08ac1c8c14588ab6929dc2bad6e920e7e287df6e0454b15db9be

data/bin/cr

@@ -3,7 +3,7 @@
 # File          : cr.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2021-07-08>
-# Last modified : <2023-02-12>
+# Last modified : <2023-03-22>
 #
 # cr:
 #
@@ -518,7 +518,10 @@ A info looks like this
 
     # Try to match every word in all dicts
     Dir.children(library).each do |dict|
-      sheets = Dir.children(File.join(library, dict)).select do
+
+      path = File.join(library, dict)
+      next if File.file? path
+      sheets = Dir.children(path).select do
         _1.end_with?('.toml')
       end
 
@@ -553,24 +556,31 @@ A info looks like this
   # 2. List Extra   library's dicts
   # 3. List official dicts
   def list_dicts
-    Dir.chdir DEFAULT_LIB_PATH do
-      puts blue("=> Default library: #{DEFAULT_LIB_PATH}")
-      Dir.children(DEFAULT_LIB_PATH).each_with_index do |dict,i|
-        puts "#{blue(i+1)}. #{bold(green(dict))}"
+
+    def _do_the_same_thing
+      count = 0
+      Dir.children(".").each do |dict|
+        next if File.file? dict
+        count += 1
+        prefix = (count.to_s + '.').ljust 4
+        puts "  #{prefix}#{dict}"
       end
     end
 
+    Dir.chdir DEFAULT_LIB_PATH do
+      puts bold(green("Default library: #{DEFAULT_LIB_PATH}"))
+      _do_the_same_thing
+    end
+
     if @extra_lib_path
       puts
       Dir.chdir @extra_lib_path do
-        puts blue("=> Extra library: #{@extra_lib_path}")
-        Dir.children(@extra_lib_path).each_with_index do |dict,i|
-          puts "#{blue(i+1)}. #{bold(green(dict))}"
-        end
+        puts bold(green("Extra library: #{@extra_lib_path}"))
+        _do_the_same_thing
       end
     end
 
-    puts ; puts blue("=> Official dicts: (Add it by 'cr -a xxx')")
+    puts ; puts bold(green("Official dictionaries: (Add it by 'cr -a xxx')"))
     puts RECOMMENDED_DICTS
   end
 

data/lib/cr/version.rb

@@ -2,7 +2,7 @@
 # File          : version.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2023-02-12>
-# Last modified : <2023-02-13>
+# Last modified : <2023-03-22>
 #
 # version:
 #
@@ -11,6 +11,6 @@
 
 module CrypticResolver
 
-  GEM_VERSION = "4.1.2"
+  GEM_VERSION = "4.1.4"
 
 end

data/lib/cr.rb

@@ -2,7 +2,7 @@
 # File          : cr.rb
 # Authors       : ccmywish <ccmywish@qq.com>
 # Created on    : <2022-04-15>
-# Last modified : <2023-02-13>
+# Last modified : <2023-03-22>
 #
 # cr:
 #
@@ -55,15 +55,14 @@ class CrypticResolver::Resolver
     linux       technology
 
   #{yellow("Field:")}
-    electronics   economy     medicine
-    mechanical   science       math
+    economy     medicine   electronics
+    science       math
 
   #{yellow("Specific:")}
-    dos         x86        signal
+      x86        signal
 
   #{yellow("Feature:")}
     ccmywish/CRuby-Source-Code-Dictionary
-    ccmywish/mruby-Source-Code-Dictionary
 
   EOF
 
@@ -186,13 +185,15 @@ class CrypticResolver::Resolver::Counter
     @resolver = resolver
   end
 
-
+  # a.toml
+  # b.toml
+  # ...
   def count_dict_words(library, dict)
     dict_dir = library + "/#{dict}"
     wc = 0
     Dir.children(dict_dir).each do |entry|
-      next if File.file? entry
       next unless entry.end_with?('.toml')
+      next if File.directory? dict_dir + "/#{entry}"
       sheet_content = @resolver.load_sheet(library, dict, entry.delete_suffix('.toml'))
       count = sheet_content.keys.count
 
@@ -204,12 +205,13 @@ class CrypticResolver::Resolver::Counter
 
   # Count default library
   def count_def_lib(display: )
-    default_lib = Dir.children(CrypticResolver::Resolver::DEFAULT_LIB_PATH)
+    path = CrypticResolver::Resolver::DEFAULT_LIB_PATH
+    default_lib = Dir.children path
     unless default_lib.empty?
       puts bold(green("Default library: "))  if display
       default_lib.each do |s|
-        next if File.file? s
-        wc = count_dict_words(CrypticResolver::Resolver::DEFAULT_LIB_PATH,s)
+        next if File.file? path + "/#{s}"
+        wc = count_dict_words(path,s)
         @word_count_of_def_lib += wc
         # With color, ljust not works, so we disable color
         puts("#{wc.to_s.rjust(5)}  #{s}")   if display
@@ -222,12 +224,11 @@ class CrypticResolver::Resolver::Counter
   # Count extra library
   def count_extra_lib(display: )
     if path = @resolver.extra_lib_path
-      extra_lib = Dir.children(path)
+      extra_lib = Dir.children path
       unless extra_lib.empty?
-        wc = 0
-        puts(bold(green("\nExtra library:")))  if display
+        puts bold(green("\nExtra library:"))  if display
         extra_lib.each do |s|
-          next if File.file? s
+          next if File.file? path + "/#{s}"
           wc = count_dict_words(path,s)
           @word_count_of_extra_lib += wc
           puts("#{wc.to_s.rjust(5)}  #{s}")  if display

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cr.rb
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.4
 platform: ruby
 authors:
 - Aoran Zeng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: 'cr: Cryptic Resolver'