kbsecret 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df49a867fa247712bc62cae7be000a45302ba12b5b3c02a9af9949132f11fa0f
-  data.tar.gz: 6f6d4682d773569f6bfe46506d6417d365408c6ad570e485b97a5163f0d743e0
+  metadata.gz: eba1afed2a8a01e07aeac416b3b8f77f135bbfe8250b9ecb38e8893ae07c0d5d
+  data.tar.gz: 8903e8beb923fc77b84b0fad9dab5361bcdba341b799018cf202d93b0dbc6138
 SHA512:
-  metadata.gz: 2cc8247df39a5d07118ed074f0f1126aaa321964379dfe27c88bededc409a66a725453a41c3ce232fb8b9d9c28e35db009e48b0beee894fa7b1b6d331ef5f60e
-  data.tar.gz: 6a1c30cf85e0e46a594c2e7dda3c15f33a0b68a98f3d9f645d528fc303300d7f6b4f7a1d27c5362225406c023022e7afbb13f06eaa64639b39d21ef45b08e2b8
+  metadata.gz: '04807954fe29c7ebc99f95db0498695ddde596d64df8a6c72513481b74b9bd6351be43b217722717aa12ac9746fd4b3eb82a12ba3ebffac84081a3ebafef8632'
+  data.tar.gz: d31d80ab7145bc7b8d26dae8a215efe2ad008d21e16962d23c200bc3022bb09fcff29222a5a8ec3275174be878072b6d197ae5f2ebd7103855ccae91ba0638f7

data/lib/kbsecret/cli.rb

@@ -7,14 +7,17 @@ require "dreck"
 require "abbrev"
 require "pastel"
 require "io/console"
+require "forwardable"
 
 module KBSecret
   # An encapsulation of useful methods for kbsecret's CLI.
   # Most methods in this class assume that they are being called from the context of
   # a command-line utility.
   class CLI
+    extend Forwardable
+
     # Abbreviations for record types (e.g., `env` for `environment`).
-    TYPE_ALIASES = Hash.new { |_, k| k }.update(Abbrev.abbrev(Record.record_types)).freeze
+    TYPE_ALIASES = Abbrev.abbrev Record.record_types
 
     # ANSI color objects for prettifying output.
     GREEN, YELLOW, RED = ->(p) { [p.green, p.yellow, p.red].map(&:detach) }.call(Pastel.new)
@@ -31,6 +34,54 @@ module KBSecret
     #   via {#ensure_session!}
     attr_reader :session
 
+    class << self
+      # Print an error message and terminate.
+      # @param msg [String] the message to print
+      # @return [void]
+      # @note This method does not return!
+      def die(msg)
+        fatal = ENV["NO_COLOR"] ? "Fatal" : RED["Fatal"]
+        abort "#{fatal}: #{msg}"
+      end
+
+      # Finds a reasonable default field separator by checking the environment first
+      #  and then falling back to ":".
+      # @return [String] the field separator
+      def ifs
+        ENV["IFS"] || ":"
+      end
+
+      # @return [IO] the IO object corresponding to the current standard input
+      # @note Internal `kbsecret` commands should use this, and not `STDIN`.
+      def stdin
+        $stdin
+      end
+
+      # @return [IO] the IO object corresponding to the current standard output
+      # @note Internal `kbsecret` commands should use this, and not `STDOUT`.
+      def stdout
+        $stdout
+      end
+
+      # @return [IO] the IO object corresponding to the current standard error
+      # @note Internal `kbsecret` commands should use this, and not `STDERR`.
+      def stderr
+        $stderr
+      end
+
+      # Searches for an executable on the user's `$PATH`.
+      # @param util [String] the name of the executable to search for.
+      # @return [Boolean] whether or not `util` is available on the `$PATH`.
+      # @example
+      #  CLI.installed? "foo" # => false
+      #  CLI.installed? "gcc" # => true
+      def installed?(util)
+        ENV["PATH"].split(File::PATH_SEPARATOR).any? do |path|
+          File.executable?(File.join(path, util))
+        end
+      end
+    end
+
     # 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
@@ -61,6 +112,8 @@ module KBSecret
       guard { yield self }
     end
 
+    def_delegators :"self.class", :die, :ifs, :stdin, :stdout, :stderr, :installed?
+
     # Parse options for a `kbsecret` command, adding some default options for
     #  introspection, verbosity, and help output.
     # @param cmds [Array<String>] additional commands to print in `--introspect-flags`
@@ -152,7 +205,7 @@ module KBSecret
     def guard
       yield
     rescue => e
-      self.class.stderr.puts e.backtrace if @opts&.debug?
+      stderr.puts e.backtrace if @opts&.debug?
       die "#{e.to_s.capitalize}."
     end
 
@@ -161,11 +214,11 @@ module KBSecret
     # @param echo [Boolean] whether or not to echo the user's input
     # @return [String] the user's response, with trailing newline removed
     def prompt(question, echo: true)
-      if !echo && self.class.stdin.tty?
-        self.class.stdin.getpass("#{question} ")
+      if !echo && stdin.tty?
+        stdin.getpass("#{question} ")
       else
-        self.class.stdout.print "#{question} "
-        self.class.stdin.gets.chomp
+        stdout.print "#{question} "
+        stdin.gets.chomp
       end
     end
 
@@ -174,7 +227,7 @@ module KBSecret
     # @return [void]
     def info(msg)
       info = ENV["NO_COLOR"] ? "Info" : GREEN["Info"]
-      self.class.stderr.puts "#{info}: #{msg}"
+      stderr.puts "#{info}: #{msg}"
     end
 
     # Print an information message, but only if verbose output has been enabled.
@@ -200,62 +253,7 @@ module KBSecret
     def warn(msg)
       return if @opts.no_warn?
       warning = ENV["NO_COLOR"] ? "Warning" : YELLOW["Warning"]
-      self.class.stderr.puts "#{warning}: #{msg}"
-    end
-
-    # Print an error message and terminate.
-    # @param msg [String] the message to print
-    # @return [void]
-    # @note This method does not return!
-    def die(msg)
-      fatal = ENV["NO_COLOR"] ? "Fatal" : RED["Fatal"]
-      abort "#{fatal}: #{msg}"
-    end
-
-    # Print an error message and terminate.
-    # @param msg [String] the message to print
-    # @return [void]
-    # @note This method does not return!
-    def self.die(msg)
-      fatal = ENV["NO_COLOR"] ? "Fatal" : RED["Fatal"]
-      abort "#{fatal}: #{msg}"
-    end
-
-    # Finds a reasonable default field separator by checking the environment first
-    #  and then falling back to ":".
-    # @return [String] the field separator
-    def self.ifs
-      ENV["IFS"] || ":"
-    end
-
-    # @return [IO] the IO object corresponding to the current standard input
-    # @note Internal `kbsecret` commands should use this, and not `STDIN`.
-    def self.stdin
-      $stdin
-    end
-
-    # @return [IO] the IO object corresponding to the current standard output
-    # @note Internal `kbsecret` commands should use this, and not `STDOUT`.
-    def self.stdout
-      $stdout
-    end
-
-    # @return [IO] the IO object corresponding to the current standard error
-    # @note Internal `kbsecret` commands should use this, and not `STDERR`.
-    def self.stderr
-      $stderr
-    end
-
-    # Searches for an executable on the user's `$PATH`.
-    # @param util [String] the name of the executable to search for.
-    # @return [Boolean] whether or not `util` is available on the `$PATH`.
-    # @example
-    #  CLI.installed? "foo" # => false
-    #  CLI.installed? "gcc" # => true
-    def self.installed?(util)
-      ENV["PATH"].split(File::PATH_SEPARATOR).any? do |path|
-        File.executable?(File.join(path, util))
-      end
+      stderr.puts "#{warning}: #{msg}"
     end
   end
 end

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

@@ -15,7 +15,7 @@ module KBSecret
 
               o.string "-s", "--session", "the session to search in", default: :default
               o.bool "-x", "--terse", "output in field<sep>value format"
-              o.string "-i", "--ifs", "separate terse pairs with this string", default: CLI.ifs
+              o.string "-i", "--ifs", "separate terse pairs with this string", default: cli.ifs
             end
 
             cli.dreck do

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

@@ -17,7 +17,7 @@ module KBSecret
               o.bool "-a", "--all", "retrieve all login records, not just listed ones"
               o.bool "-u", "--username-only", "print only usernames, not passwords"
               o.bool "-x", "--terse", "output in label<sep>username<sep>password format"
-              o.string "-i", "--ifs", "separate terse fields with this string", default: CLI.ifs
+              o.string "-i", "--ifs", "separate terse fields with this string", default: cli.ifs
             end
 
             unless cli.opts.all?

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

@@ -24,7 +24,7 @@ module KBSecret
               o.string "-g", "--generator", "the generator to use for secret fields",
                        default: :default
               o.bool "-x", "--terse", "read fields from input in a terse format"
-              o.string "-i", "--ifs", "separate terse fields with this string", default: CLI.ifs
+              o.string "-i", "--ifs", "separate terse fields with this string", default: cli.ifs
             end
 
             cli.dreck do
@@ -58,7 +58,7 @@ module KBSecret
           generator = KBSecret::Generator.new(cli.opts[:generator]) if cli.opts.generate?
 
           fields = if cli.opts.terse?
-                     CLI.stdin.read.chomp.split cli.opts[:ifs]
+                     cli.stdin.read.chomp.split cli.opts[:ifs]
                    else
                      klass = Record.class_for(@type)
                      klass.external_fields.map do |field|

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

@@ -50,7 +50,7 @@ module KBSecret
         # @see Command::Abstract#run!
         def run!
           contents = if cli.opts.stdin?
-                       KBSecret::CLI.stdin.read
+                       cli.stdin.read
                      else
                        File.read(@filename)
                      end

data/lib/kbsecret/config.rb

@@ -57,7 +57,7 @@ module KBSecret
     # configuration defaults
     # @api private
     DEFAULT_CONFIG = {
-      mount: "/keybase",
+      mount: Keybase::Local::Config::KBFS_MOUNT,
       sessions: DEFAULT_SESSION.dup,
       generators: DEFAULT_GENERATOR.dup,
     }.freeze

data/lib/kbsecret/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kbsecret
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -142,20 +142,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement