rake_git_crypt 0.1.0.pre.20 → 0.1.0.pre.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5077be792548437aca9e279901cee4290f37b7e8e9a202a741c1914b11ba3b52
-  data.tar.gz: 72e9ebd00306c5a1e002406758222e794a9f6a7a764540ca73c85c1ca40eb60c
+  metadata.gz: '074859dfdddfa3ad275cce11978fa65d40b6f52b2fe9a8df8881f553b94fd470'
+  data.tar.gz: a2d710bd98c76460502e6c1ce0c3b0c8af062bd82c7778695c35ee1c2dec7e94
 SHA512:
-  metadata.gz: 3a7b1773844321522c9c499e64fe7f7dff206cf006c4aa054888f36dfac9fde738b48c8c8fa99ae468c0b4173f7c43bb33e5628c285590ade973b218565ab556
-  data.tar.gz: f1840c845b0b069aae42c2380cdb32106ad2e7ac3323f84f1b45bb9036e3c41a9e3895425814ab8d89d861dc48d4be78889116be185e1c326093f84b2656f9ae
+  metadata.gz: de3fdb597649ec0e5035f2acb49074b6d896d75042f026ee4481c248d486a5250af299a3f3706eb592977394b4ae778b1547282aee28ce7666dd60969051bd54
+  data.tar.gz: 03012e31d93410c37e2d5fe74ac9dd1ae5a531c9c0bfea45c266fe0ab0809154025fa000a40b6c0376ac478919a9b2d8a471adbc9e5790a8954e9a6b49c2ddd8

data/Gemfile.lock

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

data/lib/rake_git_crypt/mixins/support.rb

@@ -11,12 +11,25 @@ module RakeGitCrypt
         !task_by_name(task, name).nil?
       end
 
-      def invoke_task_with_name(task, name, args)
+      def ensure_task_with_name_available(task, name)
         raise_task_undefined(name) unless task_defined?(task, name)
+      end
 
+      def invoke_task_with_name(task, name, args)
+        ensure_task_with_name_available(task, name)
         task_by_name(task, name).invoke(*args)
       end
 
+      def reenable_task_with_name(task, name)
+        ensure_task_with_name_available(task, name)
+        task_by_name(task, name).reenable
+      end
+
+      def invoke_and_reenable_task_with_name(task, name, args)
+        invoke_task_with_name(task, name, args)
+        reenable_task_with_name(task, name)
+      end
+
       def raise_task_undefined(name)
         raise(
           RakeFactory::DependencyTaskMissing,

data/lib/rake_git_crypt/tasks/add_user.rb

@@ -99,7 +99,7 @@ module RakeGitCrypt
       def maybe_commit(task, args)
         return unless commit_task_name
 
-        invoke_task_with_name(
+        invoke_and_reenable_task_with_name(
           task, commit_task_name,
           [commit_message(task), *args]
         )

data/lib/rake_git_crypt/tasks/add_users.rb

@@ -129,10 +129,10 @@ module RakeGitCrypt
 
         puts "Adding git-crypt users by type #{user_type}..."
         add_user_task_name = task.send(:"add_user_by_#{user_type}_task_name")
-        add_user_task = task.application[add_user_task_name, task.scope]
         send(:"gpg_user_#{user_type}s").each do |detail|
-          add_user_task.invoke(detail, *args)
-          add_user_task.reenable
+          invoke_and_reenable_task_with_name(
+            task, add_user_task_name, [detail, *args]
+          )
         end
       end
 
@@ -164,7 +164,7 @@ module RakeGitCrypt
       def maybe_commit(task, args)
         return unless commit_task_name
 
-        invoke_task_with_name(
+        invoke_and_reenable_task_with_name(
           task, commit_task_name,
           [commit_message(task), *args]
         )

data/lib/rake_git_crypt/tasks/install.rb

@@ -30,17 +30,17 @@ module RakeGitCrypt
       private
 
       def init_git_crypt(task, args)
-        invoke_task_with_name(task, init_task_name, args)
+        invoke_and_reenable_task_with_name(task, init_task_name, args)
       end
 
       def add_users_to_git_crypt(task, args)
-        invoke_task_with_name(task, add_users_task_name, args)
+        invoke_and_reenable_task_with_name(task, add_users_task_name, args)
       end
 
       def maybe_commit(task, args)
         return unless commit_task_name
 
-        invoke_task_with_name(
+        invoke_and_reenable_task_with_name(
           task, commit_task_name,
           [commit_message(task), *args]
         )

data/lib/rake_git_crypt/tasks/reinstall.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rake_factory'
+
+require_relative '../mixins/support'
+
+module RakeGitCrypt
+  module Tasks
+    class Reinstall < RakeFactory::Task
+      include Mixins::Support
+
+      default_name :reinstall
+      default_description 'Reinstall git-crypt.'
+
+      parameter :uninstall_task_name, default: :uninstall
+      parameter :install_task_names, default: [:install]
+
+      action do |task, args|
+        puts('Reinstalling git-crypt...')
+        validate(task)
+        uninstall_git_crypt(task, args)
+        install_git_crypt(task, args)
+      end
+
+      private
+
+      def validate(task)
+        [uninstall_task_name, *install_task_names].each do |name|
+          raise_task_undefined(name) unless task_defined?(task, name)
+        end
+      end
+
+      def uninstall_git_crypt(task, args)
+        invoke_and_reenable_task_with_name(task, uninstall_task_name, args)
+      end
+
+      def install_git_crypt(task, args)
+        install_task_names.each do |install_task_name|
+          invoke_and_reenable_task_with_name(task, install_task_name, args)
+        end
+      end
+    end
+  end
+end

data/lib/rake_git_crypt/tasks/uninstall.rb

@@ -31,7 +31,7 @@ module RakeGitCrypt
       private
 
       def lock_git_crypt(task, args)
-        invoke_task_with_name(task, lock_task_name, args)
+        invoke_and_reenable_task_with_name(task, lock_task_name, args)
       end
 
       def delete_git_crypt_directories
@@ -42,13 +42,13 @@ module RakeGitCrypt
       def maybe_delete_secrets(task, args)
         return unless delete_secrets_task_name
 
-        invoke_task_with_name(task, delete_secrets_task_name, args)
+        invoke_and_reenable_task_with_name(task, delete_secrets_task_name, args)
       end
 
       def maybe_commit(task, args)
         return unless commit_task_name
 
-        invoke_task_with_name(
+        invoke_and_reenable_task_with_name(
           task, commit_task_name,
           [commit_message(task), *args]
         )

data/lib/rake_git_crypt/tasks.rb

@@ -5,6 +5,7 @@ require_relative 'tasks/add_users'
 require_relative 'tasks/init'
 require_relative 'tasks/install'
 require_relative 'tasks/lock'
+require_relative 'tasks/reinstall'
 require_relative 'tasks/uninstall'
 require_relative 'tasks/unlock'
 

data/lib/rake_git_crypt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_git_crypt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.20
+  version: 0.1.0.pre.22
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -91,6 +91,7 @@ files:
 - lib/rake_git_crypt/tasks/init.rb
 - lib/rake_git_crypt/tasks/install.rb
 - lib/rake_git_crypt/tasks/lock.rb
+- lib/rake_git_crypt/tasks/reinstall.rb
 - lib/rake_git_crypt/tasks/uninstall.rb
 - lib/rake_git_crypt/tasks/unlock.rb
 - lib/rake_git_crypt/template.rb