kbsecret 0.8.0.pre.4 → 0.8.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41fdcf73292b783109fc320d519927b865d3d699
-  data.tar.gz: dbfe082cfbe08760603e9f31c7e9b3c7588581f2
+  metadata.gz: ac8d2f2070dfe623994a9fe08b79b9eed5ac8b4a
+  data.tar.gz: 88762582df2085091179d1f723585a25038f3ca7
 SHA512:
-  metadata.gz: '090490e56abc99cb6a4f2febde1ce704b31bfa5d04d3635acd662f3609beba5fe4396f537bc397771d3426b1347d913c3f4b88b888b03da0c22eb24602ca4986'
-  data.tar.gz: ae5305cffa2d072c8f96d23277b0625915bf0f957bf2f9b1956e97dca56c34b28aa4de3a77de867bd010d269202f4b9573dbcc35f45e1a4cbf6f39c994481d76
+  metadata.gz: 2690cb31def84423bdcf818e1379ac502221e6a196036658ee34e5b34c621bbcca59efcfbdfc6df52dce5e7d9e7c2f4450ce58fe555ced38dd20d6c6ecb23890
+  data.tar.gz: 1aea1c3940e0503106e1f13a07af5c1ed7c6639ab4d35b0c2a927cee0462316cc35f016af52b2e03e9acb457ca582f484418b73857baba06405679a6ec23a18d

data/bin/kbsecret

@@ -156,10 +156,12 @@ end
 
 command = normalize(ARGV.shift || "help")
 
+args = KBSecret::Config.command_args(command) + ARGV
+
 if builtin?(command)
-  send command, *ARGV
+  send command, *args
 elsif external?(command) || internal?(command)
-  exec expand(command), *ARGV
+  exec expand(command), *args
 else
   KBSecret::CLI.die "Unknown command: '#{command}'."
 end

data/lib/kbsecret/cli.rb

@@ -6,6 +6,7 @@ require "dreck"
 
 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
   class CLI
     # @return [Slop::Result, nil] the result of option parsing, if requested
     #   via {#slop}
@@ -39,16 +40,14 @@ module KBSecret
     #  cmd.opts # => Slop::Result
     #  cmd.args # => Dreck::Result
     def self.create(&block)
-      cmd = CLI.new(&block)
-      yield cmd
-      cmd
+      CLI.new(&block)
     end
 
     # @api private
     # @deprecated see {create}
-    def initialize(&block)
-      @trailing = ARGV
-      guard { instance_eval(&block) }
+    def initialize
+      @argv = ARGV.dup
+      guard { yield self }
     end
 
     # Parse options for a kbsecret utility, adding some default options for
@@ -58,7 +57,7 @@ module KBSecret
     # @return [Slop::Result] the result of argument parsing
     # @note This should be called within the block passed to {#initialize}.
     def slop(cmds: [], errors: true)
-      @opts = Slop.parse suppress_errors: !errors do |o|
+      @opts = Slop.parse @argv, suppress_errors: !errors do |o|
         o.separator "Options:"
 
         yield o
@@ -78,7 +77,7 @@ module KBSecret
         end
       end
 
-      @trailing = @opts.args
+      @argv = @opts.args
     end
 
     # Parse trailing arguments for a kbsecret utility, using the elements remaining
@@ -86,7 +85,7 @@ module KBSecret
     # @param errors [Boolean] whether or not to produce (strict) Dreck errors
     # @note *If* {#slop} is called, it must be called before this.
     def dreck(errors: true, &block)
-      @args = Dreck.parse @trailing, strict: errors do
+      @args = Dreck.parse @argv, strict: errors do
         instance_eval(&block)
       end
     end

data/lib/kbsecret/config.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-require "yaml"
 require "fileutils"
+require "inih"
+require "shellwords"
+require "yaml"
 
 module KBSecret
   # Global and per-session configuration for kbsecret.
@@ -14,6 +16,10 @@ module KBSecret
     # @api private
     CONFIG_FILE = File.join(CONFIG_DIR, "config.yml").freeze
 
+    # The command configuration file.
+    # @api private
+    COMMAND_CONFIG_FILE = File.join(CONFIG_DIR, "commands.ini").freeze
+
     # Configuration facets used for method generation.
     # @api private
     CONFIG_FACETS = {
@@ -65,6 +71,26 @@ module KBSecret
       @config[key]
     end
 
+    # Fetch the configuration for a `kbsecret` command.
+    # @param cmd [String] the short name of the command
+    # @return [Hash, nil] the command's configuration
+    # @example
+    #  # retrieves the config for `kbsecret-list`
+    #  Config.command("list") # => { "args" => "...",  }
+    def self.command(cmd)
+      @command_config[cmd]
+    end
+
+    # Fetch the configured default arguments for a `kbsecret` command.
+    # @param cmd [String] the short name of the command
+    # @return [Array] the command's default arguments
+    # @note Default arguments are split according to normal shell splitting rules.
+    # @example
+    #  Config.command_args("list") # => ["--show-all"]
+    def self.command_args(cmd)
+      @command_config.dig(cmd, "args")&.shellsplit || []
+    end
+
     # @!method session(label)
     #   Retrieve a session's configuration.
     #   @param label [String, Symbol] the session's label
@@ -134,12 +160,18 @@ module KBSecret
       end
     end
 
-    if File.exist?(CONFIG_FILE)
-      user_config = YAML.load_file(CONFIG_FILE)
-    else
-      user_config = DEFAULT_CONFIG
-      FileUtils.mkdir_p CONFIG_DIR
-    end
+    user_config = if File.exist?(CONFIG_FILE)
+                    YAML.load_file(CONFIG_FILE)
+                  else
+                    FileUtils.mkdir_p CONFIG_DIR
+                    DEFAULT_CONFIG
+                  end
+
+    @command_config = if File.exist?(COMMAND_CONFIG_FILE)
+                        INIH.load(COMMAND_CONFIG_FILE)
+                      else
+                        {}
+                      end
 
     @config = DEFAULT_CONFIG.merge(user_config)
     @config[:sessions].merge!(DEFAULT_SESSION)

data/lib/kbsecret/record/abstract.rb

@@ -122,12 +122,13 @@ module KBSecret
       # @param body [Hash<Symbol, String>] a mapping of the record's data fields
       # @note Creation does *not* sync the new record; see {#sync!} for that.
       def initialize(session, label, **body)
-        @session   = session
-        @timestamp = Time.now.to_i
-        @label     = label.to_s
-        @type      = self.class.type
-        @data      = { @type => body }
-        @path      = File.join(session.directory, "#{label}.json")
+        @session    = session
+        @timestamp  = Time.now.to_i
+        @label      = label.to_s
+        @type       = self.class.type
+        @data       = { @type => body }
+        @path       = File.join(session.directory, "#{label}.json")
+        @defer_sync = false
 
         populate_internal_fields
       end
@@ -137,11 +138,12 @@ module KBSecret
       # @return [void]
       # @api private
       def initialize_from_hash(hsh)
-        @timestamp = hsh[:timestamp]
-        @label     = hsh[:label]
-        @type      = hsh[:type].to_sym
-        @data      = hsh[:data]
-        @path      = File.join(session.directory, "#{label}.json")
+        @timestamp  = hsh[:timestamp]
+        @label      = hsh[:label]
+        @type       = hsh[:type].to_sym
+        @data       = hsh[:data]
+        @path       = File.join(session.directory, "#{label}.json")
+        @defer_sync = false
       end
 
       # @!method data_fields

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kbsecret
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.4
+  version: 0.8.0.pre.5
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: inih
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: keybase-unofficial
   requirement: !ruby/object:Gem::Requirement