rake_git_crypt 0.1.0.pre.4 → 0.1.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae83500c9c213d549612a58a4913639629f494b3ff69a7edec4385a06f5795a
-  data.tar.gz: 1a8f3ee47d52d978e1a8a7d07045254dbe015d6a9eae9764d890796f9bfca0b6
+  metadata.gz: 21646ae3a4b84a88a127a9330d98a60859bef7dd63f7530379a91891c19941c1
+  data.tar.gz: 72f4e093a66eeaf51fd99b86b1053a8d0f58d23c07d389ebeee818267b8fb22b
 SHA512:
-  metadata.gz: 8854d1956d7f70b0652f40ce71ba861962a15987ea3e94c61455fb493a740aa2a6ad980c6f400c3b969178a62a41b5ba8fdb79159f5112ab900d3e9cd253e2ab
-  data.tar.gz: 6d75fe6709528ff8ca493bac002982899f3c01b3bf4419a7b2c89f518a59b63d70f68fd6824bf26cd386d419fc12d8e0b01d01fbfd9bc49a251b3aba52075972
+  metadata.gz: add9d5c347374136880e7488523da77baf2a3df14aeffaf424463157a4f9917a09f66c1fae58284fe1ba245ac13e92565f45ef59433362c70571b6c0c152c32f
+  data.tar.gz: '0549fd57e7b9e9d7dfa1e83b86ee855b42cb814941dc667fce1c7b3ef355633bf51279faa3748e72f7b8cda7930f503e0b98a395f2f972cbf70a8b224d0053b3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_git_crypt (0.1.0.pre.4)
+    rake_git_crypt (0.1.0.pre.6)
       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
@@ -13,32 +15,43 @@ module RakeGitCrypt
       parameter :key_name
 
       parameter :commit, default: false
+      parameter :trusted, default: false
 
       parameter :gpg_user_id
       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)
+          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
 
@@ -47,9 +60,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
@@ -59,17 +74,22 @@ module RakeGitCrypt
               .first_line.key_fingerprint
       end
 
-      def add_gpg_user(gpg_user_id)
+      def add_gpg_user(gpg_home_directory, gpg_user_id)
         RubyGitCrypt.add_gpg_user(
           {
-            key_name: key_name,
             gpg_user_id: gpg_user_id,
-            no_commit: !commit
+            key_name: key_name,
+            no_commit: !commit,
+            trusted: trusted
           },
-          gpg_home_directory ? { GNUPGHOME: gpg_home_directory } : {}
+          { 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..."
@@ -77,7 +97,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.4'
+  VERSION = '0.1.0.pre.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_git_crypt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.4
+  version: 0.1.0.pre.6
 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