ruby_easy_rsa 0.10.0.pre.5 → 0.10.0.pre.8

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

@@ -1,19 +1,37 @@
+# frozen_string_literal: true
+
 module RubyEasyRSA
   module Commands
     module Mixins
       module ExtraExtensionsConfig
+        # rubocop:disable Style/RedundantAssignment
         def configure_command(builder, opts)
-          extra_extensions = opts[:extra_extensions]
-          subject_alternative_name = opts[:subject_alternative_name]
-
           builder = super(builder, opts)
-          builder = builder.with_environment_variable(
-              'EASYRSA_EXTRA_EXT', extra_extensions) if extra_extensions
-          builder = builder.with_option(
-              '--subject-alt-name', subject_alternative_name, quoting: '"'
-          ) if subject_alternative_name
+          builder = with_extra_extensions(builder, opts[:extra_extensions])
+          builder = with_subject_alternative_name(
+            builder, opts[:subject_alternative_name]
+          )
           builder
         end
+        # rubocop:enable Style/RedundantAssignment
+
+        private
+
+        def with_extra_extensions(builder, extra_extensions)
+          return builder unless extra_extensions
+
+          builder.with_environment_variable(
+            'EASYRSA_EXTRA_EXT', extra_extensions
+          )
+        end
+
+        def with_subject_alternative_name(builder, subject_alternative_name)
+          return builder unless subject_alternative_name
+
+          builder.with_option(
+            '--subject-alt-name', subject_alternative_name, quoting: '"'
+          )
+        end
       end
     end
   end

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

@@ -1,40 +1,105 @@
+# frozen_string_literal: true
+
 module RubyEasyRSA
   module Commands
     module Mixins
       module GlobalConfig
+        # rubocop:disable Style/RedundantAssignment
+        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/AbcSize
         def configure_command(builder, opts)
-          extensions_directory = opts[:extensions_directory]
-          openssl_binary = opts[:openssl_binary]
-          ssl_configuration = opts[:ssl_configuration]
-          safe_configuration = opts[:safe_configuration]
-          vars = opts[:vars]
-          batch = opts[:batch]
-          pki_directory = opts[:pki_directory]
-          input_password = opts[:input_password]
-          output_password = opts[:output_password]
-
           builder = super(builder, opts)
-          builder = builder.with_environment_variable(
-              'EASYRSA_OPENSSL', openssl_binary) if openssl_binary
-          builder = builder.with_environment_variable(
-              'EASYRSA_EXT_DIR', extensions_directory) if extensions_directory
-          builder = builder.with_environment_variable(
-              'EASYRSA_SSL_CONF', ssl_configuration) if ssl_configuration
-          builder = builder.with_environment_variable(
-              'EASYRSA_SAFE_CONF', safe_configuration) if safe_configuration
-          builder = builder.with_option(
-              '--vars', vars) if vars
-          builder = builder.with_flag(
-              '--batch') if batch
-          builder = builder.with_option(
-              '--pki-dir', pki_directory) if pki_directory
-          builder = builder.with_option(
-              '--passin', input_password) if input_password
-          builder = builder.with_option(
-              '--passout', output_password) if output_password
+          builder = with_openssl_binary(builder, opts[: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
         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
+
+          builder.with_environment_variable(
+            'EASYRSA_OPENSSL', openssl_binary
+          )
+        end
+
+        def with_extensions_directory(builder, extensions_directory)
+          return builder unless extensions_directory
+
+          builder.with_environment_variable(
+            'EASYRSA_EXT_DIR', extensions_directory
+          )
+        end
+
+        def with_ssl_configuration(builder, ssl_configuration)
+          return builder unless ssl_configuration
+
+          builder.with_environment_variable(
+            'EASYRSA_SSL_CONF', ssl_configuration
+          )
+        end
+
+        def with_safe_configuration(builder, safe_configuration)
+          return builder unless safe_configuration
+
+          builder.with_environment_variable(
+            'EASYRSA_SAFE_CONF', safe_configuration
+          )
+        end
+
+        def with_vars(builder, vars)
+          return builder unless vars
+
+          builder.with_option(
+            '--vars', vars
+          )
+        end
+
+        def with_batch(builder, batch)
+          return builder unless batch
+
+          builder.with_flag(
+            '--batch'
+          )
+        end
+
+        def with_pki_directory(builder, pki_directory)
+          return builder unless pki_directory
+
+          builder.with_option(
+            '--pki-dir', pki_directory
+          )
+        end
+
+        def with_input_password(builder, input_password)
+          return builder unless input_password
+
+          builder.with_option(
+            '--passin', input_password
+          )
+        end
+
+        def with_output_password(builder, output_password)
+          return builder unless output_password
+
+          builder.with_option(
+            '--passout', output_password
+          )
+        end
       end
     end
   end
-end
+end

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

@@ -1,14 +1,26 @@
+# frozen_string_literal: true
+
 module RubyEasyRSA
   module Commands
     module Mixins
       module InlineCredentialsFileConfig
+        # rubocop:disable Style/RedundantAssignment
         def configure_command(builder, opts)
-          inline_credentials_file = opts[:inline_credentials_file]
-
           builder = super(builder, opts)
-          builder = builder.with_argument('inline') if inline_credentials_file
+          builder = with_inline_credentials_file(
+            builder, opts[: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
+
+          builder.with_argument('inline')
+        end
       end
     end
   end

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

@@ -1,20 +1,43 @@
+# frozen_string_literal: true
+
 module RubyEasyRSA
   module Commands
     module Mixins
       module NetscapeExtensionsConfig
+        # rubocop:disable Style/RedundantAssignment
         def configure_command(builder, opts)
-          netscape_extensions_support = opts[:netscape_extensions_support]
-          netscape_extensions_comment = opts[:netscape_extensions_comment]
-
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--ns-cert', netscape_extensions_support ? 'yes' : 'no'
-          ) unless netscape_extensions_support.nil?
-          builder = builder.with_option(
-              '--ns-comment', netscape_extensions_comment, quoting: '"'
-          ) if netscape_extensions_comment
+          builder = with_netscape_extensions_support(
+            builder, opts[:netscape_extensions_support]
+          )
+          builder = with_netscape_extensions_comment(
+            builder, opts[:netscape_extensions_comment]
+          )
           builder
         end
+        # rubocop:enable Style/RedundantAssignment
+
+        private
+
+        def with_netscape_extensions_support(
+          builder, netscape_extensions_support
+        )
+          return builder if netscape_extensions_support.nil?
+
+          builder.with_option(
+            '--ns-cert', netscape_extensions_support ? 'yes' : 'no'
+          )
+        end
+
+        def with_netscape_extensions_comment(
+          builder, netscape_extensions_comment
+        )
+          return builder unless netscape_extensions_comment
+
+          builder.with_option(
+            '--ns-comment', netscape_extensions_comment, quoting: '"'
+          )
+        end
       end
     end
   end

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

@@ -1,46 +1,125 @@
+# frozen_string_literal: true
+
 module RubyEasyRSA
   module Commands
     module Mixins
       module SSLConfig
+        # rubocop:disable Style/RedundantAssignment
+        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/AbcSize
         def configure_command(builder, opts)
-          digest = opts[:digest]
-          key_size_in_bits = opts[:key_size_in_bits]
-          expires_in_days = opts[:expires_in_days]
-          distinguished_name_mode = opts[:distinguished_name_mode]
-          common_name = opts[:common_name]
-          country = opts[:country]
-          province = opts[:province]
-          city = opts[:city]
-          organisation = opts[:organisation]
-          organisational_unit = opts[:organisational_unit]
-          email = opts[:email]
-
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--digest', digest) if digest
-          builder = builder.with_option(
-              '--days', expires_in_days) if expires_in_days
-          builder = builder.with_option(
-              '--keysize', key_size_in_bits) if key_size_in_bits
-          builder = builder.with_option(
-              '--dn-mode', distinguished_name_mode) if distinguished_name_mode
-          builder = builder.with_option(
-              '--req-cn', common_name, quoting: '"') if common_name
-          builder = builder.with_option(
-              '--req-c', country, quoting: '"') if country
-          builder = builder.with_option(
-              '--req-st', province, quoting: '"') if province
-          builder = builder.with_option(
-              '--req-city', city, quoting: '"') if city
-          builder = builder.with_option(
-              '--req-org', organisation, quoting: '"') if organisation
-          builder = builder.with_option(
-              '--req-ou', organisational_unit, quoting: '"') if organisational_unit
-          builder = builder.with_option(
-              '--req-email', email) if email
+          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])
+          builder = with_distinguished_name_mode(
+            builder, opts[:distinguished_name_mode]
+          )
+          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 = 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
+          )
+        end
+
+        def with_expires_in_days(builder, expires_in_days)
+          return builder unless 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
+          )
+        end
+
+        def with_distinguished_name_mode(builder, distinguished_name_mode)
+          return builder unless 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: '"'
+          )
+        end
+
+        def with_country(builder, country)
+          return builder unless country
+
+          builder.with_option(
+            '--req-c', country, quoting: '"'
+          )
+        end
+
+        def with_province(builder, province)
+          return builder unless province
+
+          builder.with_option(
+            '--req-st', province, quoting: '"'
+          )
+        end
+
+        def with_city(builder, city)
+          return builder unless city
+
+          builder.with_option(
+            '--req-city', city, quoting: '"'
+          )
+        end
+
+        def with_organisation(builder, organisation)
+          return builder unless organisation
+
+          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: '"'
+          )
+        end
+
+        def with_email(builder, email)
+          return builder unless email
+
+          builder.with_option(
+            '--req-email', email
+          )
+        end
       end
     end
   end
-end
+end

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

@@ -1,15 +1,26 @@
+# frozen_string_literal: true
+
 module RubyEasyRSA
   module Commands
     module Mixins
       module SubCAConfig
+        # rubocop:disable Style/RedundantAssignment
         def configure_command(builder, opts)
-          sub_ca_length = opts[:sub_ca_length]
-
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--subca-len', sub_ca_length) if sub_ca_length
+          builder = with_sub_ca_length(builder, opts[: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
+
+          builder.with_option(
+            '--subca-len', sub_ca_length
+          )
+        end
       end
     end
   end

data/lib/ruby_easy_rsa/commands/renew.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -17,8 +19,7 @@ module RubyEasyRSA
 
         builder = builder.with_subcommand('renew')
         builder = builder.with_argument(filename_base)
-        builder = super(builder, opts)
-        builder
+        super(builder, opts)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/revoke.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_easy_rsa/commands/set_ec_pass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_easy_rsa/commands/set_rsa_pass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_easy_rsa/commands/show_ca.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_easy_rsa/commands/show_cert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_easy_rsa/commands/show_req.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'

data/lib/ruby_easy_rsa/commands/sign_req.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -27,8 +29,7 @@ module RubyEasyRSA
         builder = super(builder, opts)
         builder = builder.with_subcommand('sign-req')
         builder = builder.with_argument(type)
-        builder = builder.with_argument(filename_base)
-        builder
+        builder.with_argument(filename_base)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/update_db.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -12,8 +14,7 @@ module RubyEasyRSA
 
       def configure_command(builder, opts)
         builder = builder.with_subcommand('update-db')
-        builder = super(builder, opts)
-        builder
+        super(builder, opts)
       end
     end
   end

data/lib/ruby_easy_rsa/commands/upgrade.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'lino'
 
 require_relative 'base'
@@ -15,8 +17,7 @@ module RubyEasyRSA
 
         builder = super(builder, opts)
         builder = builder.with_subcommand('upgrade')
-        builder = builder.with_argument(type)
-        builder
+        builder.with_argument(type)
       end
     end
   end

data/lib/ruby_easy_rsa/commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'commands/init_pki'
 require_relative 'commands/build_ca'
 require_relative 'commands/gen_dh'
@@ -22,6 +24,5 @@ require_relative 'commands/upgrade'
 
 module RubyEasyRSA
   module Commands
-
   end
-end
+end

data/lib/ruby_easy_rsa/version.rb

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

data/lib/ruby_easy_rsa.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_easy_rsa/version'
 require 'ruby_easy_rsa/commands'
 
@@ -91,13 +93,17 @@ module RubyEasyRSA
       Commands::ExportP12.new.execute(opts)
     end
 
+    # rubocop:disable Naming/AccessorMethodName
     def set_rsa_pass(opts = {})
       Commands::SetRSAPass.new.execute(opts)
     end
+    # rubocop:enable Naming/AccessorMethodName
 
+    # rubocop:disable Naming/AccessorMethodName
     def set_ec_pass(opts = {})
       Commands::SetECPass.new.execute(opts)
     end
+    # rubocop:enable Naming/AccessorMethodName
 
     def upgrade(opts = {})
       Commands::Upgrade.new.execute(opts)

data/ruby_easy_rsa.gemspec

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ruby_easy_rsa/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  ruby_easy_rsa.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'ruby_easy_rsa'
+  spec.version = RubyEasyRSA::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary = 'A simple Ruby wrapper for invoking EasyRSA commands.'
+  spec.description = 'Wraps the EasyRSA scripts so that they can be ' \
+                     'invoked from a Ruby script or Rakefile.'
+  spec.homepage = 'https://github.com/infrablocks/ruby_easy_rsa'
+  spec.license = 'MIT'
+
+  spec.files = `git ls-files -z`.split("\x0").select do |f|
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_dependency 'lino', '~> 3.0'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'gem-release'
+  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