2pass 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135196a393e121fb8b71d5295fdedc19f3bccb24885ce81cf630be59d2b7c64e
-  data.tar.gz: 7f5684e81780732115fcf6b9d5a071cfd1e8a05eaa48246e35f7fd3841a702ce
+  metadata.gz: 280272cc90ded8e3572ad707e7a254e9bd8a599c3a11515178a9dfd5386feefb
+  data.tar.gz: 8e2510cb1d55f80f8035897759d701690276999aabc5d45eebc73b85b625545e
 SHA512:
-  metadata.gz: e1c997e62173b57c596adf21c9636bfd7ed3417a5f0611d497db1caa486a18e113ad37b234bec8b3334fcea282c5f99f2ec9dbd1b4e328222b1439f281629586
-  data.tar.gz: 9697b86fe839dc5d29f7786ab2e278986fbdb64bd2fc89e142f6e8bc812f919a66d3b57afcb97e71e099d806cc1411c56c12f5117facf6174ee780de71812b14
+  metadata.gz: 42fe8d2ed4e7e39ffaca9b868593ebdedf0a1760b7c05b1a26290225c693dba3a18aec07452b957802b70c84cb254c6ced00880538b8831d584897d9dea83d39
+  data.tar.gz: a23ea61addd2651fe02b13c0a66a6c4b55a4313bee8abac04ff78af45cc8a5d81df65ba6b9d31e52795af4a4e6721dfd741a5694aa283285390e36fea0686b4f

data/lib/2pass/version.rb

@@ -1,3 +1,3 @@
 module TwoPass
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/lib/2pass.rb

@@ -84,7 +84,7 @@ module TwoPass
         id: id,
         value: value
       }
-      data = load_vault(vault_name, env: env)
+      data = load_vault(vault_name, env: env, allow_missing: true)
       existing_entry_id = data.find_index { |hash| hash[:id] == new_secret[:id] }
       if existing_entry_id
         raise "The secret already exists"
@@ -121,9 +121,13 @@ module TwoPass
 
     private
 
-    def load_vault(vault_name, env: nil)
+    def load_vault(vault_name, env: nil, allow_missing: false)
       file_path = self.vault_file_path(vault_name, env: env)
-      return [] unless File.exist?(file_path)
+      unless File.exist?(file_path)
+        return [] if allow_missing
+
+        raise missing_vault_error_message(vault_name, file_path, env: env)
+      end
 
       YAML.load_file(file_path, symbolize_names: true) || []
     rescue Errno::EACCES, Errno::EPERM => e
@@ -133,6 +137,30 @@ module TwoPass
       []
     end
 
+    def missing_vault_error_message(vault_name, file_path, env: nil)
+      link_args = [vault_name, "<path-to-vault>", env].compact.join(" ")
+      add_args = [vault_name, "<id>", "<value>", env].compact.join(" ")
+
+      if File.symlink?(file_path)
+        target = File.expand_path(File.readlink(file_path), File.dirname(file_path))
+        message = +"Vault symlink is broken: #{file_path} -> #{target}"
+        message << "\nThe symlink exists but its target is missing."
+        message << "\nIf the vault is in a synced location (iCloud, Dropbox, etc.), it may not have"
+        message << "\ndownloaded yet, or it was moved or deleted."
+        message << "\nRe-create the link once the file is available:"
+        message << "\n  2pass link #{link_args}"
+        return message
+      end
+
+      message = +"Vault not found: #{file_path}"
+      message << "\nNo vault file or symlink exists at this path."
+      message << "\nCreate it by adding your first secret:"
+      message << "\n  2pass add #{add_args}"
+      message << "\nOr, if the vault already lives in a synced location (iCloud, Dropbox, etc.), link it:"
+      message << "\n  2pass link #{link_args}"
+      message
+    end
+
     def vault_file_path(vault_name, env: nil)
       [
         VAULT_DIR,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 2pass
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Olivier