moss

commit 2d5bab0ad150076aa45e3409c4e1d5b3a1ff0326
parent a11357647089cfe954c2f17a5f0c37ab68926656
Author: Daniel Barlow <dan@telent.net>
Date:   Tue, 10 Aug 2021 17:43:55 +0100

create class Moss, extract write_secret to method

Diffstat:
M
features/step_definitions/steps.rb
 | 
2
+-
M
moss.rb
 | 
41
+++++++++++++++++++++++++++++------------

2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/features/step_definitions/steps.rb b/features/step_definitions/steps.rb
@@ -30,7 +30,7 @@ end
 
 
 Given("I am using a temporary password store") do
-  ENV["MOSS_STORE"] = Dir.mktmpdir
+  ENV["MOSS_STORE"] = Dir.mktmpdir + "/store"
   add_to_store(".recipients", recipient_for_identity("fixtures/keys/me.key"))
 end
 
diff --git a/moss.rb b/moss.rb
@@ -16,10 +16,35 @@ def identity_file
   value
 end
 
-def git_managed?
-  STORE.join(".git").exist?
+class Moss
+  attr_reader :root
+  
+  def initialize(root)
+    @root = Pathname.new(root)
+  end
+
+  def store
+    root.join("store")
+  end
+
+  def git_managed?
+    store.join(".git").exist?
+  end
+
+  def write_secret(name, content)
+    pathname = store.join("#{name}.age")
+    pathname.dirname.mkpath
+    IO.popen("age -a --recipients-file #{recipients_for_secret(name)} -o #{pathname.to_s}", "w") do |f|
+      f.write(content)
+    end
+    if git_managed?
+      Kernel.system("cd #{STORE.to_s} && git add #{pathname.relative_path_from(STORE).to_s.inspect} && git commit -m'new secret'")
+    end
+  end
 end
 
+MOSS = Moss.new(STORE.parent)
+
 def random_alnum(length)
   bytes = File.open("/dev/urandom", "rb") do |random|
     random.read(length).unpack("C*").map {|c|
@@ -38,14 +63,7 @@ def random_alnum(length)
 end
 
 def write_secret(name, content)
-  pathname = STORE.join("#{name}.age")
-  pathname.dirname.mkpath
-  IO.popen("age -a --recipients-file #{recipients_for_secret(name)} -o #{pathname.to_s}", "w") do |f|
-    f.write(content)
-  end
-  if git_managed?
-    Kernel.system("cd #{STORE.to_s} && git add #{pathname.relative_path_from(STORE).to_s.inspect} && git commit -m'new secret'")
-  end
+  MOSS.write_secret(name, content)
 end
 
 def find_in_subtree(subtree, filename)
@@ -114,7 +132,7 @@ when 'config'
   config = {
     store: STORE.to_s,
     identity_file: identity_file.to_s,
-    git: git_managed?
+    git: MOSS.git_managed?
   }
   puts JSON.generate(config)
 when 'init'
@@ -129,7 +147,6 @@ when 'init'
   end
 when 'git'
   Kernel.system("/usr/bin/env", "git", *parameters, {chdir: STORE})
-
 else
   raise "command #{action} unrecognized"
 end