rake_git_crypt 0.1.0.pre.12 → 0.1.0.pre.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34731a912f782d1fc1183dfb48d5925d93b3ca862d1443b47bc8c2b61cb8124f
-  data.tar.gz: 95596062d6eea240963dca39981cc88dd39a5f4895204d78e3c5bad637f9ada1
+  metadata.gz: 67d46cbdcafb550596764ed445eae72fc7a8e690643621c41042ea5eae5368de
+  data.tar.gz: 86f379c9c2e690764078268b4203dbb6b610676b7ef1523f96aaa860aece6f24
 SHA512:
-  metadata.gz: 2cb7508f0c19c589538cdce1c553203d44db6e711a0e929e48b3f5b34c66c93d415705024d075c22aaf4df0795dff08a6ad6521ead580ef6a86aa3b3ee55e268
-  data.tar.gz: d0c3976ed25b41beed85fa04750ed205546e8be7a83a9f88b44d0ab2b03c18d220ee80c8ebb8411166be3e47563463d8941b91c7b1a8217220a27dbd947aa281
+  metadata.gz: 18ef74b4cdc187ca7d72cd3feb5f492b448495cf72f5535a4c35ccec8824fbd95ef4cd36caa5abfee3d2100dc42ae6d51e03541afedc60f782c89f0367f2439f
+  data.tar.gz: ccfe1faca75c66a6d715259796448aafb476a5fbf1ac3e4b710a86395fe473fd58961966d52b33c31be4d309caca68f6a39cbc6d83d55ee4a11fa821bad81cf8

data/Gemfile

@@ -4,3 +4,18 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake_git_crypt.gemspec
 gemspec
+
+gem 'activesupport'
+gem 'bundler'
+gem 'gem-release'
+gem 'memfs'
+gem 'rake'
+gem 'rake_circle_ci'
+gem 'rake_github'
+gem 'rake_gpg'
+gem 'rake_ssh'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'simplecov'

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    rake_git_crypt (0.1.0.pre.12)
+    rake_git_crypt (0.1.0.pre.14)
       colored2 (~> 3.1)
-      rake_factory (~> 0.23)
+      rake_factory (= 0.32.0.pre.2)
       ruby_git_crypt (= 0.1.0.pre.2)
       ruby_gpg2 (~> 0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -19,11 +19,11 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    excon (0.96.0)
-    faraday (2.7.2)
+    excon (0.98.0)
+    faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
@@ -54,7 +54,7 @@ GEM
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_factory (0.31.0)
+    rake_factory (0.32.0.pre.2)
       activesupport (>= 4)
       rake (~> 13.0)
     rake_github (0.11.0)
@@ -69,7 +69,7 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    regexp_parser (2.6.1)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -80,26 +80,29 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.2)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.42.0)
+    rubocop (1.44.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.16.0)
+    rubocop-rspec (2.18.1)
       rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_git_crypt (0.1.0.pre.2)
@@ -145,4 +148,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.3
+   2.4.5

data/lib/rake_git_crypt/mixins/support.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RakeGitCrypt
+  module Mixins
+    module Support
+      def task_by_name(task, name)
+        task.application.lookup(name, task.scope)
+      end
+
+      def task_defined?(task, name)
+        !task_by_name(task, name).nil?
+      end
+
+      def invoke_task_with_name(task, name, args)
+        task_by_name(task, name).invoke(*args)
+      end
+    end
+  end
+end

data/lib/rake_git_crypt/tasks/add_users.rb

@@ -2,16 +2,126 @@
 
 require 'rake_factory'
 
+require_relative '../mixins/support'
+
 module RakeGitCrypt
   module Tasks
     class AddUsers < RakeFactory::Task
+      include Mixins::Support
+
       default_name :add_users
       default_description 'Add users to git-crypt.'
 
-      parameter :gpg_user_key_paths
+      parameter :gpg_user_key_paths, default: []
+      parameter :gpg_user_ids, default: []
+
+      parameter(
+        :add_user_by_id_task_name,
+        default: :add_user_by_id
+      )
+      parameter(
+        :add_user_by_key_path_task_name,
+        default: :add_user_by_key_path
+      )
+
+      action do |t, args|
+        ensure_users_provided
+        ensure_tasks_present(t)
+
+        add_users_by_key_paths(t, args)
+        add_users_by_ids(t, args)
+      end
+
+      private
+
+      def ensure_users_provided
+        if gpg_user_details_present?(:key_path) ||
+           gpg_user_details_present?(:id)
+          return
+        end
+
+        raise_user_details_missing
+      end
+
+      def ensure_tasks_present(task)
+        ensure_add_user_task_present(task, :id)
+        ensure_add_user_task_present(task, :key_path)
+      end
+
+      def ensure_add_user_task_present(task, user_type)
+        unless add_user_task_required?(user_type) && (
+          add_user_task_name_missing?(user_type) ||
+            !add_user_task_defined?(task, user_type))
+          return
+        end
+
+        if add_user_task_name_missing?(user_type)
+          raise_add_user_task_name_missing(user_type)
+        else
+          raise_add_user_task_undefined(user_type)
+        end
+      end
+
+      def add_user_task_name_missing?(user_type)
+        send(:"add_user_by_#{user_type}_task_name").nil?
+      end
+
+      def add_user_task_required?(user_type)
+        gpg_user_details_present?(user_type)
+      end
+
+      def add_user_task_defined?(task, user_type)
+        task_defined?(task, send(:"add_user_by_#{user_type}_task_name"))
+      end
+
+      def gpg_user_details_present?(user_type)
+        !(send(:"gpg_user_#{user_type}s").nil? ||
+          send(:"gpg_user_#{user_type}s").empty?)
+      end
+
+      def add_users_by_key_paths(task, args)
+        add_users(task, args, :key_path)
+      end
+
+      def add_users_by_ids(task, args)
+        add_users(task, args, :id)
+      end
+
+      def add_users(task, args, user_type)
+        return unless gpg_user_details_present?(user_type)
+
+        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
+        end
+      end
+
+      def raise_add_user_task_name_missing(user_type)
+        raise(
+          RakeFactory::RequiredParameterUnset,
+          "When gpg_user_#{user_type}s provided, " \
+          "add_user_by_#{user_type}_task_name must be defined but is nil."
+        )
+      end
+
+      def raise_add_user_task_undefined(user_type)
+        raise(
+          RakeFactory::DependencyTaskMissing,
+          'The task with name defined in ' \
+          "add_user_by_#{user_type}_task_name does not exist but is needed " \
+          "since gpg_user_#{user_type}s provided."
+        )
+      end
 
-      action do
-        # no-op
+      def raise_user_details_missing
+        raise(
+          RakeFactory::RequiredParameterUnset,
+          'At least one of gpg_user_key_paths or gpg_user_ids ' \
+          'must be provided.'
+        )
       end
     end
   end

data/lib/rake_git_crypt/tasks/uninstall.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rake_factory'
+require 'ruby_git_crypt'
+
+require_relative '../mixins/support'
+
+module RakeGitCrypt
+  module Tasks
+    class Uninstall < RakeFactory::Task
+      include Mixins::Support
+
+      default_name :uninstall
+      default_description 'Uninstall git-crypt.'
+
+      parameter(:lock_task_name, default: :lock)
+      parameter(:delete_secrets_task_name)
+
+      action do |task, args|
+        puts('Uninstalling git-crypt...')
+        lock_git_crypt(task, args)
+        delete_git_crypt_directories
+        maybe_delete_secrets(task, args)
+      end
+
+      private
+
+      def lock_git_crypt(task, args)
+        invoke_task_with_name(task, lock_task_name, args)
+      end
+
+      def delete_git_crypt_directories
+        FileUtils.rm_rf('.git-crypt')
+        FileUtils.rm_rf('.git/git-crypt')
+      end
+
+      def maybe_delete_secrets(task, args)
+        return unless delete_secrets_task_name
+
+        unless delete_secrets_task_defined?(task)
+          raise_delete_secrets_task_undefined
+        end
+
+        invoke_task_with_name(task, delete_secrets_task_name, args)
+      end
+
+      def delete_secrets_task_defined?(task)
+        task_defined?(task, delete_secrets_task_name)
+      end
+
+      def raise_delete_secrets_task_undefined
+        raise(
+          RakeFactory::DependencyTaskMissing,
+          'The task with name defined in delete_secrets_task_name does not ' \
+          'exist.'
+        )
+      end
+    end
+  end
+end

data/lib/rake_git_crypt/tasks/unlock.rb

@@ -9,12 +9,12 @@ module RakeGitCrypt
       default_name :unlock
       default_description 'Unlock git-crypt.'
 
-      parameter :key_path
+      parameter :key_paths
 
       action do
         puts('Unlocking git-crypt...')
         RubyGitCrypt.unlock(
-          key_path: key_path
+          key_files: key_paths
         )
       end
     end

data/lib/rake_git_crypt/tasks.rb

@@ -5,6 +5,7 @@ require_relative 'tasks/add_user'
 require_relative 'tasks/add_users'
 require_relative 'tasks/lock'
 require_relative 'tasks/unlock'
+require_relative 'tasks/uninstall'
 
 module RakeGitCrypt
   module Tasks

data/lib/rake_git_crypt/version.rb

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

data/rake_git_crypt.gemspec

@@ -37,24 +37,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'colored2', '~> 3.1'
-  spec.add_dependency 'rake_factory', '~> 0.23'
+  spec.add_dependency 'rake_factory', '0.32.0.pre.2'
   spec.add_dependency 'ruby_git_crypt', '0.1.0.pre.2'
   spec.add_dependency 'ruby_gpg2', '~> 0.6'
 
-  spec.add_development_dependency 'activesupport'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'gem-release'
-  spec.add_development_dependency 'memfs'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rake_circle_ci'
-  spec.add_development_dependency 'rake_github'
-  spec.add_development_dependency 'rake_gpg'
-  spec.add_development_dependency 'rake_ssh'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
-
   spec.metadata['rubygems_mfa_required'] = 'false'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_git_crypt
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.12
+  version: 0.1.0.pre.14
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -28,16 +28,16 @@ dependencies:
   name: rake_factory
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: 0.32.0.pre.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: 0.32.0.pre.2
 - !ruby/object:Gem::Dependency
   name: ruby_git_crypt
   requirement: !ruby/object:Gem::Requirement
@@ -66,202 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gem-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: memfs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake_circle_ci
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake_github
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake_gpg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake_ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Allows initialising, locking, unlocking and managing users for git-crypt.
 email:
 - maintainers@infrablocks.io
@@ -279,12 +83,14 @@ files:
 - bin/setup
 - lib/rake_git_crypt.rb
 - lib/rake_git_crypt/home.rb
+- lib/rake_git_crypt/mixins/support.rb
 - lib/rake_git_crypt/task_sets.rb
 - lib/rake_git_crypt/tasks.rb
 - lib/rake_git_crypt/tasks/add_user.rb
 - lib/rake_git_crypt/tasks/add_users.rb
 - lib/rake_git_crypt/tasks/init.rb
 - lib/rake_git_crypt/tasks/lock.rb
+- lib/rake_git_crypt/tasks/uninstall.rb
 - lib/rake_git_crypt/tasks/unlock.rb
 - lib/rake_git_crypt/version.rb
 - rake_git_crypt.gemspec