rake_git_crypt 0.1.0.pre.21 → 0.1.0.pre.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c20059b32c6b5f59ff0cace33fa2e3cec8c925676e0a7efbd280a03cca620cd5
-  data.tar.gz: e32abb023fc9b2ed03d36df9fa6f3b80024b866cda2e32cb2956ff10fed6d564
+  metadata.gz: f19d3ff27efb8541ab558ea08406b4f3a74f98ba69c397750a4301d9be209ba3
+  data.tar.gz: 35459f4c26b4586dc31dfdab87fec1ae0364c98bb3a0281b327fb04a0cda169b
 SHA512:
-  metadata.gz: 3ee25e6fd5bb25c08da05c3165b8eb7462e9804406b010d8d8ffe0944c271254338e6ec6c148c95326fd6fd623f865da3853787ee5fafe1f4c8eb1bc5d82ac7f
-  data.tar.gz: 5cd3f1a6b97c309b6b6253458b85c32953d3141e7ac279274cd2a96a149728bcd7f324f4572a2cbb0cd8c4e536d5afc0aa49e2106e19815c312986ed2598d7a4
+  metadata.gz: b18e23c299805634a2b3fd5f0e0bdc8939c44b84d22cfd454fa93f33ab5baca90ba4bc2d09e3cf4dbac5bf1b843caad3cbbd3d812e424e511de13ce5bb3332c8
+  data.tar.gz: 105c0091715e3a0eb121381e6c7beadc9eb961d7f9e825a1408e21d5aec89ed7167c37b7fa74958c30ddc12d0097828d24349b1546b7ab845147dfbb4063227a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_git_crypt (0.1.0.pre.21)
+    rake_git_crypt (0.1.0.pre.23)
       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

@@ -18,11 +18,13 @@ module RakeGitCrypt
 
       parameter(:init_task_name, default: :init)
       parameter(:add_users_task_name, default: :add_users)
+      parameter(:provision_secrets_task_name)
       parameter(:commit_task_name)
 
       action do |task, args|
         puts('Installing git-crypt...')
         init_git_crypt(task, args)
+        maybe_provision_secrets(task, args)
         add_users_to_git_crypt(task, args)
         maybe_commit(task, args)
       end
@@ -30,17 +32,25 @@ 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_provision_secrets(task, args)
+        return unless provision_secrets_task_name
+
+        invoke_and_reenable_task_with_name(
+          task, provision_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/reinstall.rb

@@ -31,12 +31,12 @@ module RakeGitCrypt
       end
 
       def uninstall_git_crypt(task, args)
-        invoke_task_with_name(task, uninstall_task_name, 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_task_with_name(task, install_task_name, args)
+          invoke_and_reenable_task_with_name(task, install_task_name, args)
         end
       end
     end

data/lib/rake_git_crypt/tasks/uninstall.rb

@@ -17,7 +17,7 @@ module RakeGitCrypt
                 default: 'Uninstalling git-crypt.')
 
       parameter(:lock_task_name, default: :lock)
-      parameter(:delete_secrets_task_name)
+      parameter(:destroy_secrets_task_name)
       parameter(:commit_task_name)
 
       action do |task, args|
@@ -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
@@ -40,15 +40,16 @@ module RakeGitCrypt
       end
 
       def maybe_delete_secrets(task, args)
-        return unless delete_secrets_task_name
+        return unless destroy_secrets_task_name
 
-        invoke_task_with_name(task, delete_secrets_task_name, args)
+        invoke_and_reenable_task_with_name(task, destroy_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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_git_crypt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.21
+  version: 0.1.0.pre.23
 platform: ruby
 authors:
 - InfraBlocks Maintainers