rake_easy_rsa 0.2.0.pre.6 → 0.2.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153b3fbfb9eab9b775293bf3dae99ac58675bf9c88915414762cfe922589a431
-  data.tar.gz: e9a949741fad979fdd9d7242a155428b8e8ed4cad6514f2dc45ef13495c8846a
+  metadata.gz: 6225462c5d0d9a7db2356bc83257edabacbca65cdea792f9fea245beeb32b5ed
+  data.tar.gz: 30f69545a95dea1a6e43d5c36aa8602f7fdd199c243e352a949a25c1164cf9ef
 SHA512:
-  metadata.gz: 774574eb46d626ba84c19e453b752ef0dff4ecd225d0c01ca168731576ea7dd20bbee49f06bbfef112177996969f1011482d40facbb95054cb5b4a6da323f37e
-  data.tar.gz: f44615e3d93fcb6b5bfad84865977ec9b30f3002bf82491c4f07fd7699dab9212cbaa61793de4da8cf94ee10889e12bf98bfbb1a128116a36fed33c4b8eabe40
+  metadata.gz: cb229126449cda391f8751d9954a07886f8ec22c419fff8f0948b26b12bc83513cb1f2cd0c64a6dce89032622a0b0bf8d1942a2c78a5996f6bdec22fb29f2838
+  data.tar.gz: 85ddc7eddabe67709b9fdcdda0432423b975d24627b5cb0ef1d652a909cedd23cd368f4dd71efc6837a33c1819d6458010c5b55e70a6bad7aa9224905c8d8fc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_easy_rsa (0.2.0.pre.6)
+    rake_easy_rsa (0.2.0.pre.7)
       rake_dependencies (~> 2, < 3)
       rake_factory (>= 0.23, < 1)
       ruby_easy_rsa (= 0.2.0.pre.10)

data/lib/rake_easy_rsa/mixins/algorithm_parameters.rb

@@ -0,0 +1,14 @@
+module RakeEasyRSA
+  module Mixins
+    module AlgorithmParameters
+      def self.included(base)
+        super(base)
+        base.class_eval do
+          parameter :algorithm
+          parameter :curve
+          parameter :ec_directory
+        end
+      end
+    end
+  end
+end

data/lib/rake_easy_rsa/mixins/encrypt_key_parameters.rb

@@ -0,0 +1,12 @@
+module RakeEasyRSA
+  module Mixins
+    module EncryptKeyParameters
+      def self.included(base)
+        super(base)
+        base.class_eval do
+          parameter :encrypt_key, default: false
+        end
+      end
+    end
+  end
+end

data/lib/rake_easy_rsa/mixins/global_parameters.rb

@@ -0,0 +1,20 @@
+module RakeEasyRSA
+  module Mixins
+    module GlobalParameters
+      def self.included(base)
+        super(base)
+        base.class_eval do
+          parameter :directory
+          parameter :extensions_directory
+          parameter :openssl_binary
+          parameter :ssl_configuration
+          parameter :safe_configuration
+          parameter :vars
+          parameter :batch, default: true
+          parameter :input_password
+          parameter :output_password
+        end
+      end
+    end
+  end
+end

data/lib/rake_easy_rsa/mixins/ssl_parameters.rb

@@ -0,0 +1,21 @@
+module RakeEasyRSA
+  module Mixins
+    module SSLParameters
+      def self.included(base)
+        super(base)
+        base.class_eval do
+          parameter :expires_in_days
+          parameter :digest
+          parameter :distinguished_name_mode
+          parameter :common_name
+          parameter :country
+          parameter :province
+          parameter :city
+          parameter :organisation
+          parameter :organisational_unit
+          parameter :email
+        end
+      end
+    end
+  end
+end

data/lib/rake_easy_rsa/task_sets/pki.rb

@@ -0,0 +1,126 @@
+require 'rake_factory'
+
+require_relative '../tasks'
+require_relative '../mixins/global_parameters'
+require_relative '../mixins/ssl_parameters'
+require_relative '../mixins/algorithm_parameters'
+require_relative '../mixins/encrypt_key_parameters'
+
+module RakeEasyRSA
+  module TaskSets
+    class PKI < RakeFactory::TaskSet
+      prepend RakeFactory::Namespaceable
+
+      include Mixins::GlobalParameters
+      include Mixins::SSLParameters
+      include Mixins::AlgorithmParameters
+      include Mixins::EncryptKeyParameters
+
+      parameter :initialise_task_name, default: :initialise
+      parameter :generate_task_name, default: :generate
+
+      parameter :ca_namespace, default: :ca
+      parameter :ca_create_task_name, default: :create
+
+      parameter :crl_namespace, default: :crl
+      parameter :crl_generate_task_name, default: :generate
+
+      parameter :dh_namespace, default: :dh
+      parameter :dh_generate_task_name, default: :generate
+
+      parameter :client_namespace, default: :client
+      parameter :client_create_task_name, default: :create
+
+      parameter :server_namespace, default: :server
+      parameter :server_create_task_name, default: :create
+
+      parameter :certificate_namespace, default: :certificate
+      parameter :certificate_revoke_task_name, default: :revoke
+      parameter :certificate_renew_task_name, default: :renew
+
+      task Tasks::Initialise,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.initialise_task_name
+          }
+      task Tasks::Generate,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.generate_task_name
+          },
+          initialise_task_name: RakeFactory::DynamicValue.new { |ts|
+            ts.initialise_task_name
+          },
+          ca_create_task_name: RakeFactory::DynamicValue.new { |ts|
+            "#{ts.ca_namespace}:#{ts.ca_create_task_name}".to_sym
+          },
+          crl_generate_task_name: RakeFactory::DynamicValue.new { |ts|
+            "#{ts.crl_namespace}:#{ts.crl_generate_task_name}".to_sym
+          },
+          dh_generate_task_name: RakeFactory::DynamicValue.new { |ts|
+            "#{ts.dh_namespace}:#{ts.dh_generate_task_name}".to_sym
+          }
+      task Tasks::CA::Create,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.ca_create_task_name
+          }
+      task Tasks::CRL::Generate,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.crl_generate_task_name
+          }
+      task Tasks::DH::Generate,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.dh_generate_task_name
+          }
+      task Tasks::Client::Create,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.client_create_task_name
+          }
+      task Tasks::Server::Create,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.server_create_task_name
+          }
+      task Tasks::Certificate::Revoke,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.certificate_revoke_task_name
+          }
+      task Tasks::Certificate::Renew,
+          name: RakeFactory::DynamicValue.new { |ts|
+            ts.certificate_renew_task_name
+          }
+
+      def define_on(application)
+        around_define(application) do
+          self.class.tasks.each do |task_definition|
+            ns = case task_definition.klass.to_s
+            when /CA/
+              ca_namespace
+            when /CRL/
+              crl_namespace
+            when /DH/
+              dh_namespace
+            when /Client/
+              client_namespace
+            when /Server/
+              server_namespace
+            when /Certificate/
+              certificate_namespace
+            else
+              nil
+            end
+
+            if ns
+              application.in_namespace(ns) do
+                task_definition
+                    .for_task_set(self)
+                    .define_on(application)
+              end
+            else
+              task_definition
+                  .for_task_set(self)
+                  .define_on(application)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rake_easy_rsa/task_sets.rb

@@ -0,0 +1 @@
+require_relative 'task_sets/pki'

data/lib/rake_easy_rsa/tasks/ca/create.rb

@@ -1,9 +1,10 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
-require_relative '../mixins/algorithm_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
+require_relative '../../mixins/algorithm_parameters'
+require_relative '../../mixins/encrypt_key_parameters'
 
 module RakeEasyRSA
   module Tasks
@@ -12,6 +13,7 @@ module RakeEasyRSA
         include Mixins::GlobalParameters
         include Mixins::SSLParameters
         include Mixins::AlgorithmParameters
+        include Mixins::EncryptKeyParameters
 
         default_name :create
         default_description "Create the CA certificate for the PKI"

data/lib/rake_easy_rsa/tasks/certificate/renew.rb

@@ -1,8 +1,9 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
+require_relative '../../mixins/encrypt_key_parameters'
 
 module RakeEasyRSA
   module Tasks
@@ -10,6 +11,7 @@ module RakeEasyRSA
       class Renew < RakeFactory::Task
         include Mixins::GlobalParameters
         include Mixins::SSLParameters
+        include Mixins::EncryptKeyParameters
 
         default_name :renew
         default_argument_names [:filename_base]

data/lib/rake_easy_rsa/tasks/certificate/revoke.rb

@@ -1,8 +1,8 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
 
 module RakeEasyRSA
   module Tasks

data/lib/rake_easy_rsa/tasks/client/create.rb

@@ -1,9 +1,10 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
-require_relative '../mixins/algorithm_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
+require_relative '../../mixins/algorithm_parameters'
+require_relative '../../mixins/encrypt_key_parameters'
 
 module RakeEasyRSA
   module Tasks
@@ -12,6 +13,7 @@ module RakeEasyRSA
         include Mixins::GlobalParameters
         include Mixins::SSLParameters
         include Mixins::AlgorithmParameters
+        include Mixins::EncryptKeyParameters
 
         default_name :create
         default_argument_names [:filename_base]

data/lib/rake_easy_rsa/tasks/crl/generate.rb

@@ -1,8 +1,8 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
 
 module RakeEasyRSA
   module Tasks

data/lib/rake_easy_rsa/tasks/dh/generate.rb

@@ -1,8 +1,8 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
 
 module RakeEasyRSA
   module Tasks

data/lib/rake_easy_rsa/tasks/initialise.rb

@@ -1,8 +1,8 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative 'mixins/global_parameters'
-require_relative 'mixins/ssl_parameters'
+require_relative '../mixins/global_parameters'
+require_relative '../mixins/ssl_parameters'
 
 module RakeEasyRSA
   module Tasks

data/lib/rake_easy_rsa/tasks/server/create.rb

@@ -1,9 +1,10 @@
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
-require_relative '../mixins/global_parameters'
-require_relative '../mixins/ssl_parameters'
-require_relative '../mixins/algorithm_parameters'
+require_relative '../../mixins/global_parameters'
+require_relative '../../mixins/ssl_parameters'
+require_relative '../../mixins/algorithm_parameters'
+require_relative '../../mixins/encrypt_key_parameters'
 
 module RakeEasyRSA
   module Tasks
@@ -12,6 +13,7 @@ module RakeEasyRSA
         include Mixins::GlobalParameters
         include Mixins::SSLParameters
         include Mixins::AlgorithmParameters
+        include Mixins::EncryptKeyParameters
 
         default_name :create
         default_argument_names [:filename_base]

data/lib/rake_easy_rsa/version.rb

@@ -1,3 +1,3 @@
 module RakeEasyRSA
-  VERSION = '0.2.0.pre.6'
+  VERSION = '0.2.0.pre.7'
 end

data/lib/rake_easy_rsa.rb

@@ -2,6 +2,7 @@ require 'rake_dependencies'
 require 'ruby_easy_rsa'
 require 'rake_easy_rsa/version'
 require 'rake_easy_rsa/tasks'
+require 'rake_easy_rsa/task_sets'
 
 module RakeEasyRSA
   def self.define_installation_tasks(opts = {})
@@ -36,4 +37,8 @@ module RakeEasyRSA
 
     RakeDependencies::TaskSets::All.define(task_set_opts)
   end
-end
+
+  def self.define_pki_tasks(opts = {}, &block)
+    RakeEasyRSA::TaskSets::PKI.define(opts, &block)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_easy_rsa
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.6
+  version: 0.2.0.pre.7
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -254,6 +254,12 @@ files:
 - config/secrets/rubygems/credentials
 - go
 - lib/rake_easy_rsa.rb
+- lib/rake_easy_rsa/mixins/algorithm_parameters.rb
+- lib/rake_easy_rsa/mixins/encrypt_key_parameters.rb
+- lib/rake_easy_rsa/mixins/global_parameters.rb
+- lib/rake_easy_rsa/mixins/ssl_parameters.rb
+- lib/rake_easy_rsa/task_sets.rb
+- lib/rake_easy_rsa/task_sets/pki.rb
 - lib/rake_easy_rsa/tasks.rb
 - lib/rake_easy_rsa/tasks/ca.rb
 - lib/rake_easy_rsa/tasks/ca/create.rb
@@ -268,9 +274,6 @@ files:
 - lib/rake_easy_rsa/tasks/dh/generate.rb
 - lib/rake_easy_rsa/tasks/generate.rb
 - lib/rake_easy_rsa/tasks/initialise.rb
-- lib/rake_easy_rsa/tasks/mixins/algorithm_parameters.rb
-- lib/rake_easy_rsa/tasks/mixins/global_parameters.rb
-- lib/rake_easy_rsa/tasks/mixins/ssl_parameters.rb
 - lib/rake_easy_rsa/tasks/server.rb
 - lib/rake_easy_rsa/tasks/server/create.rb
 - lib/rake_easy_rsa/version.rb

data/lib/rake_easy_rsa/tasks/mixins/algorithm_parameters.rb

@@ -1,16 +0,0 @@
-module RakeEasyRSA
-  module Tasks
-    module Mixins
-      module AlgorithmParameters
-        def self.included(base)
-          super(base)
-          base.class_eval do
-            parameter :algorithm
-            parameter :curve
-            parameter :ec_directory
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rake_easy_rsa/tasks/mixins/global_parameters.rb

@@ -1,22 +0,0 @@
-module RakeEasyRSA
-  module Tasks
-    module Mixins
-      module GlobalParameters
-        def self.included(base)
-          super(base)
-          base.class_eval do
-            parameter :directory
-            parameter :extensions_directory
-            parameter :openssl_binary
-            parameter :ssl_configuration
-            parameter :safe_configuration
-            parameter :vars
-            parameter :batch, default: true
-            parameter :input_password
-            parameter :output_password
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rake_easy_rsa/tasks/mixins/ssl_parameters.rb

@@ -1,23 +0,0 @@
-module RakeEasyRSA
-  module Tasks
-    module Mixins
-      module SSLParameters
-        def self.included(base)
-          super(base)
-          base.class_eval do
-            parameter :expires_in_days
-            parameter :digest
-            parameter :distinguished_name_mode
-            parameter :common_name
-            parameter :country
-            parameter :province
-            parameter :city
-            parameter :organisation
-            parameter :organisational_unit
-            parameter :email
-          end
-        end
-      end
-    end
-  end
-end