ruby_easy_rsa 0.2.0.pre.3 → 0.2.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb46c47e4437ef4b480c9f05bd8a57b76bd1bc45a3e060dc1f59610eee19abc
-  data.tar.gz: aba262ed6b24d62956a5100f841be7bbd605fd592da91505387a7b863afbdce8
+  metadata.gz: dc21e04c539a710e735e6507efc4eb9d86aa577adc8a248b9e000e77aeec8190
+  data.tar.gz: fd64c3138071e15c4e81fb2182301cef27c26e06ddbd407b32f93a9163275ea6
 SHA512:
-  metadata.gz: 0daf5f218ef954bf36b7c314de35f18926dd453ac8562d3833268cb5b45dc6b71a0856631ae39b70eca63d4a2c953b2ce96b17bf4040652780ef93c37fabf9f5
-  data.tar.gz: 114185835783f0b0c3bb624d9ce774a835b1ec3e4a08e41235889dffcff49f334b0e525a4de9fb218506681dfce2f282358f6b2079923443f30ff9c69559eb3e
+  metadata.gz: b8222f95ff7d812a55ce2faf265ebb3524283b8f2868c8fff6ed1008d84236b6c8e717291f1aa3c89881baff8d228d7e4c8aa421956f9e1069e4f1cfa528aa02
+  data.tar.gz: b4e549e70b664312f4a87a1eb1c88dde834611421724ed2c9d2f8ea9699cb1115d582d95dbf4c9e2b470fbd7d088389be23f32b67c55891c7b9000ca59921449

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_easy_rsa (0.2.0.pre.3)
+    ruby_easy_rsa (0.2.0.pre.4)
       lino (= 1.2.0.pre.2)
 
 GEM

data/lib/ruby_easy_rsa/commands/base.rb

@@ -44,6 +44,7 @@ module RubyEasyRSA
       end
 
       def configure_command(builder, opts)
+        builder
       end
 
       def do_after(opts)

data/lib/ruby_easy_rsa/commands/build_ca.rb

@@ -1,55 +1,24 @@
 require 'lino'
+
 require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/ssl_config'
 
 module RubyEasyRSA
   module Commands
     class BuildCA < Base
+      include Mixins::GlobalConfig
+      include Mixins::SSLConfig
+
       def configure_command(builder, opts)
-        pki_directory = opts[:pki_directory]
         algorithm = opts[:algorithm]
-        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]
         batch = opts[:batch]
         encrypt_key = opts[:encrypt_key].nil? ? true : opts[:encrypt_key]
         sub_ca = opts[:sub_ca]
 
-        builder = builder.with_option(
-            '--pki-dir', pki_directory) if pki_directory
-        builder = builder.with_option(
-            '--use-algo', algorithm) if algorithm
-        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 = builder.with_flag(
-            '--batch') if batch
+        builder = super(builder, opts)
+        builder = builder.with_option('--use-algo', algorithm) if algorithm
+        builder = builder.with_flag('--batch') if batch
         builder = builder.with_subcommand('build-ca')
         builder = builder.with_argument('nopass') unless encrypt_key
         builder = builder.with_argument('subca') if sub_ca

data/lib/ruby_easy_rsa/commands/gen_dh.rb

@@ -0,0 +1,20 @@
+require 'lino'
+
+require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/ssl_config'
+
+module RubyEasyRSA
+  module Commands
+    class GenDH < Base
+      include Mixins::GlobalConfig
+      include Mixins::SSLConfig
+
+      def configure_command(builder, opts)
+        builder = super(builder, opts)
+        builder = builder.with_subcommand('gen-dh')
+        builder
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/init_pki.rb

@@ -0,0 +1,19 @@
+require 'lino'
+
+require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/ssl_config'
+
+module RubyEasyRSA
+  module Commands
+    class InitPKI < Base
+      include Mixins::GlobalConfig
+      include Mixins::SSLConfig
+
+      def configure_command(builder, opts)
+        builder = super(builder, opts)
+        builder.with_subcommand('init-pki')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module GlobalConfig
+        def configure_command(builder, opts)
+          openssl_binary = opts[:openssl_binary]
+          ssl_configuration = opts[:ssl_configuration]
+          safe_configuration = opts[:safe_configuration]
+          vars = opts[:vars]
+
+          builder = super(builder, opts)
+          builder = builder.with_environment_variable(
+              'EASYRSA_OPENSSL', openssl_binary) if openssl_binary
+          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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module SSLConfig
+        def configure_command(builder, opts)
+          pki_directory = opts[:pki_directory]
+          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(
+              '--pki-dir', pki_directory) if pki_directory
+          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
+        end
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands.rb

@@ -1,5 +1,6 @@
-require_relative 'commands/initialise_pki'
+require_relative 'commands/init_pki'
 require_relative 'commands/build_ca'
+require_relative 'commands/gen_dh'
 
 module RubyEasyRSA
   module Commands

data/lib/ruby_easy_rsa/version.rb

@@ -1,3 +1,3 @@
 module RubyEasyRSA
-  VERSION = '0.2.0.pre.3'
+  VERSION = '0.2.0.pre.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_easy_rsa
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.3
+  version: 0.2.0.pre.4
 platform: ruby
 authors:
 - Toby Clemson
@@ -159,7 +159,10 @@ files:
 - lib/ruby_easy_rsa/commands.rb
 - lib/ruby_easy_rsa/commands/base.rb
 - lib/ruby_easy_rsa/commands/build_ca.rb
-- lib/ruby_easy_rsa/commands/initialise_pki.rb
+- lib/ruby_easy_rsa/commands/gen_dh.rb
+- lib/ruby_easy_rsa/commands/init_pki.rb
+- lib/ruby_easy_rsa/commands/mixins/global_config.rb
+- lib/ruby_easy_rsa/commands/mixins/ssl_config.rb
 - lib/ruby_easy_rsa/version.rb
 - ruby_easy_rsa.gemspec
 - scripts/ci/common/configure-git.sh

data/lib/ruby_easy_rsa/commands/initialise_pki.rb

@@ -1,15 +0,0 @@
-require 'lino'
-require_relative 'base'
-
-module RubyEasyRSA
-  module Commands
-    class InitialisePKI < Base
-      def configure_command(builder, opts)
-        pki_directory = opts[:pki_directory]
-
-        builder = builder.with_option('--pki-dir', pki_directory) if pki_directory
-        builder.with_subcommand('init-pki')
-      end
-    end
-  end
-end