cr.rb 4.0.0.alpha.1 → 4.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf84244ffcf5db536a394a4c7c6ad9679485be53d56baf821bca8a228dd4241b
-  data.tar.gz: 13393a7e9fd9e86d021ef39e830de56ffa548c8159cf172af61c6631e1d2ee93
+  metadata.gz: 1cab1b378efd946710c171f3dc45c994c5cc76a3b6672fc25fc696aa017dbb29
+  data.tar.gz: b7e9b9e5d3834ac18e898e9024cf4573f15197d00cc746f50685ea30f68efc9e
 SHA512:
-  metadata.gz: f0e9316fb7d0e073600e815292c6ef3279cec61275a94ded64ddde456784027eb15d62c239ce953f1036212a8429546240af33bba371667d3f4958a71c823afb
-  data.tar.gz: fa316a2e6003409ba527d7ebb86ba474ebc97a3982e79826ed117a4c52b0bb6b3cfaf9b254c135db44484e9faaaee43d7fe6c956dd536dc234a934b38cf3ddc2
+  metadata.gz: f75f57865bd0651a336d2ca553c5745974f892ffa5841fb4a3420efd1714ae1e08835632f77c45f5610002cae1190dc1d9e49c68a46865d576f91b114a56b134
+  data.tar.gz: 422bc7721e40f6878bea1f47c7781e0a8fa81e982eb9dfd1fdb9e766ea4bca753c84203c231aa96b04c0de083ca711a9c4d738ed94ee08dd79b66084e3b103e7

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
 
@@ -634,11 +646,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
@@ -716,7 +728,6 @@ def word_count(p:)
   is_there_any_dict?
 
   default_lib = Dir.children(CR_DEFAULT_LIBRARY)
-  extra_lib   = Dir.children(CR_EXTRA_LIBRARY)
 
   # Count default library
   unless default_lib.empty?
@@ -729,17 +740,21 @@ def word_count(p:)
     end
   end
 
-  # Count extra library
-  unless extra_lib.empty?
-    wc = 0
-    puts(bold(blue("\nExtra library:"))) if p
-    extra_lib.each do |s|
-      wc = count_dict_words(CR_EXTRA_LIBRARY,s)
-      $ExtraLibWordCount += wc
-      puts("  #{s.ljust(17)}: #{wc}") if p
+
+  if CR_EXTRA_LIBRARY
+    extra_lib = Dir.children(CR_EXTRA_LIBRARY)
+    # Count extra library
+    unless extra_lib.empty?
+      wc = 0
+      puts(bold(blue("\nExtra library:"))) if p
+      extra_lib.each do |s|
+        wc = count_dict_words(CR_EXTRA_LIBRARY,s)
+        $ExtraLibWordCount += wc
+        puts("  #{s.ljust(17)}: #{wc}") if p
+      end
     end
-    $TwoLibWordCount = $DefaultLibWordCount + $ExtraLibWordCount
   end
+  $TwoLibWordCount = $DefaultLibWordCount + $ExtraLibWordCount
 
   if p 
   puts

data/lib/cr.rb

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