whatoption 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dceb90256c82b20eb0838c98b9aa75ed1747662d93b96232e20164e1279d3ff
-  data.tar.gz: 8a4c446c1961099ce494e2c669154d3bbc8d8c80294e4bc179ae6ae619f7d1fb
+  metadata.gz: eba18bf18642b07d11d846b7abbaf16932df2b47ac8a86128243ae5c4a0e5825
+  data.tar.gz: 487e4c5d7fb30d871deeefcf04f80b9a6f9d82bc80a8cbd4167b25ab27cfaa77
 SHA512:
-  metadata.gz: 5baf5062312181ecb72ffff8ac6aefda961c2f499648d4d94657495ad5febc5cdc427102172b2e29497ff2ee381b30638a18970c5bde608622e0fe0aedb553aa
-  data.tar.gz: 170829ba3140198e7e7bf711b5275450375258b56dca1c0577b87febd13a1ce811a730c16237094055f8c4f615c2fc32fd4047579bfaf6fc01386e8e32087ec3
+  metadata.gz: 0d945a051921d4b807594f203ab8fc96008e3c392126bd841ffab2d3d280016f9d6bb33a7d718c6ae7a6aeb970aba4d56a3c923ca3ee6ba95c2866843c1921c2
+  data.tar.gz: 11f2853c227dcb57fd037a28c809ef1325c7a9eb050e02f8eacf5294656c7edccdd482a82e90bb1ab2ff5db182209b8f59e281cafe0402c374a2f8eac4f36ede

data/bin/whatoption

@@ -61,6 +61,8 @@ class WhatOption::CliHandler
 
   # routine
   def help
+    puts("WhatOption v#{WhatOption::VERSION}")
+    puts
     puts <<~HELP
       Usage:
 
@@ -77,6 +79,8 @@ class WhatOption::CliHandler
         whatoption ruby -c
         whatoption tar  x
         whatoption git ls-files -z
+        whatoption bash -c
+        whatoption bash [ -n
 
     HELP
   end

data/lib/whatoption.rb

@@ -17,7 +17,7 @@
 
 module WhatOption
 
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 
   require 'pathname'
   OPTIONS_DATA_DIR = Pathname.new File.expand_path("~/.whatoption")
@@ -42,8 +42,9 @@ module WhatOption
 
       @file             # the target TOML file we will load in
 
-      @rec_option       # record field in toml file
-      @rec_desc         # record field in toml file
+      @rec_usage        # record field: the option's usage
+      @rec_desc         # record field: the option's own meaning
+      @rec_func         # record field: the function of the option
 
 =end
 
@@ -63,14 +64,25 @@ module WhatOption
 
     # routine
     def load_sheet
+      require 'tomlrb'
       # It's very interesting here, you have to put parentheses then 'commands.join()' is
       # treated as a string.
       # Without parentheses, the + is affected by OPTIONS_DATA_DIR,
       # So first '+'s both side are Pathname
       # And '+' is to add a '/' to component
       @file = OPTIONS_DATA_DIR + (@commands.join('/') + ".toml")
+
+      # if the file not exists, it is maybe in the dir (with its own name)
+      # For example:
+      #   "bash -c" will first search 'ROOT/bash.toml'
+      #   if not exist, then we will search 'ROOT/bash/bash.toml'
+      #
+      if ! File.exist? @file
+        @file = Pathname.new(@file.to_s.delete_suffix(".toml")) +
+                (@commands.last + ".toml")
+      end
+
       if File.exist? @file
-        require 'tomlrb'
         return Tomlrb.load_file @file
       else
         puts "File #@file not exist!"
@@ -89,12 +101,15 @@ module WhatOption
       record = sheet[@option] ||
         puts("Error: Option [#@option] is not recorded in #@file".red) ||
         exit(1)
-      @rec_option = record['option'] ||
-        puts("Error: No field 'option' in #@file [#@calling_command]".red) ||
+      @rec_usage = record['usage'] ||
+        puts("Error: No field 'usage' in #@file [#@calling_command]".red) ||
         exit(1)
       @rec_desc   = record['desc']   ||
         puts("Error: No field 'desc' in #@file [#@calling_command]".red) ||
         exit(1)
+      @rec_func   = record['func']   ||
+        puts("Error: No field 'func' in #@file [#@calling_command]".red) ||
+        exit(1)
     end
 
 
@@ -106,12 +121,14 @@ module WhatOption
       if not @sub_commands.empty?
         result_cmd += ' ' + @sub_commands.join(' ').blue
       end
-      result_cmd += ' ' + @rec_option.magenta
+      result_cmd += ' ' + @rec_usage.magenta
       puts result_cmd
 
       # newline description
-      print "\n  "
+      print "\n  #{@option}: "
       puts @rec_desc.green
+      print "\n  "
+      puts @rec_func
       puts
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatoption
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ccmywish
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb