rollo 0.9.0.pre.1 → 0.9.0.pre.2

data/Rakefile

@@ -1,19 +1,44 @@
 # frozen_string_literal: true
 
-require 'yaml'
 require 'rake_circle_ci'
+require 'rake_git'
+require 'rake_git_crypt'
 require 'rake_github'
-require 'rake_ssh'
 require 'rake_gpg'
-require 'securerandom'
+require 'rake_ssh'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
+require 'securerandom'
+require 'yaml'
 
 task default: %i[
   library:fix
   test:unit
 ]
 
+RakeGitCrypt.define_standard_tasks(
+  namespace: :git_crypt,
+
+  provision_secrets_task_name: :'secrets:provision',
+  destroy_secrets_task_name: :'secrets:destroy',
+
+  install_commit_task_name: :'git:commit',
+  uninstall_commit_task_name: :'git:commit',
+
+  gpg_user_key_paths: %w[
+    config/gpg
+    config/secrets/ci/gpg.public
+  ]
+)
+
+namespace :git do
+  RakeGit.define_commit_task(
+    argument_names: [:message]
+  ) do |t, args|
+    t.message = args.message
+  end
+end
+
 namespace :encryption do
   namespace :directory do
     desc 'Ensure CI secrets directory exists.'
@@ -23,10 +48,12 @@ namespace :encryption do
   end
 
   namespace :passphrase do
-    desc 'Generate encryption passphrase used by CI.'
+    desc 'Generate encryption passphrase for CI GPG key'
     task generate: ['directory:ensure'] do
-      File.write('config/secrets/ci/encryption.passphrase',
-                 SecureRandom.base64(36))
+      File.write(
+        'config/secrets/ci/encryption.passphrase',
+        SecureRandom.base64(36)
+      )
     end
   end
 end
@@ -56,12 +83,33 @@ namespace :keys do
 end
 
 namespace :secrets do
-  desc 'Regenerate all generatable secrets.'
-  task regenerate: %w[
+  namespace :directory do
+    desc 'Ensure secrets directory exists and is set up correctly'
+    task :ensure do
+      FileUtils.mkdir_p('config/secrets')
+      unless File.exist?('config/secrets/.unlocked')
+        File.write('config/secrets/.unlocked', 'true')
+      end
+    end
+  end
+
+  desc 'Generate all generatable secrets.'
+  task generate: %w[
     encryption:passphrase:generate
     keys:deploy:generate
     keys:secrets:generate
   ]
+
+  desc 'Provision all secrets.'
+  task provision: [:generate]
+
+  desc 'Delete all secrets.'
+  task :destroy do
+    rm_rf 'config/secrets'
+  end
+
+  desc 'Rotate all secrets.'
+  task rotate: [:'git_crypt:reinstall']
 end
 
 RuboCop::RakeTask.new
@@ -121,7 +169,6 @@ end
 namespace :pipeline do
   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

data/lib/rollo/commands/main.rb

@@ -2,8 +2,8 @@
 
 require 'thor'
 require_relative '../model'
-require_relative './hosts'
-require_relative './services'
+require_relative 'hosts'
+require_relative 'services'
 
 module Rollo
   module Commands

data/lib/rollo/model/host_cluster.rb

@@ -4,8 +4,8 @@ require 'aws-sdk'
 require 'hollerback'
 require 'wait'
 
-require_relative './scaling_activity'
-require_relative './host'
+require_relative 'scaling_activity'
+require_relative 'host'
 
 module Rollo
   module Model

data/lib/rollo/model/service_cluster.rb

@@ -3,7 +3,7 @@
 require 'aws-sdk'
 require 'hollerback'
 
-require_relative './service'
+require_relative 'service'
 
 module Rollo
   module Model

data/lib/rollo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rollo
-  VERSION = '0.9.0.pre.1'
+  VERSION = '0.9.0.pre.2'
 end

data/rollo.gemspec

@@ -48,6 +48,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'irbtools'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_git'
+  spec.add_development_dependency 'rake_git_crypt'
   spec.add_development_dependency 'rake_github'
   spec.add_development_dependency 'rake_gpg'
   spec.add_development_dependency 'rake_ssh'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollo
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.1
+  version: 0.9.0.pre.2
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -164,6 +164,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake_git
+  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_git_crypt
+  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_github
   requirement: !ruby/object:Gem::Requirement