kbsecret 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c844ec45d84acd1d1d5d6878e529033ed635b40
-  data.tar.gz: '0295353f72349f8d4093e8deb9c4997fdeeedf5e'
+  metadata.gz: ef3c6ce21470ae9c4b272d68120299f23eaba85d
+  data.tar.gz: 0104f269fbd814723b3b9e482bdedc9636cb0872
 SHA512:
-  metadata.gz: 5b766fd0d88a38d6a62c8c8e045e23614ea1e587765357a4eb133ab4c636cd92f8284f7b8cc830ba150286429c268a60775a71f5b627b5ebf0d4a9398473f90e
-  data.tar.gz: a173436a8c6f76bae01f8b93f69f4d9aaa87f350065b649ee681b437a2fd98a8e44785552373e684acfb09178a2e27cb8cc7fbf1caa3834a869c8ad89b253dd5
+  metadata.gz: 022ab311dd0bc0d31214fa684f078425fb92fc8c54f8eb47103078655b0678deab27bb49b338691fe416e4b3ab66402f4e4c78cd625684d92c50035b94c396b3
+  data.tar.gz: cf4b0df49500576fdf41d0fbf4c755510925208767670df105c6a1cbefec6fd1f5f3448c3069187be74aa3a92cc22b6582789019fccf07012a57c8f0e683bc43

data/bin/kbsecret-list

@@ -17,6 +17,7 @@ cmd = CLI.new do
     o.bool "-a", "--show-all", "show everything in each secret (i.e. metadata)"
   end
 
+  ensure_type!
   ensure_session!
 end
 

data/bin/kbsecret-new

@@ -8,10 +8,10 @@ require "tty-prompt"
 include KBSecret
 
 # allows for abbreviated types (e.g., `kbsecret new env ...`)
-TYPE_ALIASES = Abbrev.abbrev(Record.record_types).freeze
+TYPE_ALIASES = Hash.new { |_, k| k }.update(Abbrev.abbrev(Record.record_types)).freeze
 
-cmd = CLI.new do
-  slop do |o|
+cmd = CLI.create do |c|
+  c.slop do |o|
     o.banner = <<~EOS
       Usage:
         kbsecret new [options] <type> <label>
@@ -24,13 +24,14 @@ cmd = CLI.new do
     o.bool "-e", "--echo", "echo input to tty (only affects interactive input)"
   end
 
-  dreck do
+  c.dreck do
     string :type
     string :label
-    list :string, :fields
+    list :string, :fields if c.opts.args?
   end
 
-  ensure_session!
+  c.ensure_type! :argument
+  c.ensure_session!
 end
 
 type          = cmd.args[:type]

data/lib/kbsecret/cli.rb

@@ -20,22 +20,32 @@ module KBSecret
     attr_reader :session
 
     # Encapsulate both the options and trailing arguments passed to a `kbsecret` command.
+    # @yield [CLI] the {CLI} instance to specify
+    # @return [CLI] the command's initial state
     # @example
-    #  cmd = KBSecret::CLI.new do
-    #    slop do |o|
+    #  cmd = KBSecret::CLI.create do |c|
+    #    c.slop do |o|
     #      o.string "-s", "--session", "session label"
     #      o.bool "-f", "--foo", "whatever"
     #    end
     #
-    #    dreck do
+    #    c.dreck do
     #      string :name
     #    end
     #
-    #    ensure_session!
+    #    c.ensure_session!
     #  end
     #
     #  cmd.opts # => Slop::Result
     #  cmd.args # => Dreck::Result
+    def self.create(&block)
+      cmd = CLI.new(&block)
+      yield cmd
+      cmd
+    end
+
+    # @api private
+    # @deprecated see {create}
     def initialize(&block)
       @trailing = ARGV
       guard { instance_eval(&block) }
@@ -97,6 +107,11 @@ module KBSecret
       @session = Session.new label: label
     end
 
+    def ensure_type!(where = :option)
+      type = where == :option ? @opts[:type] : @args[:type]
+      Record.class_for type
+    end
+
     # "Guard" a block by propagating any exceptions as fatal (unrecoverable)
     #   errors.
     # @return [Object] the result of the block

data/lib/kbsecret/exceptions.rb

@@ -9,14 +9,14 @@ module KBSecret
   class RecordLoadError < KBSecretError
     def initialize(path)
       base = File.basename(path)
-      super "Failed to load record in file: #{base}"
+      super "Failed to load record in file: '#{base}'"
     end
   end
 
   # Raised during record creation if an unknown record type is requested.
   class RecordTypeUnknownError < KBSecretError
     def initialize(type)
-      super "Unknown record type: #{type}"
+      super "Unknown record type: '#{type}'"
     end
   end
 

data/lib/kbsecret/record.rb

@@ -23,9 +23,12 @@ module KBSecret
     end
 
     # @param type [String, Symbol] the record type
-    # @return [Class, nil] the record class corresponding to the given type
+    # @return [Class] the record class corresponding to the given type
+    # @raise [RecordTypeUnknownError] if the requested type is unknown
     def self.class_for(type)
-      record_classes.find { |c| c.type == type.to_sym }
+      klass = record_classes.find { |c| c.type == type.to_sym }
+      raise RecordTypeUnknownError, type unless klass
+      klass
     end
 
     # @param type [String, Symbol] the record type
@@ -39,6 +42,7 @@ module KBSecret
     # @param session [Session] the session to load into
     # @param path [String] the fully-qualified record path
     # @return [Record::AbstractRecord] the loaded record
+    # @raise [RecordLoadError] if an error occurs during record loading
     # @api private
     def self.load_record!(session, path)
       hsh   = JSON.parse(File.read(path), symbolize_names: true)

data/lib/kbsecret/session.rb

@@ -63,7 +63,6 @@ module KBSecret
     #  arguments does not match the record type's constructor
     def add_record(type, label, *args)
       klass = Record.class_for(type.to_sym)
-      raise RecordTypeUnknownError, type unless klass
 
       arity = klass.instance_method(:initialize).arity - 2
       raise RecordCreationArityError.new(arity, args.size) unless arity == args.size

data/lib/version.rb

@@ -2,5 +2,5 @@
 
 module KBSecret
   # kbsecret's current version
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kbsecret
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm