ruby_easy_rsa 0.12.0.pre.3 → 0.12.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b40e01d48abad17baa01548576da332129e0ac9cc14eafab362c203c87c29b2
-  data.tar.gz: bfad0e29ee2911bd8d51ee3bddd0faaee9852f49d38bfa3dd2b27964fa3111aa
+  metadata.gz: 59dbaf6124c9b01ebdc2dda12a5366b3222ecccb03827e57cdaa3ec2e9f3f203
+  data.tar.gz: 1e8d6c301e17bbb81b91e42eb93673e78dd1d3973dea5f28e07d8900a39869e9
 SHA512:
-  metadata.gz: 92632b72d3616a4438c7b3511977b7dad2da78777c2c658794384e481ef1c398263be56c71ba4962044bdd824f149f4fbc363c4d508d0ff5d5d4c2b32af29a0d
-  data.tar.gz: 3911c9bd61fd2141fb07e878afedab93bf41aca8c9ba82232125c5209561e53638be535323162e01afdf68e528577c8d6744b0f01b4401661c4f8732594516e3
+  metadata.gz: e9bb48b797c6a108c1a952fd4e6b4465894d7597c1f91a27b7671fe645b81804328ebb78203399478b4bc727b1accb819d922079d2e65b9897eca04024619bba
+  data.tar.gz: b135a88c675d96725d2008e9d4bc3d129a1d449e3bad33a94e95015e6c33a3d3dc816c20ae2cedd2f4559cf432ada46113a090a3bc6687c921c32699e9677ef5

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    ruby_easy_rsa (0.12.0.pre.3)
-      lino (~> 3.0)
+    ruby_easy_rsa (0.12.0.pre.5)
+      lino (>= 3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -17,52 +17,55 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.1.1)
-      ruby2_keywords
-    excon (0.104.0)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    drb (2.2.1)
+    excon (0.111.0)
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
+      logger
+    faraday-net_http (3.1.0)
+      net-http
     gem-release (2.2.2)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     immutable-struct (2.4.1)
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     lino (3.1.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
-    octokit (6.1.1)
+    logger (1.6.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
+    octokit (8.1.0)
+      base64
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     rake_circle_ci (0.11.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
@@ -71,18 +74,18 @@ GEM
     rake_factory (0.32.0.pre.2)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_git (0.1.0.pre.8)
+    rake_git (0.1.0.pre.10)
       colored2 (~> 3.1)
       git (~> 1.13, >= 1.13.2)
       rake_factory (= 0.32.0.pre.2)
-    rake_git_crypt (0.1.0.pre.27)
+    rake_git_crypt (0.1.0.pre.29)
       colored2 (~> 3.1)
       rake_factory (= 0.32.0.pre.2)
-      ruby_git_crypt (= 0.1.0.pre.2)
+      ruby_git_crypt (= 0.1.0.pre.4)
       ruby_gpg2 (~> 0.6)
-    rake_github (0.11.0)
+    rake_github (0.13.0)
       colored2 (~> 3.1)
-      octokit (>= 4.16, < 7.0)
+      octokit (>= 4.16, < 9.0)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
     rake_gpg (0.18.0)
@@ -93,47 +96,41 @@ GEM
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.2)
+    rexml (3.3.1)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.57.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    ruby_git_crypt (0.1.0.pre.2)
+    ruby_git_crypt (0.1.0.pre.4)
       immutable-struct (~> 2.4)
       lino (~> 3.0)
     ruby_gpg2 (0.10.0)
@@ -148,9 +145,11 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
+    strscan (3.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
 
 PLATFORMS
   arm64-darwin-21

data/Rakefile

@@ -146,7 +146,7 @@ end
 RakeGithub.define_repository_tasks(
   namespace: :github,
   repository: 'infrablocks/ruby_easy_rsa'
-) do |t, args|
+) do |t|
   github_config =
     YAML.load_file('config/secrets/github/config.yaml')
 
@@ -157,8 +157,6 @@ RakeGithub.define_repository_tasks(
       public_key: File.read('config/secrets/ci/ssh.public')
     }
   ]
-  t.branch_name = args.branch_name
-  t.commit_message = args.commit_message
 end
 
 namespace :pipeline do

data/lib/ruby_easy_rsa/commands/base.rb

@@ -12,7 +12,7 @@ module RubyEasyRSA
       end
 
       def stdin
-        ''
+        nil
       end
 
       def stdout
@@ -23,16 +23,22 @@ module RubyEasyRSA
         $stderr
       end
 
-      def execute(opts = {})
-        do_before(opts)
-        configure_command(instantiate_builder, opts)
-          .build
-          .execute(
-            stdin: stdin,
-            stdout: stdout,
-            stderr: stderr
-          )
-        do_after(opts)
+      def execute(parameters = {})
+        parameters = resolve_parameters(parameters)
+
+        do_before(parameters)
+        result = build_and_execute_command(parameters)
+        do_after(parameters)
+
+        result
+      end
+
+      private
+
+      def build_and_execute_command(parameters)
+        command = configure_command(instantiate_builder, parameters).build
+
+        command.execute(stdin:, stdout:, stderr:)
       end
 
       def instantiate_builder
@@ -43,11 +49,25 @@ module RubyEasyRSA
 
       def do_before(_); end
 
-      def configure_command(builder, _opts)
+      def configure_command(builder, _parameters)
         builder
       end
 
       def do_after(_); end
+
+      def resolve_parameters(parameters)
+        parameter_defaults(parameters)
+          .merge(parameters)
+          .merge(parameter_overrides(parameters))
+      end
+
+      def parameter_defaults(_parameters)
+        {}
+      end
+
+      def parameter_overrides(_parameters)
+        {}
+      end
     end
   end
 end

data/lib/ruby_easy_rsa/commands/build_ca.rb

@@ -16,12 +16,12 @@ module RubyEasyRSA
       include Mixins::AlgorithmConfig
       include Mixins::EncryptKeyConfig
 
-      def configure_command(builder, opts)
-        sub_ca = opts[:sub_ca]
+      private
 
-        builder = builder.with_subcommand('build-ca')
-        builder = builder.with_argument('subca') if sub_ca
-        super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('build-ca')
+        builder = builder.with_argument('subca') if parameters[:sub_ca]
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/build_client_full.rb

@@ -26,12 +26,12 @@ module RubyEasyRSA
       include Mixins::EncryptKeyConfig
       include Mixins::InlineCredentialsFileConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
+      private
 
-        builder = builder.with_subcommand('build-client-full')
-        builder = builder.with_argument(filename_base)
-        super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('build-client-full')
+        builder = builder.with_argument(parameters[:filename_base])
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/build_client_server_full.rb

@@ -26,12 +26,12 @@ module RubyEasyRSA
       include Mixins::EncryptKeyConfig
       include Mixins::InlineCredentialsFileConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
+      private
 
-        builder = builder.with_subcommand('build-clientServer-full')
-        builder = builder.with_argument(filename_base)
-        super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('build-clientServer-full')
+        builder = builder.with_argument(parameters[:filename_base])
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/build_server_full.rb

@@ -26,12 +26,12 @@ module RubyEasyRSA
       include Mixins::EncryptKeyConfig
       include Mixins::InlineCredentialsFileConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
+      private
 
-        builder = builder.with_subcommand('build-server-full')
-        builder = builder.with_argument(filename_base)
-        super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('build-server-full')
+        builder = builder.with_argument(parameters[:filename_base])
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/export_p12.rb

@@ -12,16 +12,23 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        include_ca = opts[:include_ca].nil? ? true : opts[:include_ca]
-        include_key = opts[:include_key].nil? ? true : opts[:include_key]
+      private
 
-        builder = super(builder, opts)
+      def parameter_defaults(parameters)
+        include_ca = parameters[:include_ca]
+        include_key = parameters[:include_key]
+        super.merge(
+          include_ca: include_ca.nil? ? true : include_ca,
+          include_key: include_key.nil? ? true : include_key
+        )
+      end
+
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('export-p12')
-        builder = builder.with_argument(filename_base)
-        builder = builder.with_argument('noca') unless include_ca
-        builder = builder.with_argument('nokey') unless include_key
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = builder.with_argument('noca') unless parameters[:include_ca]
+        builder = builder.with_argument('nokey') unless parameters[:include_key]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/export_p7.rb

@@ -12,14 +12,18 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        include_ca = opts[:include_ca].nil? ? true : opts[:include_ca]
+      private
 
-        builder = super(builder, opts)
+      def parameter_defaults(parameters)
+        include_ca = parameters[:include_ca]
+        super.merge(include_ca: include_ca.nil? ? true : include_ca)
+      end
+
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('export-p7')
-        builder = builder.with_argument(filename_base)
-        builder = builder.with_argument('noca') unless include_ca
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = builder.with_argument('noca') unless parameters[:include_ca]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/gen_crl.rb

@@ -12,9 +12,11 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        builder = builder.with_subcommand('gen-crl')
-        super(builder, opts)
+      private
+
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('gen-crl')
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/gen_dh.rb

@@ -12,8 +12,10 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      private
+
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder.with_subcommand('gen-dh')
       end
     end

data/lib/ruby_easy_rsa/commands/gen_req.rb

@@ -18,12 +18,12 @@ module RubyEasyRSA
       include Mixins::ExtraExtensionsConfig
       include Mixins::EncryptKeyConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
+      private
 
-        builder = builder.with_subcommand('gen-req')
-        builder = builder.with_argument(filename_base)
-        super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('gen-req')
+        builder = builder.with_argument(parameters[:filename_base])
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/import_req.rb

@@ -12,11 +12,13 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        request_file = opts[:request_file]
-        filename_base = opts[:filename_base]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        request_file = parameters[:request_file]
+        filename_base = parameters[:filename_base]
+
+        builder = super
         builder = builder.with_subcommand('import-req')
         builder = builder.with_argument(request_file)
         builder.with_argument(filename_base)

data/lib/ruby_easy_rsa/commands/init_pki.rb

@@ -12,8 +12,10 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        builder = super(builder, opts)
+      private
+
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder.with_subcommand('init-pki')
       end
     end

data/lib/ruby_easy_rsa/commands/mixins/algorithm_config.rb

@@ -4,18 +4,18 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module AlgorithmConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_ec_directory(builder, opts[:ec_directory])
-          builder = with_algorithm(builder, opts[:algorithm])
-          builder = with_curve(builder, opts[:curve])
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_ec_directory(builder, parameters[:ec_directory])
+          builder = with_algorithm(builder, parameters[:algorithm])
+          builder = with_curve(builder, parameters[:curve])
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_ec_directory(builder, ec_directory)
           return builder unless ec_directory
 

data/lib/ruby_easy_rsa/commands/mixins/copy_extensions_config.rb

@@ -4,16 +4,16 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module CopyExtensionsConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_copy_extensions(builder, opts[:copy_extensions])
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_copy_extensions(builder, parameters[:copy_extensions])
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_copy_extensions(builder, copy_extensions)
           return builder unless copy_extensions
 

data/lib/ruby_easy_rsa/commands/mixins/encrypt_key_config.rb

@@ -4,16 +4,16 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module EncryptKeyConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_encrypt_key(builder, encrypt_key(opts))
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_encrypt_key(builder, encrypt_key(parameters))
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def encrypt_key(opts)
           opts[:encrypt_key].nil? ? true : opts[:encrypt_key]
         end

data/lib/ruby_easy_rsa/commands/mixins/extra_extensions_config.rb

@@ -4,19 +4,21 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module ExtraExtensionsConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_extra_extensions(builder, opts[:extra_extensions])
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_extra_extensions(
+            builder, parameters[:extra_extensions]
+          )
           builder = with_subject_alternative_name(
-            builder, opts[:subject_alternative_name]
+            builder, parameters[:subject_alternative_name]
           )
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_extra_extensions(builder, extra_extensions)
           return builder unless extra_extensions
 

data/lib/ruby_easy_rsa/commands/mixins/global_config.rb

@@ -4,30 +4,46 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module GlobalConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_openssl_binary(builder, opts[:openssl_binary])
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_openssl_binary(
+            builder, parameters[:openssl_binary]
+          )
           builder = with_extensions_directory(
-            builder, opts[:extensions_directory]
-          )
-          builder = with_ssl_configuration(builder, opts[:ssl_configuration])
-          builder = with_safe_configuration(builder, opts[:safe_configuration])
-          builder = with_vars(builder, opts[:vars])
-          builder = with_batch(builder, opts[:batch])
-          builder = with_pki_directory(builder, opts[:pki_directory])
-          builder = with_input_password(builder, opts[:input_password])
-          builder = with_output_password(builder, opts[:output_password])
+            builder, parameters[:extensions_directory]
+          )
+          builder = with_ssl_configuration(
+            builder, parameters[:ssl_configuration]
+          )
+          builder = with_safe_configuration(
+            builder, parameters[:safe_configuration]
+          )
+          builder = with_vars(
+            builder, parameters[:vars]
+          )
+          builder = with_batch(
+            builder, parameters[:batch]
+          )
+          builder = with_pki_directory(
+            builder, parameters[:pki_directory]
+          )
+          builder = with_input_password(
+            builder, parameters[:input_password]
+          )
+          builder = with_output_password(
+            builder, parameters[:output_password]
+          )
           builder
         end
         # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/MethodLength
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_openssl_binary(builder, openssl_binary)
           return builder unless openssl_binary
 

data/lib/ruby_easy_rsa/commands/mixins/inline_credentials_file_config.rb

@@ -4,18 +4,18 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module InlineCredentialsFileConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
+        def configure_command(initial_builder, parameters)
+          builder = super
           builder = with_inline_credentials_file(
-            builder, opts[:inline_credentials_file]
+            builder, parameters[:inline_credentials_file]
           )
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_inline_credentials_file(builder, inline_credentials_file)
           return builder unless inline_credentials_file
 

data/lib/ruby_easy_rsa/commands/mixins/netscape_extensions_config.rb

@@ -4,21 +4,21 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module NetscapeExtensionsConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
+        def configure_command(initial_builder, parameters)
+          builder = super
           builder = with_netscape_extensions_support(
-            builder, opts[:netscape_extensions_support]
+            builder, parameters[:netscape_extensions_support]
           )
           builder = with_netscape_extensions_comment(
-            builder, opts[:netscape_extensions_comment]
+            builder, parameters[:netscape_extensions_comment]
           )
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_netscape_extensions_support(
           builder, netscape_extensions_support
         )

data/lib/ruby_easy_rsa/commands/mixins/ssl_config.rb

@@ -4,120 +4,116 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module SSLConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_digest(builder, opts[:digest])
-          builder = with_expires_in_days(builder, opts[:expires_in_days])
-          builder = with_key_size_in_bits(builder, opts[:key_size_in_bits])
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_digest(
+            builder, parameters[:digest]
+          )
+          builder = with_expires_in_days(
+            builder, parameters[:expires_in_days]
+          )
+          builder = with_key_size_in_bits(
+            builder, parameters[:key_size_in_bits]
+          )
           builder = with_distinguished_name_mode(
-            builder, opts[:distinguished_name_mode]
+            builder, parameters[:distinguished_name_mode]
+          )
+          builder = with_common_name(
+            builder, parameters[:common_name]
+          )
+          builder = with_country(
+            builder, parameters[:country]
+          )
+          builder = with_province(
+            builder, parameters[:province]
+          )
+          builder = with_city(
+            builder, parameters[:city]
+          )
+          builder = with_organisation(
+            builder, parameters[:organisation]
           )
-          builder = with_common_name(builder, opts[:common_name])
-          builder = with_country(builder, opts[:country])
-          builder = with_province(builder, opts[:province])
-          builder = with_city(builder, opts[:city])
-          builder = with_organisation(builder, opts[:organisation])
           builder = with_organisational_unit(
-            builder, opts[:organisational_unit]
+            builder, parameters[:organisational_unit]
+          )
+          builder = with_email(
+            builder, parameters[:email]
           )
-          builder = with_email(builder, opts[:email])
           builder
         end
         # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/MethodLength
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_digest(builder, digest)
           return builder unless digest
 
-          builder.with_option(
-            '--digest', digest
-          )
+          builder.with_option('--digest', digest)
         end
 
         def with_expires_in_days(builder, expires_in_days)
           return builder unless expires_in_days
 
-          builder.with_option(
-            '--days', expires_in_days
-          )
+          builder.with_option('--days', expires_in_days)
         end
 
         def with_key_size_in_bits(builder, key_size_in_bits)
           return builder unless key_size_in_bits
 
-          builder.with_option(
-            '--keysize', key_size_in_bits
-          )
+          builder.with_option('--keysize', key_size_in_bits)
         end
 
         def with_distinguished_name_mode(builder, distinguished_name_mode)
           return builder unless distinguished_name_mode
 
-          builder.with_option(
-            '--dn-mode', distinguished_name_mode
-          )
+          builder.with_option('--dn-mode', distinguished_name_mode)
         end
 
         def with_common_name(builder, common_name)
           return builder unless common_name
 
-          builder.with_option(
-            '--req-cn', common_name, quoting: '"'
-          )
+          builder.with_option('--req-cn', common_name, quoting: '"')
         end
 
         def with_country(builder, country)
           return builder unless country
 
-          builder.with_option(
-            '--req-c', country, quoting: '"'
-          )
+          builder.with_option('--req-c', country, quoting: '"')
         end
 
         def with_province(builder, province)
           return builder unless province
 
-          builder.with_option(
-            '--req-st', province, quoting: '"'
-          )
+          builder.with_option('--req-st', province, quoting: '"')
         end
 
         def with_city(builder, city)
           return builder unless city
 
-          builder.with_option(
-            '--req-city', city, quoting: '"'
-          )
+          builder.with_option('--req-city', city, quoting: '"')
         end
 
         def with_organisation(builder, organisation)
           return builder unless organisation
 
-          builder.with_option(
-            '--req-org', organisation, quoting: '"'
-          )
+          builder.with_option('--req-org', organisation, quoting: '"')
         end
 
         def with_organisational_unit(builder, organisational_unit)
           return builder unless organisational_unit
 
-          builder.with_option(
-            '--req-ou', organisational_unit, quoting: '"'
-          )
+          builder.with_option('--req-ou', organisational_unit, quoting: '"')
         end
 
         def with_email(builder, email)
           return builder unless email
 
-          builder.with_option(
-            '--req-email', email
-          )
+          builder.with_option('--req-email', email)
         end
       end
     end

data/lib/ruby_easy_rsa/commands/mixins/sub_ca_config.rb

@@ -4,16 +4,16 @@ module RubyEasyRSA
   module Commands
     module Mixins
       module SubCAConfig
+        private
+
         # rubocop:disable Style/RedundantAssignment
-        def configure_command(builder, opts)
-          builder = super(builder, opts)
-          builder = with_sub_ca_length(builder, opts[:sub_ca_length])
+        def configure_command(initial_builder, parameters)
+          builder = super
+          builder = with_sub_ca_length(builder, parameters[:sub_ca_length])
           builder
         end
         # rubocop:enable Style/RedundantAssignment
 
-        private
-
         def with_sub_ca_length(builder, sub_ca_length)
           return builder unless sub_ca_length
 

data/lib/ruby_easy_rsa/commands/renew.rb

@@ -14,12 +14,12 @@ module RubyEasyRSA
       include Mixins::SSLConfig
       include Mixins::EncryptKeyConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
+      private
 
-        builder = builder.with_subcommand('renew')
-        builder = builder.with_argument(filename_base)
-        super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('renew')
+        builder = builder.with_argument(parameters[:filename_base])
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/revoke.rb

@@ -12,14 +12,16 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        reason = opts[:reason]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('revoke')
-        builder = builder.with_argument(filename_base)
-        builder = builder.with_argument(reason) if reason
+        builder = builder.with_argument(parameters[:filename_base])
+        if parameters[:reason]
+          builder =
+            builder.with_argument(parameters[:reason])
+        end
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/set_ec_pass.rb

@@ -14,14 +14,13 @@ module RubyEasyRSA
       include Mixins::SSLConfig
       include Mixins::EncryptKeyConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        file = opts[:file]
+      private
 
-        builder = builder.with_subcommand('set-ec-pass')
-        builder = builder.with_argument(filename_base)
-        builder = super(builder, opts)
-        builder = builder.with_argument('file') if file
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('set-ec-pass')
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = super(builder, parameters)
+        builder = builder.with_argument('file') if parameters[:file]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/set_rsa_pass.rb

@@ -14,14 +14,13 @@ module RubyEasyRSA
       include Mixins::SSLConfig
       include Mixins::EncryptKeyConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        file = opts[:file]
+      private
 
-        builder = builder.with_subcommand('set-rsa-pass')
-        builder = builder.with_argument(filename_base)
-        builder = super(builder, opts)
-        builder = builder.with_argument('file') if file
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('set-rsa-pass')
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = super(builder, parameters)
+        builder = builder.with_argument('file') if parameters[:file]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/show_ca.rb

@@ -12,14 +12,13 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        full = opts[:full]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('show-ca')
-        builder = builder.with_argument(filename_base)
-        builder = builder.with_argument('full') if full
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = builder.with_argument('full') if parameters[:full]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/show_cert.rb

@@ -12,14 +12,13 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        full = opts[:full]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('show-cert')
-        builder = builder.with_argument(filename_base)
-        builder = builder.with_argument('full') if full
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = builder.with_argument('full') if parameters[:full]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/show_req.rb

@@ -12,14 +12,13 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        filename_base = opts[:filename_base]
-        full = opts[:full]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('show-req')
-        builder = builder.with_argument(filename_base)
-        builder = builder.with_argument('full') if full
+        builder = builder.with_argument(parameters[:filename_base])
+        builder = builder.with_argument('full') if parameters[:full]
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/sign_req.rb

@@ -22,14 +22,13 @@ module RubyEasyRSA
       include Mixins::ExtraExtensionsConfig
       include Mixins::NetscapeExtensionsConfig
 
-      def configure_command(builder, opts)
-        type = opts[:type]
-        filename_base = opts[:filename_base]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('sign-req')
-        builder = builder.with_argument(type)
-        builder.with_argument(filename_base)
+        builder = builder.with_argument(parameters[:type])
+        builder.with_argument(parameters[:filename_base])
       end
     end
   end

data/lib/ruby_easy_rsa/commands/update_db.rb

@@ -12,9 +12,11 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        builder = builder.with_subcommand('update-db')
-        super(builder, opts)
+      private
+
+      def configure_command(initial_builder, parameters)
+        builder = initial_builder.with_subcommand('update-db')
+        super(builder, parameters)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/upgrade.rb

@@ -12,12 +12,12 @@ module RubyEasyRSA
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
 
-      def configure_command(builder, opts)
-        type = opts[:type]
+      private
 
-        builder = super(builder, opts)
+      def configure_command(initial_builder, parameters)
+        builder = super
         builder = builder.with_subcommand('upgrade')
-        builder.with_argument(type)
+        builder.with_argument(parameters[:type])
       end
     end
   end

data/lib/ruby_easy_rsa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyEasyRSA
-  VERSION = '0.12.0.pre.3'
+  VERSION = '0.12.0.pre.5'
 end

data/ruby_easy_rsa.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.1'
 
-  spec.add_dependency 'lino', '~> 3.0'
+  spec.add_dependency 'lino', '>= 3.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'gem-release'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_easy_rsa
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.3
+  version: 0.12.0.pre.5
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A simple Ruby wrapper for invoking EasyRSA commands.