confidante 0.19.0 → 0.20.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b19cf96d8f10d56f7566b74aa86124963e714d7a2a6fdd735da02adb43296482
-  data.tar.gz: 76bf1f87c7801cc6a48b09c37aa7608f506bb1276464d9a3da34b34a09e2a624
+  metadata.gz: 7af2b059b1cae0d27226b2665d62017846a1ec3b72b80f6af197780148e90afe
+  data.tar.gz: 6e72100295dd2d3f5d5bbaa3d0e510030a6dd0e39a0abb2160872333f44083db
 SHA512:
-  metadata.gz: 8c68642da4f9f8c62bbb2fc1a3bd592227102df71f31965f78ca0bf8cfa393759289412acd67cde13e07a32dce4c9242c548674166813c6679fdad0703f0e2bc
-  data.tar.gz: 32163872bebf940f23f84e11cbade67a6d6a2e4e8c71e8cba7b5e49bf560dab652b56d0cee94e341d0e814bf100993d82ce8f032776b311c1a123d286cbf301a
+  metadata.gz: 2469799247a8b1804b22d90b2bcdd3f5ca2f81e8b6600cc20192fb2567fcdf7c6faac68aeeffe57f3462d3b3de34dae8abac2ed73a44c3a7d6b32dda81f988b2
+  data.tar.gz: 375c95064ce7fcbe5bb1181f7c2e82d4c6dc5d9ff200c28e4f39ff619614705e0c3f9367a0a90030ca86c2af9c333bdb22454058a14d7929035290ad9db9b35a

data/.circleci/config.yml

@@ -1,16 +1,16 @@
-version: 2
+version: 2.1
 jobs:
   test:
     working_directory: ~/confidante
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/steps/test.sh
   prerelease:
     working_directory: ~/confidante
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh
@@ -21,7 +21,7 @@ jobs:
   release:
     working_directory: ~/confidante
     docker:
-    - image: ruby:2.4.7
+    - image: ruby:2.6.0
     steps:
     - checkout
     - run: ./scripts/ci/common/install-git-crypt.sh

data/.gitignore

@@ -11,6 +11,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+.rakeTasks
 
 ## Documentation cache and generated files:
 /.yardoc/

data/.ruby-version

@@ -1 +1 @@
-2.4.7
+2.6.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confidante (0.19.0)
+    confidante (0.20.0.pre.1)
       activesupport (>= 4)
       hiera (~> 3.3, >= 3.3.1)
       shikashi (~> 0.6)
@@ -9,51 +9,85 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.5)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     evalhook (0.6.0)
       partialruby (~> 0.3)
       sexp_processor (~> 4.0)
-    gem-release (2.0.4)
+    excon (0.72.0)
+    faraday (1.0.0)
+      multipart-post (>= 1.2, < 3)
+    gem-release (2.1.1)
     getsource (0.2.2)
     hiera (3.6.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     minitest (5.14.0)
+    multipart-post (2.1.1)
+    octokit (4.17.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     partialruby (0.3.0)
       ruby2ruby (~> 2)
       ruby_parser (~> 3)
-    rake (13.0.0)
+    public_suffix (4.0.3)
+    rake (13.0.1)
+    rake_circle_ci (0.3.0)
+      colored2 (~> 3.1)
+      excon (~> 0.72)
+      rake_factory (~> 0.23)
+      sshkey (~> 2.0)
+    rake_factory (0.25.0)
+      activesupport (>= 4)
+      rake (~> 13.0)
+    rake_github (0.3.0)
+      colored2 (~> 3.1)
+      octokit (~> 4.16)
+      rake_factory (~> 0.23)
+      sshkey (~> 2.0)
+    rake_ssh (0.2.0)
+      colored2 (~> 3.1)
+      rake_factory (~> 0.23)
+      sshkey (~> 2.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     ruby2ruby (2.4.4)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.14.1)
+    ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
-    sexp_processor (4.13.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    sexp_processor (4.14.1)
     shikashi (0.6.0)
       evalhook (>= 0.6.0)
       getsource (>= 0.1.0)
+    sshkey (2.0.0)
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -63,6 +97,9 @@ DEPENDENCIES
   confidante!
   gem-release (~> 2.0)
   rake (~> 13.0)
+  rake_circle_ci (~> 0.3)
+  rake_github (~> 0.3)
+  rake_ssh (~> 0.2)
   rspec (~> 3.9)
 
 BUNDLED WITH

data/Rakefile

@@ -1,11 +1,66 @@
+require 'yaml'
+require 'rake_circle_ci'
+require 'rake_github'
+require 'rake_ssh'
 require 'rspec/core/rake_task'
 
+task :default => :spec
+
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RakeSSH.define_key_tasks(
+    namespace: :deploy_key,
+    path: 'config/secrets/ci/',
+    comment: 'maintainers@infrablocks.io'
+)
+
+RakeCircleCI.define_project_tasks(
+    namespace: :circle_ci,
+    project_slug: 'github/infrablocks/confidante'
+) do |t|
+  circle_ci_config =
+      YAML.load_file('config/secrets/circle_ci/config.yaml')
+
+  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.environment_variables = {
+      ENCRYPTION_PASSPHRASE:
+          File.read('config/secrets/ci/encryption.passphrase')
+              .chomp
+  }
+  t.ssh_keys = [
+      {
+          hostname: "github.com",
+          private_key: File.read('config/secrets/ci/ssh.private')
+      }
+  ]
+end
+
+RakeGithub.define_repository_tasks(
+    namespace: :github,
+    repository: 'infrablocks/confidante',
+) do |t|
+  github_config =
+      YAML.load_file('config/secrets/github/config.yaml')
+
+  t.access_token = github_config["github_personal_access_token"]
+  t.deploy_keys = [
+      {
+          title: 'CircleCI',
+          public_key: File.read('config/secrets/ci/ssh.public')
+      }
+  ]
+end
+
+namespace :pipeline do
+  task :prepare => [
+      :'circle_ci:env_vars: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

data/confidante.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4.7'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'hiera', '~> 3.3', '>= 3.3.1'
   spec.add_dependency 'activesupport', '>= 4'
@@ -33,6 +33,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rake_circle_ci', '~> 0.3'
+  spec.add_development_dependency 'rake_github', '~> 0.3'
+  spec.add_development_dependency 'rake_ssh', '~> 0.2'
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'gem-release', '~> 2.0'
 end

data/config/secrets/circle_ci/config.yaml

@@ -0,0 +1,2 @@
+---
+circle_ci_api_token: "27393e98772c1342785957a776ca4acbaea7f7cb"

data/config/secrets/github/config.yaml

@@ -0,0 +1,2 @@
+---
+github_personal_access_token: "6deebdb15c371069618942f48acd76f35880ebb5"

data/lib/confidante/version.rb

@@ -1,3 +1,3 @@
 module Confidante
-  VERSION = '0.19.0'
+  VERSION = '0.20.0.pre.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: confidante
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera
@@ -86,6 +86,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake_circle_ci
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rake_github
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rake_ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +188,8 @@ files:
 - config/secrets/ci/gpg.public
 - config/secrets/ci/ssh.private
 - config/secrets/ci/ssh.public
+- config/secrets/circle_ci/config.yaml
+- config/secrets/github/config.yaml
 - config/secrets/rubygems/credentials
 - go
 - lib/confidante.rb
@@ -175,14 +219,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.7
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A configuration engine over hiera.