kbsecret 1.3.0.pre.1 → 1.3.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a564bac0dc6d8ba790b99238519dd12c2e1efea7fccfbf832a69e9861cb98f7
-  data.tar.gz: 502c1bb72096256a854631bf375a30f917f04fd636b28e186ce5b5294f8830e5
+  metadata.gz: 62e332544af0910c66dda052deace55c038f308734a6f61327338c02bd6d0c6c
+  data.tar.gz: 8e436c956c7713519b6ade1085866b1669d42b6a26bbdc4655151e7b0f295017
 SHA512:
-  metadata.gz: 8a508c3a12446379ba2947d78950f506214ee3c0f8240279cbc09592f44b119af150611a6d1addb18d5173cdb877da95ea9d1553ce0a0b2eef448b963abc47b2
-  data.tar.gz: 87c3e9ba9f42a2c5372b40a16bc7b8ce33042d34955e9ac65dff6fede1169be9214644c2d91f8b15d7e6d3eed19b1274a79c75cf2c6ac8e8f8d20d12b424f722
+  metadata.gz: 22f83a0907bdd794f823ae45c8ad9a264a5083221a483eaa0f26322383f695d7c01d172158e3770b32c220ac95a29cd7942f7c5584e4d6f5d953d50a19c48649
+  data.tar.gz: 54112352f2a7b65a20deac137aaa52623f286d2e158dbf22d0c27c49ad5b3e3f444067a765ac8ff441dc3ea3d4a6e1d2832f532e2419a34cc3eb730301a425f1

data/bin/kbsecret

@@ -14,14 +14,14 @@ EXT_CMDS = EXT_PATHS.map do |c|
   File.basename(c, File.extname(c)).sub!("kbsecret-", "")
 end.freeze
 
-ALIASES = Hash.new { |_, k| k }.update(
+FLAGS = Hash.new { |_, k| k }.update(
   "--help" => "help",
   "-h" => "help",
   "--version" => "version",
   "-v" => "version"
 ).freeze
 
-ALL_CMDS = (ALIASES.keys + BUILTIN_CMDS + KBSecret::CLI::Command.command_names + EXT_CMDS).freeze
+ALL_CMDS = (FLAGS.keys + BUILTIN_CMDS + KBSecret::CLI::Command.command_names + EXT_CMDS).freeze
 
 KBSECRET_HELP = <<~KBSECRET_HELP
   Usage:
@@ -55,16 +55,16 @@ def builtin?(cmd)
   BUILTIN_CMDS.include?(cmd)
 end
 
-def alias?(cmd)
-  ALIASES.keys.include?(cmd)
+def flag?(cmd)
+  FLAGS.keys.include?(cmd)
 end
 
 def normalize(cmd)
-  ALIASES[cmd]
+  KBSecret::Config.unalias_command(FLAGS[cmd])
 end
 
 def expand(cmd)
-  return cmd if alias?(cmd) || builtin?(cmd)
+  return cmd if flag?(cmd) || builtin?(cmd)
 
   "kbsecret-#{cmd}"
 end
@@ -80,7 +80,7 @@ def help(*args)
   elsif external? command
     KBSecret::CLI.die "Help is not available for external commands."
   else
-    KBSecret::CLI.die "Unknown command: '#{command}'."
+    KBSecret::CLI.die "Unknown command: #{command}."
   end
 end
 
@@ -143,5 +143,5 @@ elsif internal?(command)
 elsif external?(command)
   exec expand(command), *args
 else
-  KBSecret::CLI.die "Unknown command: '#{command}'."
+  KBSecret::CLI.die "Unknown command: #{command}."
 end

data/lib/kbsecret/cli/command/abstract.rb

@@ -28,6 +28,11 @@ module KBSecret
           end
         end
 
+        # @return [Hash, nil] the configuration for the command, if any.
+        def self.config
+          KBSecret::Config.command(command_name)
+        end
+
         # Sets up any state used by the command. Implemented by children.
         # @abstract
         def setup!

data/lib/kbsecret/cli/command/sessions.rb

@@ -22,7 +22,7 @@ module KBSecret
         def run!
           Config.session_labels.each do |sess_name|
             session_hash = Config.session(sess_name)
-            session      = cli.guard { Session[sess_name] }
+            session      = cli.guard { KBSecret::Session[sess_name] }
 
             puts sess_name
 

data/lib/kbsecret/config.rb

@@ -95,6 +95,21 @@ module KBSecret
       @command_config.dig(cmd, "args")&.shellsplit || []
     end
 
+    # Attempt to resolve an alias into a `kbsecret` command.
+    # @param acmd [String] the command alias
+    # @return [String] the `kbsecret` command, or `acmd` if the alias does not exist
+    # @example
+    #  Config.unalias_command("l") # => "list"
+    #  Config.unalias_command("madeup") # => "madeup"
+    def self.unalias_command(acmd)
+      @command_config.each do |cmd, conf|
+        aliases = conf["aliases"]&.split || []
+        return cmd if aliases.include?(acmd)
+      end
+
+      acmd
+    end
+
     # @!method session(label)
     #   Retrieve a session's configuration.
     #   @param label [String, Symbol] the session's label

data/lib/kbsecret/version.rb

@@ -2,5 +2,5 @@
 
 module KBSecret
   # kbsecret's current version
-  VERSION = "1.3.0.pre.1"
+  VERSION = "1.3.0.pre.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kbsecret
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.1
+  version: 1.3.0.pre.2
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba