ruby_fly 0.42.0.pre.2 → 0.42.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 141c67d1cce515698befaf51eb6c2b41a41473e4d810e612f404a158f20bf702
-  data.tar.gz: 8c09e304d6a68c9e3a373c98e116ccb644df01b1e5eb7d75dd667be6f8560b99
+  metadata.gz: 705e786967161a6b8474b9cca40b1900e96620bbf258edef8ce04b0e40f86040
+  data.tar.gz: d17b451140ca9c1cc6c93dc822728dd22f354ec992d7e0632a4022e8b1785037
 SHA512:
-  metadata.gz: b4ebb364add863da6d000a11665bb01d4c5fbbc1633b9d7302efb7f6145487b309cfb0abd5ad0cf8aefe8523eb41fe3ce2fef39a3d0708b7ba3522415a4bad16
-  data.tar.gz: 58990710bd843f1bfdc3b7d88b2ee0713bd39b60310ecf1c870d68b0247e305bd84cfe3d8110384783610667c8128e4b826b14a1953f6b28175a92131886118b
+  metadata.gz: 3ef6b8bc53a990da4d84db9a7aa72982efe56d4eb1b6b16cc19825fbe398026f859bccf45e85585d31cf3b7261698b13ac2de32c13a53b1556d24a53c93113de
+  data.tar.gz: 6c43655cd452530902887eaf696e24df9e521207651dd236f54d028c41df7c46216d2cc596e0f31d0d7be18e77402b7822a10b82c06e6ab575f7e4e69fceb0ea

data/Gemfile.lock

@@ -1,58 +1,66 @@
 PATH
   remote: .
   specs:
-    ruby_fly (0.42.0.pre.2)
+    ruby_fly (0.42.0.pre.3)
       lino (>= 4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.4)
+    activesupport (8.1.3)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.1.2)
     childprocess (5.0.0)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.3)
-    connection_pool (2.4.1)
-    diff-lcs (1.5.1)
+    concurrent-ruby (1.3.8)
+    connection_pool (3.0.2)
+    diff-lcs (1.6.2)
     docile (1.4.0)
-    drb (2.2.1)
-    excon (0.111.0)
-    fakefs (2.5.0)
-    faker (3.4.2)
+    drb (2.2.3)
+    excon (1.6.0)
+      logger
+    fakefs (3.0.0)
+    faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.10.0)
-      faraday-net_http (>= 2.0, < 3.2)
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
       logger
-    faraday-net_http (3.1.0)
-      net-http
-    ffi (1.17.0)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    ffi (1.17.4)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86_64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
     formatador (1.1.0)
-    gem-release (2.2.2)
+    gem-release (2.2.4)
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    guard (2.18.1)
+    guard (2.19.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
+      ostruct (~> 0.6)
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
@@ -63,50 +71,46 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.14.5)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    immutable-struct (2.4.1)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    immutable-struct (2.5.0)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
     lino (4.1.0)
       childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.0)
+    logger (1.7.0)
     lumberjack (1.2.10)
     method_source (1.1.0)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
+    minitest (5.27.0)
     nenv (0.3.0)
-    net-http (0.4.1)
-      uri
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (8.1.0)
-      base64
+    octokit (10.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    ostruct (0.6.1)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (6.0.1)
-    racc (1.8.0)
+    public_suffix (7.0.5)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rake_circle_ci (0.11.0)
-      colored2 (~> 3.1)
-      excon (~> 0.72)
-      rake_factory (~> 0.23)
-      sshkey (~> 2.0)
+    rake (13.4.2)
     rake_factory (0.33.0)
       activesupport (>= 4)
       rake (~> 13.0)
@@ -114,69 +118,74 @@ GEM
       colored2 (~> 3.1)
       git (~> 1.13, >= 1.13.2)
       rake_factory (~> 0.33)
-    rake_git_crypt (0.2.0)
+    rake_git_crypt (0.4.0)
       colored2 (~> 3.1)
+      lino (~> 4.1)
       rake_factory (~> 0.33)
       ruby_git_crypt (~> 0.1)
       ruby_gpg2 (~> 0.12)
-    rake_github (0.13.0)
+    rake_github (0.17.0)
       colored2 (~> 3.1)
-      octokit (>= 4.16, < 9.0)
-      rake_factory (~> 0.23)
+      octokit (>= 7.0, < 11.0)
+      rake_factory (~> 0.33)
+      rbnacl (~> 7.1)
       sshkey (~> 2.0)
     rake_gpg (0.20.0)
       rake_factory (~> 0.33)
       ruby_gpg2 (~> 0.12)
-    rake_ssh (0.10.0)
-      colored2 (~> 3.1)
-      rake_factory (~> 0.23)
-      sshkey (~> 2.0)
+    rake_slack (0.3.0)
+      excon (>= 0.72, < 2.0)
+      rake_factory (~> 0.33)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
+    rbnacl (7.1.2)
+      ffi (~> 1)
     rchardet (1.8.0)
-    regexp_parser (2.9.2)
-    rexml (3.3.2)
-      strscan
-    rspec (3.13.0)
+    regexp_parser (2.10.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rspec-support (3.13.4)
+    rubocop (1.76.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
-      parser (>= 3.3.1.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (3.0.3)
-      rubocop (~> 1.61)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.45.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     ruby_git_crypt (0.1.0)
       immutable-struct (~> 2.4)
       lino (>= 4.1)
     ruby_gpg2 (0.12.0)
       lino (>= 4.1)
-    sawyer (0.9.2)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    securerandom (0.4.1)
     shellany (0.0.1)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -185,13 +194,14 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     sshkey (2.0.0)
-    strscan (3.1.0)
     terminal-notifier-guard (1.7.0)
-    thor (1.3.1)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.1.1)
 
 PLATFORMS
   arm64-darwin-21
@@ -210,12 +220,11 @@ DEPENDENCIES
   guard
   guard-rspec
   rake
-  rake_circle_ci
   rake_git
   rake_git_crypt
   rake_github
   rake_gpg
-  rake_ssh
+  rake_slack
   rspec
   rubocop
   rubocop-rake

data/README.md

@@ -136,16 +136,16 @@ release a new version, update the version number in `version.rb`, and then run
 git commits and tags, and push the `.gem` file to 
 [rubygems.org](https://rubygems.org).
 
-### Managing CircleCI keys
+### Managing CI keys
 
-To encrypt a GPG key for use by CircleCI:
+To encrypt a GPG key for use by CI:
 
 ```bash
 openssl aes-256-cbc \
   -e \
   -md sha1 \
   -in ./config/secrets/ci/gpg.private \
-  -out ./.circleci/gpg.private.enc \
+  -out ./.github/gpg.private.enc \
   -k "<passphrase>"
 ```
 
@@ -155,7 +155,7 @@ To check decryption is working correctly:
 openssl aes-256-cbc \
   -d \
   -md sha1 \
-  -in ./.circleci/gpg.private.enc \
+  -in ./.github/gpg.private.enc \
   -k "<passphrase>"
 ```
 

data/Rakefile

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require 'rake_circle_ci'
 require 'rake_git'
 require 'rake_git_crypt'
 require 'rake_github'
 require 'rake_gpg'
-require 'rake_ssh'
+require 'rake_slack'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'securerandom'
-require 'yaml'
 
 task default: %i[
   library:fix
@@ -59,13 +57,6 @@ namespace :encryption do
 end
 
 namespace :keys do
-  namespace :deploy do
-    RakeSSH.define_key_tasks(
-      path: 'config/secrets/ci/',
-      comment: 'maintainers@infrablocks.io'
-    )
-  end
-
   namespace :gpg do
     RakeGPG.define_generate_key_task(
       output_directory: 'config/secrets/ci',
@@ -91,7 +82,6 @@ namespace :secrets do
   desc 'Generate all generatable secrets.'
   task generate: %w[
     encryption:passphrase:generate
-    keys:deploy:generate
     keys:gpg:generate
   ]
 
@@ -115,57 +105,98 @@ namespace :library do
 
   desc 'Attempt to automatically fix issues with the library'
   task fix: [:'rubocop:autocorrect_all']
+
+  desc 'Build the library'
+  task :build do
+    sh 'gem build ruby_fly.gemspec'
+  end
 end
 
 namespace :test do
   RSpec::Core::RakeTask.new(:unit)
 end
 
-RakeCircleCI.define_project_tasks(
-  namespace: :circle_ci,
-  project_slug: 'github/infrablocks/ruby_fly'
-) 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.checkout_keys = []
-  t.ssh_keys = [
-    {
-      hostname: 'github.com',
-      private_key: File.read('config/secrets/ci/ssh.private')
-    }
-  ]
+namespace :slack do
+  RakeSlack.define_notification_tasks do |t|
+    t.bot_token = ENV.fetch('SLACK_BOT_TOKEN', nil)
+    t.routing_rules = [
+      { when: { type: 'on_hold' },
+        channel: 'C038EDCRSQJ', format: :on_hold },  # release
+      { when: { actor: 'dependabot[bot]', outcome: 'success' },
+        channel: 'C03N711HVDG', format: :success },  # builds-dependabot
+      { when: { actor: 'dependabot[bot]' },
+        channel: 'C03N711HVDG', format: :failure },  # builds-dependabot
+      { when: { outcome: 'success' },
+        channel: 'C023XUE76GH', format: :success },  # builds
+      # Failures go to builds, not team-dev (org default), to keep noise
+      # out of a popular channel while this pipeline beds in.
+      { when: {},
+        channel: 'C023XUE76GH', format: :failure } # builds
+    ]
+  end
+end
+
+namespace :repository do
+  desc 'Set the git author for CI'
+  task :set_ci_author do
+    sh 'git config --global user.name "InfraBlocks CI"'
+    sh 'git config --global user.email "ci@infrablocks.io"'
+  end
 end
 
-RakeGithub.define_repository_tasks(
+RakeGithub.define_repository_tasks( # rubocop:disable Metrics/BlockLength
   namespace: :github,
   repository: 'infrablocks/ruby_fly'
 ) 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')
-    }
+  # Operator's ambient auth. Resolve once and fail fast: a missing,
+  # unauthenticated, or absent gh yields an empty string, which would
+  # otherwise surface later as an opaque Octokit 401. An empty or
+  # whitespace-only GITHUB_TOKEN is treated as absent so an authenticated
+  # operator falls through to `gh auth token` rather than hitting the raise.
+  github_token = ENV['GITHUB_TOKEN'].to_s.strip
+  if github_token.empty?
+    github_token = begin
+      `gh auth token`
+    rescue Errno::ENOENT
+      ''
+    end.strip
+  end
+  if github_token.empty?
+    raise 'No GitHub token available: set GITHUB_TOKEN or run `gh auth login`'
+  end
+
+  t.access_token = github_token
+
+  # Actions store only: dependabot runs never reach the passphrase — the
+  # only pr.yaml job that unlocks git-crypt (prerelease) is guarded to
+  # same-repo human PRs. Guard against a locked clone: without
+  # it, File.read returns git-crypt ciphertext and github:secrets:ensure
+  # silently uploads garbage that only surfaces much later as an opaque
+  # GPG unlock failure in the release job.
+  passphrase_path = 'config/secrets/ci/encryption.passphrase'
+  unless File.exist?(passphrase_path)
+    raise "Passphrase file not found: #{passphrase_path} — expected a " \
+          'git-crypt-unlocked clone with the CI secrets present'
+  end
+  passphrase = File.binread(passphrase_path)
+  if passphrase.start_with?("\x00GITCRYPT")
+    raise 'encryption.passphrase is git-crypt ciphertext — unlock the ' \
+          'clone before provisioning'
+  end
+  t.secrets = [
+    { name: 'ENCRYPTION_PASSPHRASE', value: passphrase.chomp }
+  ]
+  t.environments = [
+    { name: 'release',
+      reviewers: [{ team: 'maintainers' }] }
   ]
 end
 
 namespace :pipeline do
-  desc 'Prepare CircleCI Pipeline'
+  desc 'Prepare GitHub Actions pipeline'
   task prepare: %i[
-    circle_ci:env_vars:ensure
-    circle_ci:checkout_keys:ensure
-    circle_ci:ssh_keys:ensure
-    github:deploy_keys:ensure
+    github:secrets:ensure
+    github:environments:ensure
   ]
 end
 
@@ -176,6 +207,38 @@ namespace :version do
   end
 end
 
+namespace :prerelease do
+  desc 'Build and push a namespaced pre-release to RubyGems ' \
+       '(PR CI only; no bump, no tag, no commit, no push)'
+  task :publish, %i[pr_number run_number run_attempt] do |_, args|
+    %i[pr_number run_number run_attempt].each do |name|
+      raise "Missing task argument: #{name}" if args[name].to_s.empty?
+    end
+
+    version_file = 'lib/ruby_fly/version.rb'
+    version_pattern = /(VERSION\s*=\s*')([^']+)(')/
+    source = File.read(version_file)
+    base = source[version_pattern, 2]
+    raise "Could not read VERSION from #{version_file}" unless base
+
+    version = "#{base}.pr#{args.pr_number}" \
+              ".#{args.run_number}.#{args.run_attempt}"
+    gem_file = "ruby_fly-#{version}.gem"
+    begin
+      File.write(version_file,
+                 source.sub(version_pattern, "\\1#{version}\\3"))
+      # Build + push directly: `gem release` aborts on the (deliberately)
+      # uncommitted version rewrite. PR CI must not tag, commit, or push
+      # (contrast the `release` task).
+      sh 'gem build ruby_fly.gemspec'
+      sh "gem push #{gem_file}"
+    ensure
+      File.write(version_file, source)
+      rm_f gem_file
+    end
+  end
+end
+
 desc 'Release gem'
 task :release do
   sh 'gem release --tag --push'

data/lib/ruby_fly/version.rb

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

data/ruby_fly.gemspec

@@ -34,7 +34,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 = '>= 3.1'
+  spec.required_ruby_version = '>= 3.3'
 
   spec.add_dependency 'lino', '>= 4.1'
 
@@ -45,12 +45,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
   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'
+  spec.add_development_dependency 'rake_slack'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_fly
 version: !ruby/object:Gem::Version
-  version: 0.42.0.pre.2
+  version: 0.42.0.pre.3
 platform: ruby
 authors:
 - InfraBlocks Maintainers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2026-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lino
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake_circle_ci
-  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
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake_slack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -326,7 +312,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -334,15 +320,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A simple Ruby wrapper for invoking fly commands.
 test_files: []