kbsecret 1.3.0.pre.4 → 1.3.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd86d8a3994af1e1af0a7808160da68e05408b13bbf9754353c6edbe7971606
-  data.tar.gz: f7c63f25a2f1bfcd85ea5d9860cc4d8a8f90afdbd50ba9773fe3d1f82a49ba09
+  metadata.gz: 2d2abb12b3cb915a48153cc0be2848157402f5dbedde47f3ee5c9a5abcb14e82
+  data.tar.gz: 530f2d1178d4d1f1d0aee47d2734a1c23f2d806c8cdc9128e84f9a8dea39b17f
 SHA512:
-  metadata.gz: 0adbd60dc4a40738080cda3e7dc46f9860a14b2be6c17b8cdf0b2e58663b3519ccdc044c7239b0695ac0ddb5cbb22b691d57dc1342521c378cdad0abde728622
-  data.tar.gz: edf4321291b552a13de4aeac29c5b56d52e1e6823aa13423a6e6a1fd28816b2493747a781219c10ea53c3081c579d6b4ca00cb1eab9fdf0c446869ea930ba854
+  metadata.gz: f1149ffcfa5821caa3d459f7e6390552472b03a53f2fa68eb21e3c15074a785ff3881cae75457574254207af9b578ee63accf783c5607b63f7a292b7c3082bf2
+  data.tar.gz: 0f8a382f10d5230bd120c0051ff9dab7635ef211660b80bb57500c45142146fae9a78e1977e51b8ee5ee4f33bf09df1d6ec0753d61d35e8716badf35a95fc48e

data/lib/kbsecret/cli.rb

@@ -151,7 +151,7 @@ module KBSecret
     def guard
       yield
     rescue => e
-      self.stderr.puts e.backtrace if @opts&.debug?
+      self.class.stderr.puts e.backtrace if @opts&.debug?
       die "#{e.to_s.capitalize}."
     end
 
@@ -159,7 +159,7 @@ module KBSecret
     # @param msg [String] the message to print
     # @return [void]
     def info(msg)
-      self.stderr.puts "#{GREEN["Info"]}: #{msg}"
+      self.class.stderr.puts "#{GREEN["Info"]}: #{msg}"
     end
 
     # Print an information message, but only if verbose output has been enabled.
@@ -184,7 +184,7 @@ module KBSecret
     # @return [void]
     def warn(msg)
       return if @opts.no_warn?
-      self.stderr.puts "#{YELLOW["Warning"]}: #{msg}"
+      self.class.stderr.puts "#{YELLOW["Warning"]}: #{msg}"
     end
 
     # Print an error message and terminate.

data/lib/kbsecret/cli/command.rb

@@ -64,13 +64,16 @@ module KBSecret
       # @param command_name [String] the CLI-friendly name of the internal command to run
       # @param args [Array<String>] the arguments, if any, to pass to the command
       # @note This method only takes **internal** command names.
+      # @note This method *may* not return!
       # @return [void]
       def run!(command_name, *args)
         klass = internal_command_for command_name
         cmd = klass.new(args)
-        cmd.setup!
-        cmd.validate!
-        cmd.run!
+        cmd.cli.guard do
+          cmd.setup!
+          cmd.validate!
+          cmd.run!
+        end
       end
     end
   end

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

@@ -27,25 +27,23 @@ module KBSecret
 
         # @see Command::Abstract#run!
         def run!
-          cli.guard do
-            src_sess = Session[cli.args[:src_sess]]
-            dst_sess = Session[cli.args[:dst_sess]]
+          src_sess = KBSecret::Session[cli.args[:src_sess]]
+          dst_sess = KBSecret::Session[cli.args[:dst_sess]]
 
-            selected_records = src_sess.records.select { |r| cli.args[:labels].include?(r.label) }
-            cli.die "No such record(s)." if selected_records.empty?
+          selected_records = src_sess.records.select { |r| cli.args[:labels].include?(r.label) }
+          cli.die "No such record(s)." if selected_records.empty?
 
-            overlaps = dst_sess.record_labels & selected_records.map(&:label)
+          overlaps = dst_sess.record_labels & selected_records.map(&:label)
 
-            # the code below actually handles the overwriting if necessary, but we fail early here
-            # for friendliness and to avoid half-copying the selected records
-            unless overlaps.empty? || cli.opts.force?
-              cli.die "Refusing to overwrite existing record(s) without --force."
-            end
+          # the code below actually handles the overwriting if necessary, but we fail early here
+          # for friendliness and to avoid half-copying the selected records
+          unless overlaps.empty? || cli.opts.force?
+            cli.die "Refusing to overwrite existing record(s) without --force."
+          end
 
-            selected_records.each do |record|
-              dst_sess.import_record(record, overwrite: cli.opts.force?)
-              src_sess.delete_record(label) if cli.opts.move?
-            end
+          selected_records.each do |record|
+            dst_sess.import_record(record, overwrite: cli.opts.force?)
+            src_sess.delete_record(record.label) if cli.opts.move?
           end
         end
       end

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

@@ -72,9 +72,7 @@ module KBSecret
                      end
                    end
 
-          cli.guard do
-            cli.session.add_record @type, @label, *fields, overwrite: cli.opts.force?
-          end
+          cli.session.add_record @type, @label, *fields, overwrite: cli.opts.force?
         end
       end
     end

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

@@ -46,7 +46,7 @@ module KBSecret
           tty = TTY::Prompt.new
 
           confirm = if cli.opts.interactive?
-                      tty.yes?("Delete '#{selected_records.join(", ")}'?")
+                      tty.yes?("Delete '#{@selected_records.join(", ")}'?")
                     else true
                     end
 

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

@@ -67,13 +67,11 @@ module KBSecret
 
             unless teams.map(&:fq_name).include?(cli.opts[:team])
               if cli.opts.create_team?
-                cli.guard do
-                  Keybase::Local::Team.create_team cli.opts[:team]
-                  Keybase::Local::Team.add_members cli.opts[:team], users: [{
-                    username: Keybase::Local.current_user,
-                    role: "admin",
-                  }]
-                end
+                Keybase::Local::Team.create_team cli.opts[:team]
+                Keybase::Local::Team.add_members cli.opts[:team], users: [{
+                  username: Keybase::Local.current_user,
+                  role: "admin",
+                }]
               else
                 cli.die "No such team (either nonexistent or non-member)."
               end

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 { KBSecret::Session[sess_name] }
+            session      = KBSecret::Session[sess_name]
 
             puts sess_name
 

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

@@ -12,17 +12,18 @@ module KBSecret
             cli.slop do |o|
               o.banner = <<~HELP
                 Usage:
-                  kbsecret stash-file <record> [file]
+                  kbsecret stash-file <record> [filename]
               HELP
 
               o.string "-s", "--session", "the session to add to", default: :default
               o.bool "-f", "--force", "force creation (ignore overwrites, etc.)"
               o.bool "-b", "--base64", "encode the file as base64"
+              o.bool "-", "--stdin", "read from stdin instead of a filename"
             end
 
             cli.dreck do
               string :label
-              string :filename
+              string :filename unless cli.opts.stdin?
             end
 
             cli.ensure_session!
@@ -41,20 +42,22 @@ module KBSecret
             cli.die "Refusing to overwrite a record without --force."
           end
 
-          cli.die "No such file." unless File.file?(@filename) || @filename == "-"
+          if @filename
+            cli.die "No such file." unless File.file?(@filename)
+          end
         end
 
         # @see Command::Abstract#run!
         def run!
-          contents = if @filename == "-"
+          contents = if cli.opts.stdin?
                        KBSecret::CLI.stdin.read
-                     elsif File.file?(@filename)
+                     else
                        File.read(@filename)
                      end
 
           contents = Base64.encode64(contents) if cli.opts.base64?
 
-          cli.guard { cli.session.add_record(:unstructured, @label, contents) }
+          cli.session.add_record(:unstructured, @label, contents, overwrite: cli.opts.force?)
         end
       end
     end

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

@@ -36,7 +36,7 @@ module KBSecret
 
         # @see Command::Abstract#validate!
         def validate!
-          cli.die "No such todo record:." unless @todo && @todo.type == :todo
+          cli.die "No such todo record: #{@todo}." unless @todo && @todo.type == :todo
           cli.die "Unknown subcommand: #{@subcmd}." unless SUBCOMMANDS.include?(@subcmd)
         end
 

data/lib/kbsecret/version.rb

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

metadata

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