kbsecret 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a630e62d3a3ffef0b87f101ae9b44591b5cf1408
-  data.tar.gz: b2ad833e1c4d2033d9980f7b8e6c17ee408851df
+  metadata.gz: 1ea5a40cccc819bf7cb2bb06da3c6bb9dd229dd9
+  data.tar.gz: 73eff88e740a90839345b06590ff6a1d3f48ce96
 SHA512:
-  metadata.gz: b2068b253ab8368380f7250073ab1be95e897d3095376950143ac38e614419f9763e3a9db49c2ff7eaeed259abc712d0af319615601c372ffcdbdd431bf34bbe
-  data.tar.gz: 7845e632126c51b432c42ebdbd68c73d6b3711f105caa75ed20e9cf93312ed51bf8433b65c1b926688553336d265dd1af24e3fce1e3bc136aaf8ea77329b025e
+  metadata.gz: 73aad2d0a5668860063dfabb86496b56860a2ec5010d7f2df1d29761a5dd4e915fbb97d201f015dcdd6e33b93c6e9460329d9cfb7087af5e5af5881aa7b5dd18
+  data.tar.gz: 8c874c9a2a838e5f130bb4c3629d6212ba88ba0fafbcee32e1cdbcfa32138c0d737c07258261ec9dcb36b1d1cb00de5e7bf5dff3a5c3b52ddae90766739dc429

data/lib/kbsecret/cli/kbsecret-new-session

@@ -10,50 +10,61 @@ cmd = CLI.create do |c|
   c.slop do |o|
     o.banner = <<~EOS
       Usage:
-        kbsecret new-session [options] --label <label> --root <dir>
+        kbsecret new-session [options]
     EOS
 
+    o.string "-t", "--team", "the team to create the session under"
     o.string "-l", "--label", "the session label"
-    o.array "-u", "--users", "the keybase users", default: [Keybase.current_user]
+    o.array "-u", "--users", "the keybase users", default: [Keybase::Local.current_user]
     o.string "-r", "--root", "the secret root directory"
     o.bool "-f", "--force", "force creation (ignore overwrites, etc.)"
     o.bool "-n", "--no-notify", "do not send a notification to session members"
   end
 end
 
-cmd.opts[:users].each do |user|
-  cmd.die "Nonexistent Keybase user: '#{user}'" unless Keybase::API.user? user
-end
-
-unless cmd.opts[:users].include? Keybase.current_user
-  cmd.warn "You didn't include yourself in the user list, but I'll add you."
-  cmd.opts[:users] << Keybase.current_user
-end
-
 session_label = cmd.opts[:label]
 
 if Config.session?(session_label) && !cmd.opts.force?
   cmd.die "Refusing to overwrite an existing session without --force."
 end
 
-Config.configure_session(session_label, users: cmd.opts[:users], root: cmd.opts[:root])
+if cmd.opts[:team]
+  teams = Keybase::Local::Team.list_memberships["teams"]
+
+  unless teams.any? { |t| t["fq_name"] == cmd.opts[:team] }
+    cmd.die "No such team (either nonexistent or non-member)."
+  end
+
+  Config.configure_session(session_label, team: cmd.opts[:team], root: session_label)
+else
+  cmd.opts[:users].each do |user|
+    cmd.die "Nonexistent Keybase user: '#{user}'." unless Keybase::API.user? user
+  end
+
+  unless cmd.opts[:users].include? Keybase::Local.current_user
+    cmd.warn "You didn't include yourself in the user list, but I'll add you."
+    cmd.opts[:users] << Keybase::Local.current_user
+  end
+
+  Config.configure_session(session_label, users: cmd.opts[:users], root: cmd.opts[:root])
 
-unless cmd.opts.no_notify? && cmd.opts[:users] != [Keybase.current_user]
-  users = cmd.opts[:users].join(",")
+  unless cmd.opts.no_notify? && cmd.opts[:users] != [Keybase::Local.current_user]
+    users = cmd.opts[:users].join(",")
 
-  Keybase::Chat.send_message cmd.opts[:users], <<~EOM
-    You've been added to a KBSecret session!
+    Keybase::Local::Chat.send_message cmd.opts[:users], <<~EOM
+      You've been added to a KBSecret session!
 
-    To access this session, please run the following:
+      To access this session, please run the following:
 
-    ```
-      $ kbsecret new-session -l '<your label>' -r '#{cmd.opts[:root]}' -u #{users}
-    ```
+      ```
+        $ kbsecret new-session -l '<your label>' -r '#{cmd.opts[:root]}' -u #{users}
+      ```
 
-    If you don't have KBSecret installed, you can install it from `gem`:
+      If you don't have KBSecret installed, you can install it from `gem`:
 
-    ```
-      $ gem install kbsecret
-    ```
-  EOM
+      ```
+        $ gem install kbsecret
+      ```
+    EOM
+  end
 end

data/lib/kbsecret/cli/kbsecret-sessions

@@ -24,8 +24,15 @@ Config.session_labels.each do |sess_name|
 
   next unless cmd.opts.show_all?
 
-  puts <<~EOS
-    \tUsers: #{session_hash[:users].join(", ")}
-    \tSecrets root: #{session_hash[:root]} (#{session.path})
-  EOS
+  if session_hash[:team]
+    puts <<~EOS
+      \tTeam: #{session_hash[:team]}
+      \tSecrets root: #{session_hash[:root]} (#{session.path})
+    EOS
+  else
+    puts <<~EOS
+      \tUsers: #{session_hash[:users].join(", ")}
+      \tSecrets root: #{session_hash[:root]} (#{session.path})
+    EOS
+  end
 end

data/lib/kbsecret/cli.rb

@@ -64,6 +64,7 @@ module KBSecret
 
         o.bool "-V", "--verbose", "produce more verbose output"
         o.bool "-w", "--no-warn", "suppress warning messages"
+        o.bool "--debug", "produce full backtraces on errors"
 
         o.on "-h", "--help", "show this help message" do
           puts o
@@ -140,6 +141,7 @@ module KBSecret
     def guard
       yield
     rescue => e
+      STDERR.puts e.backtrace if @opts.debug?
       die "#{e.to_s.capitalize}."
     end
 

data/lib/kbsecret/config.rb

@@ -41,7 +41,7 @@ module KBSecret
     # The default session configuration.
     DEFAULT_SESSION = {
       default: {
-        users: [Keybase.current_user],
+        users: [Keybase::Local.current_user],
         root: "default",
       },
     }.freeze
@@ -57,6 +57,7 @@ module KBSecret
     # configuration defaults
     # @api private
     DEFAULT_CONFIG = {
+      mount: "/keybase",
       sessions: DEFAULT_SESSION.dup,
       generators: DEFAULT_GENERATOR.dup,
     }.freeze

data/lib/kbsecret/session.rb

@@ -25,7 +25,10 @@ module KBSecret
       @label     = label.to_sym
       @config    = Config.session(@label)
 
-      raise Exceptions::SessionLoadError, "no users in session" if @config[:users].empty?
+      # team sessions don't have explicit users
+      unless @config[:team]
+        raise Exceptions::SessionLoadError, "no users in session" if @config[:users].empty?
+      end
 
       @path    = rel_path mkdir: true
       @records = load_records!
@@ -123,10 +126,13 @@ module KBSecret
     # @return [String] the fully qualified path to the session
     # @api private
     def rel_path(mkdir: false)
-      # /keybase/private/[u1,u2,...,uN]/kbsecret/[session]
-      path = File.join(Keybase::Config::KBFS_MOUNT, "private",
-                       Keybase::U[@config[:users]],
-                       "kbsecret", @config[:root])
+      path = if @config[:team]
+               File.join(Config[:mount], "team", @config[:team], "kbsecret", @config[:root])
+             else
+               # /keybase/private/[u1,u2,...,uN]/kbsecret/[session]
+               File.join(Config[:mount], "private", Keybase::Core::U[@config[:users]], "kbsecret",
+                         @config[:root])
+             end
 
       FileUtils.mkdir_p path if mkdir
 

data/lib/kbsecret.rb

@@ -13,6 +13,6 @@ require_relative "kbsecret/cli"
 # The primary namespace for {KBSecret}.
 module KBSecret
   # fail very early if the user doesn't have keybase and KBFS running
-  raise Keybase::Exceptions::KeybaseNotRunningError unless Keybase.running?
-  raise Keybase::Exceptions::KBFSNotRunningError unless Dir.exist?(Keybase::Config::KBFS_MOUNT)
+  raise Keybase::Local::Exceptions::KeybaseNotRunningError unless Keybase::Local.running?
+  raise Keybase::Local::Exceptions::KBFSNotRunningError unless Dir.exist?(Config[:mount])
 end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kbsecret
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: kbsecret - A KBFS (Keybase) backed secret manager.