rake_git_crypt 0.1.0.pre.5 → 0.1.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469dc2fdb4abd85a647e020630fb56dd43b48577149825fb1e0a072a90ef5ae4
-  data.tar.gz: 5f327a987291270d1093abb3eedb17ef0e9faa231ef0ea27e2c3829f6cc3ddd3
+  metadata.gz: 9ce17ef4adf03c23d3f0317d98a8e50559f192d1e77be3736cead101cacc0357
+  data.tar.gz: '0596975061976467ab3f9fbabe20d34c33951e91dceb31cd9f412269636db243'
 SHA512:
-  metadata.gz: 9869038b5bd9405ed7f12f695b703e01e2e19ba206a127d066ff4bb688ee188120af9e089e38ca5e5a96d1179680e03abeecc5c596ddef5f523e4473e460f122
-  data.tar.gz: 01a809933d1d4843da14d62d834e86933360d63baef2f3f079faa45d31056487ac1b804de1e37901f844d6e3f25b67dbcb6152cd7bb6a216d3359790e5aba5f2
+  metadata.gz: ebba33cb2adf1f65c2085cf25d71c21d9b173a8720a2ef4e610b188f7b6f30cd27463f9f7fffd925f58c875843eebaa17a1c3be28f17b11a60a48d06543e82ad
+  data.tar.gz: 81147c3981f97daebdcb560a2297a2811619e1dcce030260a3c605dc1e29ea55bde13db3c452f33ba21b6b5c7d25ae0bf58e88a5368a9c90ae848b795103a4fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_git_crypt (0.1.0.pre.5)
+    rake_git_crypt (0.1.0.pre.7)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       ruby_git_crypt (= 0.1.0.pre.2)

data/lib/rake_git_crypt/home.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RakeGitCrypt
+  class Home
+    def initialize(work_directory, home_directory)
+      @work_directory = work_directory
+      @home_directory = home_directory
+    end
+
+    def with_resolved_directory(&block)
+      if @home_directory == :temporary
+        Dir.mktmpdir('home', @work_directory, &block)
+      else
+        FileUtils.mkdir_p(@home_directory) if @home_directory
+        yield @home_directory
+      end
+    end
+  end
+end

data/lib/rake_git_crypt/tasks/add_user.rb

@@ -4,6 +4,8 @@ require 'rake_factory'
 require 'ruby_git_crypt'
 require 'ruby_gpg2'
 
+require_relative '../home'
+
 module RakeGitCrypt
   module Tasks
     class AddUser < RakeFactory::Task
@@ -19,27 +21,38 @@ module RakeGitCrypt
       parameter :gpg_user_key_path
 
       parameter :gpg_home_directory
+      parameter :gpg_work_directory, default: '/tmp'
 
       action do
         validate
 
         if gpg_user_id
           log_adding_by_id
-          add_gpg_user(gpg_user_id)
+          add_gpg_user(gpg_home_directory, gpg_user_id)
           log_done
         end
 
         if gpg_user_key_path
           log_adding_by_key_path
-          result = import_key
-          key_fingerprint = lookup_key_fingerprint(result)
-          add_gpg_user(key_fingerprint)
+          with_gpg_home_directory do |home_directory|
+            result = import_key(home_directory)
+            key_fingerprint = lookup_key_fingerprint(result)
+            add_gpg_user(home_directory, key_fingerprint,
+                         auto_trust: gpg_home_directory.nil?)
+          end
           log_done
         end
       end
 
       private
 
+      def with_gpg_home_directory(&block)
+        Home.new(gpg_work_directory, gpg_home_directory || :temporary)
+            .with_resolved_directory do |home_directory|
+          block.call(home_directory)
+        end
+      end
+
       def validate
         return if gpg_user_id || gpg_user_key_path
 
@@ -48,9 +61,11 @@ module RakeGitCrypt
               'but neither was.'
       end
 
-      def import_key
+      def import_key(gpg_home_directory)
         RubyGPG2.import(
           key_file_paths: [gpg_user_key_path],
+          work_directory: gpg_work_directory,
+          home_directory: gpg_home_directory,
           with_status: true
         )
       end
@@ -60,18 +75,22 @@ module RakeGitCrypt
               .first_line.key_fingerprint
       end
 
-      def add_gpg_user(gpg_user_id)
-        environment =
-          gpg_home_directory ? { GNUPGHOME: gpg_home_directory } : {}
+      def add_gpg_user(gpg_home_directory, gpg_user_id, auto_trust: false)
         RubyGitCrypt.add_gpg_user(
           {
-            key_name: key_name, gpg_user_id: gpg_user_id,
-            no_commit: !commit, trusted: trusted
+            gpg_user_id: gpg_user_id,
+            key_name: key_name,
+            no_commit: !commit,
+            trusted: auto_trust || trusted
           },
-          { environment: environment }
+          { environment: git_crypt_environment(gpg_home_directory) }
         )
       end
 
+      def git_crypt_environment(gpg_home_directory)
+        gpg_home_directory ? { GNUPGHOME: gpg_home_directory } : {}
+      end
+
       def log_adding_by_id
         $stdout.puts(
           "Adding GPG user with ID: '#{gpg_user_id}' to git-crypt..."
@@ -79,7 +98,7 @@ module RakeGitCrypt
       end
 
       def log_adding_by_key_path
-        puts(
+        $stdout.puts(
           "Adding GPG user with key at: '#{gpg_user_key_path}' to git-crypt..."
         )
       end

data/lib/rake_git_crypt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakeGitCrypt
-  VERSION = '0.1.0.pre.5'
+  VERSION = '0.1.0.pre.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_git_crypt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.5
+  version: 0.1.0.pre.7
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-08 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -278,6 +278,7 @@ files:
 - bin/console
 - bin/setup
 - lib/rake_git_crypt.rb
+- lib/rake_git_crypt/home.rb
 - lib/rake_git_crypt/task_sets.rb
 - lib/rake_git_crypt/tasks.rb
 - lib/rake_git_crypt/tasks/add_user.rb