moss

commit 2199dbf77ef479e2e72c131bf64ef304e32e2547
parent cd04d42286d526375477626f0d04c8a1140494b0
Author: Daniel Barlow <dan@telent.net>
Date:   Wed, 11 Aug 2021 10:35:31 +0100

remove env var MOSS_IDENTITY_FILE

Diffstat:
M
features/step_definitions/steps.rb
 | 
10
+++-------
A
fixtures/identity
 | 
3
+++
M
moss.rb
 | 
13
++++---------

3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/features/step_definitions/steps.rb b/features/step_definitions/steps.rb
@@ -10,7 +10,6 @@ def shell(s)
 end
 
 IDENTITY_FILE = "fixtures/keys/me.key"
-ENV['MOSS_IDENTITY_FILE'] = IDENTITY_FILE
 
 def store_path(s)
   Pathname.new(ENV["MOSS_STORE"]).join(s)
@@ -29,18 +28,15 @@ def recipient_for_identity(identity_file)
     raise "can't get pubkey for identity #{identity_file}"
 end
 
-Given("I have the identity {string}") do |keyfile|
-  @identity_path = "fixtures/keys/#{keyfile}"
-end
-
 Given("I set MOSS_STORE to a unique temporary pathname") do
   ENV["MOSS_STORE"] = Dir.mktmpdir + "/store"
 end
 
 Given("I am using a temporary password store") do
-  @identity_path ||= "fixtures/keys/me.key"
   ENV["MOSS_STORE"] = Dir.mktmpdir + "/store"
-  add_to_store(".recipients", recipient_for_identity(@identity_path))
+
+  add_to_store("../identity", File.read(IDENTITY_FILE))
+  add_to_store(".recipients", recipient_for_identity(IDENTITY_FILE))
 end
 
 Given("I am using the example password store") do
diff --git a/fixtures/identity b/fixtures/identity
@@ -0,0 +1,3 @@
+# created: 2021-08-09T12:11:51+01:00
+# public key: age13a6f7s2pw24nrpmr0gmhlqnmazt0aejcsc4a7sv9t7j5y300mfrqvaulzf
+AGE-SECRET-KEY-1HWMK4W0MXGXM56G8UVVSD3ZNENHK62VJD89VSM3R53SS2VQ6KVDQAD3P6X
diff --git a/moss.rb b/moss.rb
@@ -14,13 +14,6 @@ def xdg_data_home
   ENV.fetch("XDG_DATA_HOME", "#{ENV['HOME']}/.local/share")
 end
 
-def identity_file
-  value = ENV.fetch('MOSS_IDENTITY_FILE',  "#{xdg_data_home}/moss/identity")
-  File.exist?(value) or
-    raise "missing identity file (private key) at #{IDENTITY_FILE}, use age-keygen to create"
-  value
-end
-
 class Moss
   attr_reader :root
 
@@ -78,6 +71,10 @@ class Moss
     root.join("store")
   end
 
+  def identity_file
+    root.join("identity")
+  end
+  
   def git_managed?
     store.join(".git").exist?
   end
@@ -147,8 +144,6 @@ class Moss
 end
 
 
-
-
 MOSS = Moss.new(Pathname.new(ENV['MOSS_STORE'] || "#{xdg_data_home}/moss/store").parent)
 
 def random_alnum(length)