cr.rb 4.0.0.alpha.3 → 4.0.0.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cab1b378efd946710c171f3dc45c994c5cc76a3b6672fc25fc696aa017dbb29
-  data.tar.gz: b7e9b9e5d3834ac18e898e9024cf4573f15197d00cc746f50685ea30f68efc9e
+  metadata.gz: 5c4ff483935b5b1015fb9d412056e041e81fd3fa7b94c47c8b5de8be517f8740
+  data.tar.gz: 2a207377d5dc6bf441d3940d5c142965d944ba6f05de3de7053800bd7b59fb29
 SHA512:
-  metadata.gz: f75f57865bd0651a336d2ca553c5745974f892ffa5841fb4a3420efd1714ae1e08835632f77c45f5610002cae1190dc1d9e49c68a46865d576f91b114a56b134
-  data.tar.gz: 422bc7721e40f6878bea1f47c7781e0a8fa81e982eb9dfd1fdb9e766ea4bca753c84203c231aa96b04c0de083ca711a9c4d738ed94ee08dd79b66084e3b103e7
+  metadata.gz: ddd0207e0248b713e3304f6c6781b2f186a7ba3bdc02a4a4823e9def133cfd2209d8295987217d1df92733811efc0a2beb09daa904d85305aee97a9955dda146
+  data.tar.gz: 51a67072c4631628d6a6f840e819665c2e26309cc62be9d060cc658b5b8eb19b512557c92d8840f56a32e3777211d6c114870a15208403b647bb7147ec4ca418

data/bin/cr

@@ -570,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!"))
@@ -596,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
@@ -629,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
 
 

data/lib/cr.rb

@@ -10,7 +10,7 @@
 #
 # ------------------------------------------------------
 
-CR_GEM_VERSION = "4.0.0.alpha.3"
+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.3
+  version: 4.0.0.alpha.4
 platform: ruby
 authors:
 - ccmywish