rake_easy_rsa 0.12.0.pre.1 → 0.12.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fc9d2c9c47bbd820b00f196e1385398a0bab066f77ff376bb4f7f289d229d1
-  data.tar.gz: cf30ebcc14bde0fa3908802f85f2e064074d2159fe2f448d8ab76e8dd0bc6592
+  metadata.gz: 9763f394954b34abfd9ed44b6b776855071e36cd62961b293868644182c800b7
+  data.tar.gz: 1b5d7a84b02defd5aa6d7314823166687def68a68ffa7efd4c0e9ea8db81b8aa
 SHA512:
-  metadata.gz: 5bb7e94d780a8ffc6f1af6c2556243f408ed38f75ce48369823c6c22997da7bd805f84aedf6fa3ec9b499184241ff553b529c0667c231e10966b01c06c18d306
-  data.tar.gz: 9ba10d75414f33399b69bc982fcdf1dfbc5e172f446247a1aff9375eb56ac8b21614d0a7f5bab0abc9bfdaaf8cb852a048f6d77151dc9ae94b824122a87be3b7
+  metadata.gz: 49badc6d60381ff091da95f44d95cdbe2b01aa01f3242779e8e54d608fbd2f3743252f11469c48f3e96d963b6d7c374ac6aba23ca2d9e1ae2ff49bb5cdbb93d1
+  data.tar.gz: de2a4199d67c7c0dfc4b5dd3cd27d0e1920db22677de6742ac798d3c72b41f29680de535ac4e91b819eb21fcdd096a1fccf03fde24b70e38d3ca12698d22c91f

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rake_fly.gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_easy_rsa (0.12.0.pre.1)
+    rake_easy_rsa (0.12.0.pre.2)
       rake_dependencies (~> 3.1)
       rake_factory (~> 0.23)
       ruby_easy_rsa (~> 0.7)
@@ -17,11 +17,12 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    excon (0.92.0)
+    excon (0.92.2)
     fakefs (1.4.1)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
@@ -61,7 +62,11 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
+    parallel (1.22.1)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
+    rainbow (3.1.1)
     rake (13.0.6)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
@@ -88,6 +93,8 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -97,10 +104,26 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    rubocop (1.26.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_easy_rsa (0.9.0)
       lino (>= 1.5)
@@ -120,6 +143,7 @@ GEM
     sshkey (2.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -136,7 +160,10 @@ DEPENDENCIES
   rake_gpg
   rake_ssh
   rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   simplecov
 
 BUNDLED WITH
-   2.3.9
+   2.3.10

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -5,17 +7,20 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
-      File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
-        f.write(SecureRandom.base64(36))
-      end
+      FileUtils.mkdir_p('config/secrets/ci/')
+      File.write('config/secrets/ci/encryption.passphrase',
+                 SecureRandom.base64(36))
     end
   end
 end
@@ -23,85 +28,102 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'rake_easy_rsa CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'rake_easy_rsa CI Key'
+    )
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/rake_easy_rsa'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/rake_easy_rsa'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/rake_easy_rsa',
+  namespace: :github,
+  repository: 'infrablocks/rake_easy_rsa'
 ) do |t, args|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      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
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --version #{version_type} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "rake_easyrsa"
+require 'bundler/setup'
+require 'rake_easyrsa'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "rake_easyrsa"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rake_easy_rsa/mixins/algorithm_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeEasyRSA
   module Mixins
     module AlgorithmParameters

data/lib/rake_easy_rsa/mixins/easy_rsa_ensure_prerequisite.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 module RakeEasyRSA
@@ -7,11 +9,11 @@ module RakeEasyRSA
         super(base)
         base.class_eval do
           parameter :ensure_task_name, default: :'easy_rsa:ensure'
-          default_prerequisites RakeFactory::DynamicValue.new { |t|
+          default_prerequisites(RakeFactory::DynamicValue.new do |t|
             [t.ensure_task_name]
-          }
+          end)
         end
       end
     end
   end
-end
+end

data/lib/rake_easy_rsa/mixins/encrypt_key_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeEasyRSA
   module Mixins
     module EncryptKeyParameters
@@ -9,4 +11,4 @@ module RakeEasyRSA
       end
     end
   end
-end
+end

data/lib/rake_easy_rsa/mixins/gitkeep_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RakeEasyRSA
   module Mixins
     module GitkeepParameters
@@ -9,4 +11,4 @@ module RakeEasyRSA
       end
     end
   end
-end
+end

data/lib/rake_easy_rsa/mixins/global_parameters.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module RakeEasyRSA
   module Mixins
     module GlobalParameters
+      # rubocop:disable Metrics/MethodLength
       def self.included(base)
         super(base)
         base.class_eval do
@@ -15,6 +18,7 @@ module RakeEasyRSA
           parameter :output_password
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
-end
+end

data/lib/rake_easy_rsa/mixins/ssl_parameters.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module RakeEasyRSA
   module Mixins
     module SSLParameters
+      # rubocop:disable Metrics/MethodLength
       def self.included(base)
         super(base)
         base.class_eval do
@@ -16,6 +19,7 @@ module RakeEasyRSA
           parameter :email
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/rake_easy_rsa/task_sets/pki.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 
 require_relative '../tasks'
@@ -8,6 +10,7 @@ require_relative '../mixins/encrypt_key_parameters'
 
 module RakeEasyRSA
   module TaskSets
+    # rubocop:disable Metrics/ClassLength
     class PKI < RakeFactory::TaskSet
       prepend RakeFactory::Namespaceable
 
@@ -41,88 +44,93 @@ module RakeEasyRSA
       parameter :certificate_renew_task_name, default: :renew
 
       task Tasks::Initialise,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.initialise_task_name
-          }
+           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
-          }
+           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
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.ca_create_task_name
+           }
       task Tasks::CRL::Generate,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.crl_generate_task_name
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.crl_generate_task_name
+           }
       task Tasks::DH::Generate,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.dh_generate_task_name
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.dh_generate_task_name
+           }
       task Tasks::Client::Create,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.client_create_task_name
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.client_create_task_name
+           }
       task Tasks::Server::Create,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.server_create_task_name
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.server_create_task_name
+           }
       task Tasks::Certificate::Revoke,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.certificate_revoke_task_name
-          }
+           name: RakeFactory::DynamicValue.new { |ts|
+             ts.certificate_revoke_task_name
+           }
       task Tasks::Certificate::Renew,
-          name: RakeFactory::DynamicValue.new { |ts|
-            ts.certificate_renew_task_name
-          }
+           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
+            namespace = resolve_namespace(task_definition)
 
-            if ns
-              application.in_namespace(ns) do
-                task_definition
-                    .for_task_set(self)
-                    .define_on(application)
-              end
+            if namespace
+              define_in_namespace(namespace, application, task_definition)
             else
-              task_definition
-                  .for_task_set(self)
-                  .define_on(application)
+              define_at_current_level(application, task_definition)
             end
           end
         end
       end
+
+      private
+
+      def define_in_namespace(namespace, application, task_definition)
+        application.in_namespace(namespace) do
+          define_at_current_level(application, task_definition)
+        end
+      end
+
+      def resolve_namespace(task_definition)
+        case task_definition.klass.to_s
+        when /CA/ then ca_namespace
+        when /CRL/ then crl_namespace
+        when /DH/ then dh_namespace
+        when /Client/ then client_namespace
+        when /Server/ then server_namespace
+        when /Certificate/ then certificate_namespace
+        end
+      end
+
+      def define_at_current_level(application, task_definition)
+        task_definition
+          .for_task_set(self)
+          .define_on(application)
+      end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rake_easy_rsa/task_sets.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'task_sets/pki'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -20,28 +22,24 @@ module RakeEasyRSA
         include Mixins::EasyRSAEnsurePrerequisite
 
         default_name :create
-        default_description "Create the CA certificate for the PKI"
+        default_description 'Create the CA certificate for the PKI'
 
         action do |t|
-          puts "Creating CA certificate... "
+          puts 'Creating CA certificate... '
           RubyEasyRSA.build_ca(t.parameter_values)
           if t.include_gitkeep_files
-            [
-                'certs_by_serial/.gitkeep',
-                'issued/.gitkeep',
-                'renewed/certs_by_serial/.gitkeep',
-                'renewed/private_by_serial/.gitkeep',
-                'renewed/reqs_by_serial/.gitkeep',
-                'revoked/certs_by_serial/.gitkeep',
-                'revoked/private_by_serial/.gitkeep',
-                'revoked/reqs_by_serial/.gitkeep'
-            ].each do |gitkeep_file|
-              File.open("#{t.pki_directory}/#{gitkeep_file}", 'w') do |f|
-                f.write('')
-              end
+            %w[certs_by_serial/.gitkeep
+               issued/.gitkeep
+               renewed/certs_by_serial/.gitkeep
+               renewed/private_by_serial/.gitkeep
+               renewed/reqs_by_serial/.gitkeep
+               revoked/certs_by_serial/.gitkeep
+               revoked/private_by_serial/.gitkeep
+               revoked/reqs_by_serial/.gitkeep].each do |gitkeep_file|
+              File.write("#{t.pki_directory}/#{gitkeep_file}", '')
             end
           end
-          puts "Done."
+          puts 'Done.'
         end
       end
     end

data/lib/rake_easy_rsa/tasks/ca.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'ca/create'
 
 module RakeEasyRSA
   module Tasks
     module CA
-
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -18,7 +20,7 @@ module RakeEasyRSA
         parameter :default_argument_names, default: [:filename_base]
 
         default_name :renew
-        default_description "Renew a certificate of the PKI"
+        default_description 'Renew a certificate of the PKI'
 
         def argument_names
           @argument_names + default_argument_names
@@ -28,8 +30,10 @@ module RakeEasyRSA
           puts "Renewing certificate '#{args.filename_base}'... "
           RubyEasyRSA.renew(
             t.parameter_values.merge(
-              filename_base: args.filename_base))
-          puts "Done."
+              filename_base: args.filename_base
+            )
+          )
+          puts 'Done.'
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -14,7 +16,7 @@ module RakeEasyRSA
         include Mixins::EasyRSAEnsurePrerequisite
 
         parameter(:default_argument_names,
-                  default: [:filename_base, :reason])
+                  default: %i[filename_base reason])
 
         default_name :revoke
         default_description 'Revoke a certificate of the PKI'
@@ -31,7 +33,9 @@ module RakeEasyRSA
           RubyEasyRSA.revoke(
             t.parameter_values.merge(
               reason: reason,
-              filename_base: args.filename_base))
+              filename_base: args.filename_base
+            )
+          )
           puts 'Done.'
         end
       end

data/lib/rake_easy_rsa/tasks/certificate.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require_relative 'certificate/revoke'
 require_relative 'certificate/renew'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -20,7 +22,7 @@ module RakeEasyRSA
         parameter :default_argument_names, default: [:filename_base]
 
         default_name :create
-        default_description "Create a client certificate for the PKI"
+        default_description 'Create a client certificate for the PKI'
 
         def argument_names
           @argument_names + default_argument_names
@@ -30,8 +32,10 @@ module RakeEasyRSA
           puts "Creating client certificate '#{args.filename_base}'... "
           RubyEasyRSA.build_client_full(
             t.parameter_values.merge(
-              filename_base: args.filename_base))
-          puts "Done."
+              filename_base: args.filename_base
+            )
+          )
+          puts 'Done.'
         end
       end
     end

data/lib/rake_easy_rsa/tasks/client.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'client/create'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -15,12 +17,13 @@ module RakeEasyRSA
 
         default_name :generate
         default_description(
-            "Generate the certificate revocation list for the PKI")
+          'Generate the certificate revocation list for the PKI'
+        )
 
         action do |t|
-          puts "Generating CRL... "
+          puts 'Generating CRL... '
           RubyEasyRSA.gen_crl(t.parameter_values)
-          puts "Done."
+          puts 'Done.'
         end
       end
     end

data/lib/rake_easy_rsa/tasks/crl.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'crl/generate'
 
 module RakeEasyRSA
   module Tasks
     module CRL
-
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -15,12 +17,13 @@ module RakeEasyRSA
 
         default_name :generate
         default_description(
-            "Generate Diffie-Hellman parameters for the PKI")
+          'Generate Diffie-Hellman parameters for the PKI'
+        )
 
         action do |t|
-          puts "Generating Diffie-Hellman parameters... "
+          puts 'Generating Diffie-Hellman parameters... '
           RubyEasyRSA.gen_dh(t.parameter_values)
-          puts "Done."
+          puts 'Done.'
         end
       end
     end

data/lib/rake_easy_rsa/tasks/dh.rb

@@ -1,2 +1,3 @@
-require_relative 'dh/generate'
+# frozen_string_literal: true
 
+require_relative 'dh/generate'

data/lib/rake_easy_rsa/tasks/generate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -5,7 +7,7 @@ module RakeEasyRSA
   module Tasks
     class Generate < RakeFactory::Task
       default_name :generate
-      default_description "Generate all pre-requisites for managing the PKI"
+      default_description 'Generate all pre-requisites for managing the PKI'
 
       parameter :initialise_task_name, default: 'initialise'
       parameter :ca_create_task_name, default: 'ca:create'
@@ -13,12 +15,12 @@ module RakeEasyRSA
       parameter :dh_generate_task_name, default: 'dh:generate'
 
       action do |t, args|
-        puts "Generating PKI pre-requisites... "
+        puts 'Generating PKI pre-requisites... '
         t.application[t.initialise_task_name, t.scope].invoke(*args)
         t.application[t.ca_create_task_name, t.scope].invoke(*args)
         t.application[t.crl_generate_task_name, t.scope].invoke(*args)
         t.application[t.dh_generate_task_name, t.scope].invoke(*args)
-        puts "Done."
+        puts 'Done.'
       end
     end
   end

data/lib/rake_easy_rsa/tasks/initialise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -15,20 +17,16 @@ module RakeEasyRSA
       include Mixins::EasyRSAEnsurePrerequisite
 
       default_name :initialise
-      default_description "Initialise the PKI working directory"
+      default_description 'Initialise the PKI working directory'
 
       action do |t|
-        puts "Initialising PKI working directory... "
+        puts 'Initialising PKI working directory... '
         RubyEasyRSA.init_pki(t.parameter_values)
         if t.include_gitkeep_files
-          File.open("#{t.pki_directory}/private/.gitkeep", 'w') do |f|
-            f.write('')
-          end
-          File.open("#{t.pki_directory}/reqs/.gitkeep", 'w') do |f|
-            f.write('')
-          end
+          File.write("#{t.pki_directory}/private/.gitkeep", '')
+          File.write("#{t.pki_directory}/reqs/.gitkeep", '')
         end
-        puts "Done."
+        puts 'Done.'
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_factory'
 require 'ruby_easy_rsa'
 
@@ -18,9 +20,10 @@ module RakeEasyRSA
         include Mixins::EasyRSAEnsurePrerequisite
 
         parameter :default_argument_names, default: [:filename_base]
+        parameter :vegetable
 
         default_name :create
-        default_description "Create a server certificate for the PKI"
+        default_description 'Create a server certificate for the PKI'
 
         def argument_names
           @argument_names + default_argument_names
@@ -29,9 +32,11 @@ module RakeEasyRSA
         action do |t, args|
           puts "Creating server certificate '#{args.filename_base}'... "
           RubyEasyRSA.build_server_full(
-              t.parameter_values.merge(
-                  filename_base: args.filename_base))
-          puts "Done."
+            t.parameter_values.merge(
+              filename_base: args.filename_base
+            )
+          )
+          puts 'Done.'
         end
       end
     end

data/lib/rake_easy_rsa/tasks/server.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'server/create'

data/lib/rake_easy_rsa/tasks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'tasks/initialise'
 require_relative 'tasks/generate'
 require_relative 'tasks/ca'
@@ -9,6 +11,5 @@ require_relative 'tasks/certificate'
 
 module RakeEasyRSA
   module Tasks
-
   end
-end
+end

data/lib/rake_easy_rsa/version.rb

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

data/lib/rake_easy_rsa.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake_dependencies'
 require 'ruby_easy_rsa'
 require 'rake_easy_rsa/version'
@@ -6,39 +8,77 @@ require 'rake_easy_rsa/task_sets'
 
 module RakeEasyRSA
   def self.define_installation_tasks(opts = {})
-    namespace = opts[:namespace] || :easy_rsa
-    version = opts[:version] || '3.0.7'
-    path = opts[:path] || File.join('vendor', 'easy-rsa')
-    type = :tgz
-    binary_directory = ''
-    uri_template = 'https://github.com/OpenVPN/easy-rsa/releases/' +
-        'download/v<%= @version %>/' +
-        'EasyRSA-<%= @version %>.tgz'
-    file_name_template = 'EasyRSA-<%= @version %>.tgz'
-    strip_path_template = 'EasyRSA-<%= @version %>'
-
-    task_set_opts = {
-        namespace: namespace,
-        dependency: 'easy-rsa',
-        version: version,
-        path: path,
-        type: type,
-        binary_directory: binary_directory,
-        uri_template: uri_template,
-        file_name_template: file_name_template,
-        strip_path_template: strip_path_template,
-        needs_fetch: lambda { |t|
-          !File.exist?(File.join(t.path, 'easyrsa'))
-        }}
-
     RubyEasyRSA.configure do |c|
-      c.binary = File.join(path, 'easyrsa')
+      c.binary = File.join(path(opts), 'easyrsa')
     end
 
-    RakeDependencies::TaskSets::All.define(task_set_opts)
+    RakeDependencies::TaskSets::All.define(
+      installation_task_set_opts(opts)
+    )
   end
 
   def self.define_pki_tasks(opts = {}, &block)
     RakeEasyRSA::TaskSets::PKI.define(opts, &block)
   end
+
+  class << self
+    private
+
+    def installation_task_set_opts(opts)
+      { namespace: namespace(opts),
+        dependency: dependency(opts),
+        version: version(opts),
+        path: path(opts),
+        type: type(opts),
+        binary_directory: binary_directory(opts),
+        uri_template: uri_template(opts),
+        file_name_template: file_name_template(opts),
+        strip_path_template: strip_path_template(opts),
+        needs_fetch: needs_fetch_check_lambda(opts) }
+    end
+
+    def namespace(opts)
+      opts[:namespace] || :easy_rsa
+    end
+
+    def dependency(_)
+      'easy-rsa'
+    end
+
+    def version(opts)
+      opts[:version] || '3.0.7'
+    end
+
+    def path(opts)
+      opts[:path] || File.join('vendor', 'easy-rsa')
+    end
+
+    def type(_)
+      :tgz
+    end
+
+    def uri_template(_)
+      'https://github.com/OpenVPN/easy-rsa/releases/'\
+        'download/v<%= @version %>/'\
+        'EasyRSA-<%= @version %>.tgz'
+    end
+
+    def binary_directory(_)
+      ''
+    end
+
+    def file_name_template(_)
+      'EasyRSA-<%= @version %>.tgz'
+    end
+
+    def strip_path_template(_)
+      'EasyRSA-<%= @version %>'
+    end
+
+    def needs_fetch_check_lambda(_)
+      lambda { |t|
+        !File.exist?(File.join(t.path, 'easyrsa'))
+      }
+    end
+  end
 end

data/rake_easy_rsa.gemspec

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rake_easy_rsa/version'
+
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  rake_easy_rsa.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
+Gem::Specification.new do |spec|
+  spec.name = 'rake_easy_rsa'
+  spec.version = RakeEasyRSA::VERSION
+  spec.authors = ['InfraBlocks Maintainers']
+  spec.email = ['maintainers@infrablocks.io']
+
+  spec.summary = 'Rake tasks for managing PKI using EasyRSA.'
+  spec.description = 'Rake tasks for common PKI management tasks using EasyRSA.'
+  spec.homepage = 'https://github.com/infrablocks/rake_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 'rake_dependencies', '~> 3.1'
+  spec.add_dependency 'rake_factory', '~> 0.23'
+  spec.add_dependency 'ruby_easy_rsa', '~> 0.7'
+  spec.add_dependency 'semantic', '~> 1.6'
+
+  spec.add_development_dependency 'activesupport'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'fakefs'
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_easy_rsa
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.1
+  version: 0.12.0.pre.2
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.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
@@ -80,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -261,10 +303,12 @@ files:
 - lib/rake_easy_rsa/tasks/server.rb
 - lib/rake_easy_rsa/tasks/server/create.rb
 - lib/rake_easy_rsa/version.rb
+- rake_easy_rsa.gemspec
 homepage: https://github.com/infrablocks/rake_easy_rsa
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths: