cr.rb 4.0.0.alpha.2 → 4.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ac16436cda04a1ca727329c6508f8c228d5049beb47ba02da193a684b1174d
-  data.tar.gz: f303ed5311033dbcab4a66eec6ad786633c02e4967e286711681b77b4a01a726
+  metadata.gz: 5c4ff483935b5b1015fb9d412056e041e81fd3fa7b94c47c8b5de8be517f8740
+  data.tar.gz: 2a207377d5dc6bf441d3940d5c142965d944ba6f05de3de7053800bd7b59fb29
 SHA512:
-  metadata.gz: 52f6b13011db64ac7c439e323ccf2093656b6dcc2e337815f68323a9bd5f79f3d33f0a2f1f2f6906c7d3d6e4e954c8a8573884268990c99ad7bd6426682de21e
-  data.tar.gz: 1474e51ef60c31035104a0c66b168a1545f90085b13d3d8e468aa182f67885b8af3dbd7f1ed462b7b1251f847240255f8e0bf817bf2b94c1fbf88a3ef15ff0c2
+  metadata.gz: ddd0207e0248b713e3304f6c6781b2f186a7ba3bdc02a4a4823e9def133cfd2209d8295987217d1df92733811efc0a2beb09daa904d85305aee97a9955dda146
+  data.tar.gz: 51a67072c4631628d6a6f840e819665c2e26309cc62be9d060cc658b5b8eb19b512557c92d8840f56a32e3777211d6c114870a15208403b647bb7147ec4ca418

data/bin/cr

@@ -54,6 +54,15 @@ else
 end
 
 
+# Prevent runtime error
+if not CR_EXTRA_LIBRARY.nil?
+  if ! test('d', CR_EXTRA_LIBRARY)
+    puts "FATAL: Your CRYPTIC_RESOLVER_CONFIG's option 'EXTRA_LIBRARY' is NOT a legal directory!"
+    exit 1
+  end
+end
+
+
 # This is used to display what you are pulling when adding dicts
 CR_DEFAULT_DICTS_USER_AND_NAMES = CR_DEFAULT_DICTS.map do |e|
   user, repo = e.split('/').last(2)
@@ -313,11 +322,11 @@ end
 #                 # category
 #
 #   [blah]
-#   same = "XDG downloader <=>xdg.Download" # this is correct
+#   same = "XDG downloader =>xdg.Download" # this is correct
 #
 #   [blah]
 #   name = "BlaH" # You may want to display a better name first
-#   same = "XDG downloader <=>xdg.Download" # this is correct
+#   same = "XDG downloader =>xdg.Download" # this is correct
 #
 #
 def pp_same_info(library, dict, word, cache_content, same_key, own_name)
@@ -339,13 +348,13 @@ def pp_same_info(library, dict, word, cache_content, same_key, own_name)
   # 
   # 'jump to' will output to user, so this is important not only inside our sheet.
   #   
-  #     same = "XDM downloader<=>xdm.Download"
+  #     same = "XDM downloader=>xdm.Download"
   #
-  # We split 'same' key into two parts via spaceship symbol <=>, first part will
+  # 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("<=>")
+  jump_to, same = same_key.split("=>")
   same =  jump_to if same.nil?
 
   unless own_name
@@ -517,7 +526,7 @@ def resolve_word(word)
   index = word.chr
   case index 
   when '0'..'9' 
-    index = '0123456789'
+    index = '0-9'
   end
 
   # cache lookup's results
@@ -543,9 +552,12 @@ cr: Not found anything.
 
 You may 
   1. Use `cr -u` to update all dicts 
-  2. Use `cr -a user/repo` to add more available dicts
-  
-     See: https://github.com/cryptic-resolver
+
+  2. Use 
+      
+    `cr -l`  to list available official dicts
+    
+    `cr -a repo`  to add some dicts
   
   3. Contribute to theses dicts
 
@@ -558,18 +570,35 @@ NotFound
 end
 
 
+#
+# Delegate to `search_word_internal`
+#
+def search_word(pattern)
+  found_or_not1 = false
+  found_or_not2 = false
+
+  found_or_not1 = search_word_internal(pattern, CR_DEFAULT_LIBRARY)
+  if CR_EXTRA_LIBRARY
+    found_or_not2 = search_word_internal(pattern, CR_EXTRA_LIBRARY)
+  end
+
+  if (found_or_not1 == false) && (found_or_not2 == false)
+    puts red("cr: No words match with #{pattern.inspect}")
+    puts
+  end
+end
 
 #
-# This `search_word` routine is quite like `resolve_word`
+# 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 '/blahblah/'
+#   2. the 'pattern' is like '/blah/'
 #                       
 #  The second is what Ruby and Perl users like to do, handle it!
 #
-def search_word(pattern)
+def search_word_internal(pattern, library)
 
   if pattern.nil? 
     puts bold(red("cr: Need an argument!"))
@@ -584,24 +613,24 @@ def search_word(pattern)
     regexp = %r[#{pattern}]
   end
   
-  found = false
+  found_or_not = false
 
   #
   # Try to match every word in all dicts
   #
-  Dir.children(CR_DEFAULT_LIBRARY).each do |dict|
-    sheets = Dir.children(File.join(CR_DEFAULT_LIBRARY, dict)).select do
+  Dir.children(library).each do |dict|
+    sheets = Dir.children(File.join(library, dict)).select do
       _1.end_with?('.toml')
     end
 
     similar_words_in_a_dict = []
 
     sheets.each do |sheet|
-      sheet_content = load_sheet(dict, File.basename(sheet,'.toml'))
+      sheet_content = load_sheet(library, dict, File.basename(sheet,'.toml'))
 
       sheet_content.keys.each do 
         if _1 =~ regexp
-          found = true
+          found_or_not = true
           similar_words_in_a_dict << _1
         end
       end
@@ -617,10 +646,7 @@ def search_word(pattern)
       puts 
     end
   end
-  if !found
-    puts red("cr: No words match with #{regexp.inspect}")
-    puts
-  end
+  return found_or_not
 end
 
 
@@ -634,11 +660,11 @@ Usage:
   cr emacs          => Edit macros: A feature-rich editor
   cr -c             => Print word count
   cr -l             => List local dicts and official dicts
-  cr -u             => Update all dicts in default library
+  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  reponame   => Add an official dict from Github
+  cr -a  repo       => Add an official dict from Github
 
   cr -d cryptic_xx  => Delete a dict
   cr -s pattern     => Search words matched with pattern
@@ -728,7 +754,7 @@ def word_count(p:)
     end
   end
 
-  
+
   if CR_EXTRA_LIBRARY
     extra_lib = Dir.children(CR_EXTRA_LIBRARY)
     # Count extra library

data/lib/cr.rb

@@ -10,7 +10,7 @@
 #
 # ------------------------------------------------------
 
-CR_GEM_VERSION = "4.0.0.alpha.2"
+CR_GEM_VERSION = "4.0.0.alpha.4"
 
 
 CR_OFFICIAL_DICTS = <<-EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cr.rb
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.2
+  version: 4.0.0.alpha.4
 platform: ruby
 authors:
 - ccmywish