From e68975a5c32d3d15e78885bef31fcc0b00942180 Mon Sep 17 00:00:00 2001 From: Toby Clemson Date: Wed, 17 Jul 2024 22:44:01 +0100 Subject: [PATCH] Upgrade Ruby. --- .circleci/config.yml | 51 ++- .ruby-version | 1 - .tool-versions | 2 +- Gemfile.lock | 137 ++++---- lib/rake_circle_ci.rb | 12 +- lib/rake_circle_ci/client.rb | 28 +- .../tasks/ssh_keys/provision.rb | 2 +- rake_circle_ci.gemspec | 4 +- scripts/ci/common/configure-asdf.sh | 18 ++ .../ci/common/install-asdf-dependencies.sh | 12 + scripts/ci/common/install-asdf.sh | 19 ++ ...tall-orb-deps.sh => install-slack-deps.sh} | 0 spec/rake_circle_ci/client_spec.rb | 296 +++++++++--------- .../task_sets/checkout_keys_spec.rb | 24 +- .../task_sets/environment_variables_spec.rb | 24 +- spec/rake_circle_ci/task_sets/project_spec.rb | 82 ++--- .../rake_circle_ci/task_sets/ssh_keys_spec.rb | 24 +- .../tasks/checkout_keys/destroy_spec.rb | 8 +- .../tasks/checkout_keys/ensure_spec.rb | 2 +- .../tasks/checkout_keys/provision_spec.rb | 8 +- .../environment_variables/destroy_spec.rb | 10 +- .../environment_variables/ensure_spec.rb | 2 +- .../environment_variables/provision_spec.rb | 10 +- .../tasks/projects/follow_spec.rb | 8 +- .../tasks/ssh_keys/destroy_spec.rb | 8 +- .../tasks/ssh_keys/ensure_spec.rb | 2 +- .../tasks/ssh_keys/provision_spec.rb | 20 +- 27 files changed, 448 insertions(+), 366 deletions(-) delete mode 100644 .ruby-version create mode 100755 scripts/ci/common/configure-asdf.sh create mode 100755 scripts/ci/common/install-asdf-dependencies.sh create mode 100755 scripts/ci/common/install-asdf.sh rename scripts/ci/common/{install-orb-deps.sh => install-slack-deps.sh} (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc8485f..51114fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,15 @@ version: 2.1 orbs: - slack: circleci/slack@4.8.3 + slack: circleci/slack@4.13.2 -defaults: &defaults +base_container: &base_container + image: buildpack-deps:buster + +build_container: &build_container + resource_class: arm.medium docker: - - image: ruby:2.7.5 + - <<: *base_container slack_context: &slack_context context: @@ -61,17 +65,44 @@ commands: event: pass channel: builds template: SLACK_SUCCESS_NOTIFICATION - configure_tools: + + configure_build_tools: + steps: + - run: ./scripts/ci/common/install-slack-deps.sh + - restore_cache: + keys: + - asdf-dependencies-{{ arch }}-v2-{{ checksum ".tool-versions" }} + - asdf-dependencies-{{ arch }}-v2- + - run: ./scripts/ci/common/install-asdf.sh + - run: ./scripts/ci/common/configure-asdf.sh + - run: ./scripts/ci/common/install-asdf-dependencies.sh + - save_cache: + key: asdf-dependencies-{{ arch }}-v2-{{ checksum ".tool-versions" }} + paths: + - ~/.asdf + + configure_secrets_tools: steps: - run: ./scripts/ci/common/install-git-crypt.sh - run: ./scripts/ci/common/install-gpg-key.sh - - run: ./scripts/ci/common/install-orb-deps.sh - run: ./scripts/ci/common/configure-git.sh + + configure_release_tools: + steps: + - add_ssh_keys: + fingerprints: + - "SHA256:yeDkuBjG5lpLbRB5Ubp4Gs7z5l1h8tiskiDuNKBOoH8" - run: ./scripts/ci/common/configure-rubygems.sh + configure_tools: + steps: + - configure_build_tools + - configure_secrets_tools + - configure_release_tools + jobs: build: - <<: *defaults + <<: *build_container steps: - checkout - configure_tools @@ -79,7 +110,7 @@ jobs: - notify test: - <<: *defaults + <<: *build_container steps: - checkout - configure_tools @@ -87,7 +118,7 @@ jobs: - notify prerelease: - <<: *defaults + <<: *build_container steps: - checkout - configure_tools @@ -95,7 +126,7 @@ jobs: - notify release: - <<: *defaults + <<: *build_container steps: - checkout - configure_tools @@ -103,7 +134,7 @@ jobs: - notify merge_pull_request: - <<: *defaults + <<: *build_container steps: - checkout - configure_tools diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 460b6fd..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.7.5 \ No newline at end of file diff --git a/.tool-versions b/.tool-versions index a4023dc..e7f4c11 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.7.5 +ruby 3.1.1 diff --git a/Gemfile.lock b/Gemfile.lock index 7a1bb78..5fdf970 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,13 +4,13 @@ PATH rake_circle_ci (0.12.0.pre.4) colored2 (~> 3.1) excon (~> 0.72) - rake_factory (~> 0.31) + rake_factory (~> 0.33) sshkey (~> 2.0) GEM remote: https://rubygems.org/ specs: - activesupport (7.1.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -20,123 +20,122 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.4) + bigdecimal (3.1.8) + childprocess (5.0.0) colored2 (3.1.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.3) connection_pool (2.4.1) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) - drb (2.2.0) - ruby2_keywords - excon (0.108.0) - faraday (2.7.11) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + drb (2.2.1) + excon (0.111.0) + faraday (2.10.0) + faraday-net_http (>= 2.0, < 3.2) + logger + faraday-net_http (3.1.0) + net-http gem-release (2.2.2) - git (1.18.0) + git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) hamster (3.0.0) concurrent-ruby (~> 1.0) - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) immutable-struct (2.4.1) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) - lino (3.1.0) + lino (4.1.0) + childprocess (~> 5.0.0) hamster (~> 3.0) open4 (~> 1.3) + logger (1.6.0) memfs (1.0.0) - minitest (5.20.0) + minitest (5.24.1) mutex_m (0.2.0) - octokit (8.0.0) + net-http (0.4.1) + uri + octokit (8.1.0) + base64 faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.25.1) + parser (3.3.4.0) ast (~> 2.4.1) racc - public_suffix (5.0.3) - racc (1.7.3) + public_suffix (6.0.0) + racc (1.8.0) rainbow (3.1.1) - rake (13.1.0) - rake_factory (0.32.0.pre.2) + rake (13.2.1) + rake_factory (0.33.0) activesupport (>= 4) rake (~> 13.0) - rake_git (0.1.0.pre.10) + rake_git (0.2.0) colored2 (~> 3.1) git (~> 1.13, >= 1.13.2) - rake_factory (= 0.32.0.pre.2) - rake_git_crypt (0.1.0.pre.29) + rake_factory (~> 0.33) + rake_git_crypt (0.2.0) colored2 (~> 3.1) - rake_factory (= 0.32.0.pre.2) - ruby_git_crypt (= 0.1.0.pre.4) - ruby_gpg2 (~> 0.6) + rake_factory (~> 0.33) + ruby_git_crypt (~> 0.1) + ruby_gpg2 (~> 0.12) rake_github (0.13.0) colored2 (~> 3.1) octokit (>= 4.16, < 9.0) rake_factory (~> 0.23) sshkey (~> 2.0) - rake_gpg (0.18.0) - rake_factory (~> 0.23) - ruby_gpg2 (~> 0.6) + 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) rchardet (1.8.0) - regexp_parser (2.8.3) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + regexp_parser (2.9.2) + rexml (3.3.2) + strscan + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.59.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.65.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.25.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) + rubocop-rspec (3.0.3) + rubocop (~> 1.61) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - ruby_git_crypt (0.1.0.pre.4) + ruby_git_crypt (0.1.0) immutable-struct (~> 2.4) - lino (~> 3.0) - ruby_gpg2 (0.10.0) - lino (~> 3.0) + lino (>= 4.1) + ruby_gpg2 (0.12.0) + lino (>= 4.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -147,9 +146,11 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) sshkey (2.0.0) + strscan (3.1.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) + uri (0.13.0) PLATFORMS ruby diff --git a/lib/rake_circle_ci.rb b/lib/rake_circle_ci.rb index 7870605..6119154 100644 --- a/lib/rake_circle_ci.rb +++ b/lib/rake_circle_ci.rb @@ -6,15 +6,15 @@ require 'rake_circle_ci/task_sets' module RakeCircleCI - def self.define_environment_variables_tasks(opts = {}, &block) - RakeCircleCI::TaskSets::EnvironmentVariables.define(opts, &block) + def self.define_environment_variables_tasks(opts = {}, &) + RakeCircleCI::TaskSets::EnvironmentVariables.define(opts, &) end - def self.define_ssh_keys_tasks(opts = {}, &block) - RakeCircleCI::TaskSets::SSHKeys.define(opts, &block) + def self.define_ssh_keys_tasks(opts = {}, &) + RakeCircleCI::TaskSets::SSHKeys.define(opts, &) end - def self.define_project_tasks(opts = {}, &block) - RakeCircleCI::TaskSets::Project.define(opts, &block) + def self.define_project_tasks(opts = {}, &) + RakeCircleCI::TaskSets::Project.define(opts, &) end end diff --git a/lib/rake_circle_ci/client.rb b/lib/rake_circle_ci/client.rb index 65848c6..9f6a991 100644 --- a/lib/rake_circle_ci/client.rb +++ b/lib/rake_circle_ci/client.rb @@ -79,22 +79,22 @@ def initialize(opts) end def follow_project - @http.post(@urls.follow_url, headers: headers) + @http.post(@urls.follow_url, { headers: }) end def find_env_vars - response = @http.get(@urls.env_vars_url, headers: headers) + response = @http.get(@urls.env_vars_url, { headers: }) body = JSON.parse(response.body) body['items'].map { |item| item['name'] } end def create_env_var(name, value) - body = JSON.dump(name: name, value: value) - @http.post(@urls.env_vars_url, body: body, headers: headers) + body = JSON.dump(name:, value:) + @http.post(@urls.env_vars_url, { body:, headers: }) end def delete_env_var(name) - @http.delete(@urls.env_var_url(name), headers: headers) + @http.delete(@urls.env_var_url(name), { headers: }) end def delete_env_vars @@ -105,7 +105,7 @@ def delete_env_vars end def find_ssh_keys - response = @http.get(@urls.settings_url, headers: headers) + response = @http.get(@urls.settings_url, { headers: }) body = JSON.parse(response.body, symbolize_names: true) body[:ssh_keys] end @@ -113,20 +113,20 @@ def find_ssh_keys def create_ssh_key(private_key, opts = {}) body = { fingerprint: SSHKey.new(private_key).sha1_fingerprint, - private_key: private_key + private_key: } body = body.merge(hostname: opts[:hostname]) if opts[:hostname] body = JSON.dump(body) - @http.post(@urls.ssh_keys_url, body: body, headers: headers) + @http.post(@urls.ssh_keys_url, { body:, headers: }) end def delete_ssh_key(fingerprint, opts = {}) body = { - fingerprint: fingerprint + fingerprint: } body = body.merge(hostname: opts[:hostname]) if opts[:hostname] body = JSON.dump(body) - @http.delete(@urls.ssh_keys_url, body: body, headers: headers) + @http.delete(@urls.ssh_keys_url, { body:, headers: }) end def delete_ssh_keys @@ -134,14 +134,14 @@ def delete_ssh_keys ssh_keys.each do |ssh_key| fingerprint = ssh_key[:fingerprint] hostname = ssh_key[:hostname] - options = hostname && { hostname: hostname } + options = hostname && { hostname: } args = [fingerprint, options].compact delete_ssh_key(*args) end end def find_checkout_keys - response = @http.get(@urls.checkout_keys_url, headers: headers) + response = @http.get(@urls.checkout_keys_url, { headers: }) JSON.parse(response.body, symbolize_names: true) end @@ -151,11 +151,11 @@ def create_checkout_key(type) github_user_key: 'github-user-key' } body = JSON.dump(type: type_strings[type.to_sym] || type.to_s) - @http.post(@urls.checkout_keys_url, body: body, headers: headers) + @http.post(@urls.checkout_keys_url, { body:, headers: }) end def delete_checkout_key(fingerprint) - @http.delete(@urls.checkout_key_url(fingerprint), headers: headers) + @http.delete(@urls.checkout_key_url(fingerprint), { headers: }) end def delete_checkout_keys diff --git a/lib/rake_circle_ci/tasks/ssh_keys/provision.rb b/lib/rake_circle_ci/tasks/ssh_keys/provision.rb index 4caefaa..2ef4c2e 100644 --- a/lib/rake_circle_ci/tasks/ssh_keys/provision.rb +++ b/lib/rake_circle_ci/tasks/ssh_keys/provision.rb @@ -36,7 +36,7 @@ class Provision < RakeFactory::Task print "Adding SSH key with fingerprint: '#{fingerprint}'" print " for hostname: '#{hostname}'" if hostname print '...' - options = hostname && { hostname: hostname } + options = hostname && { hostname: } args = [private_key, options].compact client.create_ssh_key(*args) puts 'Done.' diff --git a/rake_circle_ci.gemspec b/rake_circle_ci.gemspec index 3c6003c..584e473 100644 --- a/rake_circle_ci.gemspec +++ b/rake_circle_ci.gemspec @@ -33,11 +33,11 @@ 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.7' + spec.required_ruby_version = '>= 3.1' spec.add_dependency 'colored2', '~> 3.1' spec.add_dependency 'excon', '~> 0.72' - spec.add_dependency 'rake_factory', '~> 0.31' + spec.add_dependency 'rake_factory', '~> 0.33' spec.add_dependency 'sshkey', '~> 2.0' spec.metadata['rubygems_mfa_required'] = 'false' diff --git a/scripts/ci/common/configure-asdf.sh b/scripts/ci/common/configure-asdf.sh new file mode 100755 index 0000000..b71847a --- /dev/null +++ b/scripts/ci/common/configure-asdf.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +[ -n "$DEBUG" ] && set -x +set -e +set -o pipefail + +function ensure-asdf-plugin() { + local name="$1" + local repo="$2" + + if ! asdf plugin list | grep -q "$name"; then + asdf plugin add "$name" "$repo" + fi +} + +ensure-asdf-plugin "ruby" "https://github.com/asdf-vm/asdf-ruby.git" +ensure-asdf-plugin "java" "https://github.com/halcyon/asdf-java.git" +ensure-asdf-plugin "golang" "https://github.com/asdf-community/asdf-golang.git" diff --git a/scripts/ci/common/install-asdf-dependencies.sh b/scripts/ci/common/install-asdf-dependencies.sh new file mode 100755 index 0000000..cb01457 --- /dev/null +++ b/scripts/ci/common/install-asdf-dependencies.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +[ -n "$DEBUG" ] && set -x +set -e +set -o pipefail + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +PROJECT_DIR="$( cd "$SCRIPT_DIR/../../.." && pwd )" + +cd "$PROJECT_DIR" + +asdf install diff --git a/scripts/ci/common/install-asdf.sh b/scripts/ci/common/install-asdf.sh new file mode 100755 index 0000000..8c1ce8b --- /dev/null +++ b/scripts/ci/common/install-asdf.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +[ -n "$DEBUG" ] && set -x +set -e +set -o pipefail + +apt-get update +apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + git + +if [ ! -f "$HOME/.asdf/asdf.sh" ]; then + echo "Installing asdf..." + git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.12.0 +fi + +# shellcheck disable=SC2016 +echo '. "$HOME/.asdf/asdf.sh"' >> "$BASH_ENV" diff --git a/scripts/ci/common/install-orb-deps.sh b/scripts/ci/common/install-slack-deps.sh similarity index 100% rename from scripts/ci/common/install-orb-deps.sh rename to scripts/ci/common/install-slack-deps.sh diff --git a/spec/rake_circle_ci/client_spec.rb b/spec/rake_circle_ci/client_spec.rb index 66827a8..1acd7b0 100644 --- a/spec/rake_circle_ci/client_spec.rb +++ b/spec/rake_circle_ci/client_spec.rb @@ -14,9 +14,9 @@ env_var_value = 'value-one' client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_env_var_request_body( @@ -31,8 +31,10 @@ expect(Excon) .to(have_received(:post) .with(env_vars_url(host, project_slug), - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token))) + { + body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) + })) end it 'raises an exception on failure' do @@ -45,9 +47,9 @@ env_var_value = 'value-one' client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_env_var_request_body(env_var_name, env_var_value) @@ -74,9 +76,9 @@ env_var_name = 'THING_ONE' client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_successful_delete_env_var_request( @@ -88,7 +90,7 @@ expect(Excon) .to(have_received(:delete) .with(env_var_url(host, project_slug, env_var_name), - headers: authenticated_headers(api_token))) + { headers: authenticated_headers(api_token) })) end it 'raises an exception on failure' do @@ -102,9 +104,9 @@ env_var_url = env_var_url(host, project_slug, env_var_name) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_failed_delete_env_var_request(host, env_var_path, api_token) @@ -128,9 +130,9 @@ env_var_2_name = 'THING_TWO' client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_successful_list_env_vars_request( @@ -153,9 +155,9 @@ env_vars_url = env_vars_url(host, project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_failed_list_env_vars_request(host, env_vars_path, api_token) @@ -185,9 +187,9 @@ env_var_2_path = env_var_path(project_slug, env_var_2_name) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_successful_list_env_vars_request( @@ -206,11 +208,11 @@ expect(Excon) .to(have_received(:delete) .with(env_var_url(host, project_slug, env_var_1_name), - headers: authenticated_headers(api_token))) + { headers: authenticated_headers(api_token) })) expect(Excon) .to(have_received(:delete) .with(env_var_url(host, project_slug, env_var_2_name), - headers: authenticated_headers(api_token))) + { headers: authenticated_headers(api_token) })) end # rubocop:enable RSpec/MultipleExpectations @@ -228,9 +230,9 @@ env_var_2_path = env_var_path(project_slug, env_var_2_name) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_successful_list_env_vars_request( @@ -263,9 +265,9 @@ checkout_keys_path = checkout_keys_path(project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_checkout_key_request_body @@ -278,8 +280,8 @@ expect(Excon) .to(have_received(:post) .with(checkout_keys_url(host, project_slug), - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) })) end it 'raises an exception on failure' do @@ -291,9 +293,9 @@ checkout_keys_url = checkout_keys_url(host, project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_checkout_key_request_body @@ -324,9 +326,9 @@ checkout_key_url = checkout_key_url(host, project_slug, fingerprint) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_successful_delete_checkout_key_request( @@ -338,7 +340,7 @@ expect(Excon) .to(have_received(:delete) .with(checkout_key_url, - headers: authenticated_headers(api_token))) + { headers: authenticated_headers(api_token) })) end it 'raises an exception on failure' do @@ -353,9 +355,9 @@ checkout_key_url = checkout_key_url(host, project_slug, fingerprint) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_failed_delete_checkout_key_request( @@ -381,9 +383,9 @@ checkout_keys_path = checkout_keys_path(project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) checkout_key1 = { @@ -420,9 +422,9 @@ checkout_keys_url = checkout_keys_url(host, project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_failed_list_checkout_keys_request( @@ -449,9 +451,9 @@ checkout_keys_path = checkout_keys_path(project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) checkout_key1 = ssh_key @@ -476,11 +478,11 @@ expect(Excon) .to(have_received(:delete) .with(checkout_key_url(host, project_slug, fingerprint1), - headers: authenticated_headers(api_token))) + { headers: authenticated_headers(api_token) })) expect(Excon) .to(have_received(:delete) .with(checkout_key_url(host, project_slug, fingerprint2), - headers: authenticated_headers(api_token))) + { headers: authenticated_headers(api_token) })) end # rubocop:enable RSpec/MultipleExpectations @@ -493,9 +495,9 @@ checkout_keys_path = checkout_keys_path(project_slug) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) checkout_key1 = ssh_key @@ -538,9 +540,9 @@ ssh_keys_path = ssh_keys_path(project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_ssh_key_request_body(key) @@ -553,8 +555,8 @@ expect(Excon) .to(have_received(:post) .with(ssh_keys_url(host, project_slug, api_token), - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) })) end it 'passes the hostname when supplied' do @@ -570,9 +572,9 @@ ssh_keys_url = ssh_keys_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_ssh_key_request_body(key, hostname) @@ -580,13 +582,13 @@ host, ssh_keys_path, api_token, expected_body ) - client.create_ssh_key(key.private_key, hostname: hostname) + client.create_ssh_key(key.private_key, hostname:) expect(Excon) .to(have_received(:post) .with(ssh_keys_url, - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) })) end it 'raises an exception on failure' do @@ -602,9 +604,9 @@ hostname = 'github.com' client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = create_ssh_key_request_body(key, hostname) @@ -613,7 +615,7 @@ ) expect do - client.create_ssh_key(key.private_key, hostname: hostname) + client.create_ssh_key(key.private_key, hostname:) end.to(raise_error( RuntimeError, "Unsuccessful request: #{ssh_keys_url} 400 Bad Request" @@ -635,9 +637,9 @@ ssh_keys_url = ssh_keys_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = delete_ssh_key_request_body(key.fingerprint, hostname) @@ -645,13 +647,13 @@ host, ssh_keys_path, api_token, expected_body ) - client.delete_ssh_key(key.fingerprint, hostname: hostname) + client.delete_ssh_key(key.fingerprint, hostname:) expect(Excon) .to(have_received(:delete) .with(ssh_keys_url, - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) })) end it 'does not pass a hostname when none supplied' do @@ -666,9 +668,9 @@ ssh_keys_url = ssh_keys_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = delete_ssh_key_request_body(key.fingerprint) @@ -681,8 +683,8 @@ expect(Excon) .to(have_received(:delete) .with(ssh_keys_url, - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) })) end it 'raises an exception on failure' do @@ -698,9 +700,9 @@ ssh_keys_url = ssh_keys_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body = delete_ssh_key_request_body(key.fingerprint, hostname) @@ -709,7 +711,7 @@ ) expect do - client.delete_ssh_key(key.fingerprint, hostname: hostname) + client.delete_ssh_key(key.fingerprint, hostname:) end.to(raise_error( RuntimeError, "Unsuccessful request: #{ssh_keys_url} 400 Bad Request" @@ -731,9 +733,9 @@ settings_path = settings_path(project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) ssh_key1_response_body = ssh_key_response_body(key1, hostname1) @@ -761,9 +763,9 @@ settings_url = settings_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_failed_list_ssh_keys_request(api_token, host, settings_path) @@ -793,9 +795,9 @@ ssh_keys_path = ssh_keys_path(project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body1 = delete_ssh_key_request_body(key1.fingerprint, hostname1) @@ -818,13 +820,13 @@ expect(Excon) .to(have_received(:delete) .with(ssh_keys_url(host, project_slug, api_token), - body: JSON.dump(expected_body1), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body1), + headers: authenticated_headers(api_token) })) expect(Excon) .to(have_received(:delete) .with(ssh_keys_url(host, project_slug, api_token), - body: JSON.dump(expected_body2), - headers: authenticated_headers(api_token))) + { body: JSON.dump(expected_body2), + headers: authenticated_headers(api_token) })) end # rubocop:enable RSpec/MultipleExpectations @@ -844,9 +846,9 @@ ssh_keys_url = ssh_keys_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_body1 = delete_ssh_key_request_body(key1.fingerprint, hostname1) @@ -884,9 +886,9 @@ follow_url = follow_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) expected_headers = authenticated_headers(api_token) @@ -898,7 +900,7 @@ expect(Excon) .to(have_received(:post) .with(follow_url, - headers: expected_headers)) + { headers: expected_headers })) end it 'raises an exception on failure' do @@ -910,9 +912,9 @@ follow_url = follow_url(host, project_slug, api_token) client = described_class.new( - project_slug: project_slug, - api_token: api_token, - base_url: base_url + project_slug:, + api_token:, + base_url: ) stub_failed_follow_request(api_token, host, project_slug) @@ -1016,26 +1018,26 @@ def create_ssh_key_request_body(key, hostname = nil) fingerprint: key.fingerprint, private_key: key.private_key } - hostname ? body.merge(hostname: hostname) : body + hostname ? body.merge(hostname:) : body end def delete_ssh_key_request_body(fingerprint, hostname = nil) body = { - fingerprint: fingerprint + fingerprint: } - hostname ? body.merge(hostname: hostname) : body + hostname ? body.merge(hostname:) : body end def bad_request_response_body(host, path) { - host: host, - path: path, + host:, + path:, reason_phrase: 'Bad Request' } end def env_vars_response_body(env_var_names) - { items: env_var_names.map { |name| { name: name } } } + { items: env_var_names.map { |name| { name: } } } end def checkout_key_response_body(opts) @@ -1064,7 +1066,7 @@ def ssh_key_response_body(key, hostname = nil) fingerprint: key.fingerprint, private_key: key.private_key } - response.merge(hostname: hostname) + response.merge(hostname:) end def ssh_keys_response_body(keys) @@ -1130,7 +1132,7 @@ def successful_create_checkout_key_response_double(key) response_double( 'create checkout key response', status: 201, - body: JSON.dump(checkout_key_response_body(key: key)) + body: JSON.dump(checkout_key_response_body(key:)) ) end @@ -1241,8 +1243,8 @@ def stub_successful_create_env_var_request( allow(Excon) .to(receive(:post) .with("#{host}#{env_vars_path}", - body: JSON.dump(env_var), - headers: authenticated_headers(api_token)) + { body: JSON.dump(env_var), + headers: authenticated_headers(api_token) }) .and_return(successful_create_env_var_response_double)) end @@ -1252,8 +1254,8 @@ def stub_failed_create_env_var_request( allow(Excon) .to(receive(:post) .with("#{host}#{env_vars_path}", - body: JSON.dump(body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(body), + headers: authenticated_headers(api_token) }) .and_return( failed_create_env_var_response_double(host, env_vars_path) )) @@ -1265,7 +1267,7 @@ def stub_successful_list_env_vars_request( allow(Excon) .to(receive(:get) .with("#{host}#{env_vars_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return( successful_list_env_vars_response_double(env_var_names) )) @@ -1275,7 +1277,7 @@ def stub_failed_list_env_vars_request(host, env_vars_path, api_token) allow(Excon) .to(receive(:get) .with("#{host}#{env_vars_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return(failed_list_env_vars_response_double( host, env_vars_path ))) @@ -1287,7 +1289,7 @@ def stub_successful_delete_env_var_request( allow(Excon) .to(receive(:delete) .with("#{host}#{env_var_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return( successful_delete_env_var_response_double(identifier) )) @@ -1299,7 +1301,7 @@ def stub_failed_delete_env_var_request( allow(Excon) .to(receive(:delete) .with("#{host}#{env_var_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return( failed_delete_env_var_response_double( host, env_var_path, identifier @@ -1313,8 +1315,8 @@ def stub_successful_create_checkout_key_request( allow(Excon) .to(receive(:post) .with("#{host}#{checkout_keys_path}", - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) }) .and_return( successful_create_checkout_key_response_double(ssh_key) )) @@ -1326,8 +1328,8 @@ def stub_failed_create_checkout_key_request( allow(Excon) .to(receive(:post) .with("#{host}#{checkout_keys_path}", - body: JSON.dump(expected_body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(expected_body), + headers: authenticated_headers(api_token) }) .and_return( failed_create_checkout_key_response_double( host, checkout_keys_path @@ -1341,7 +1343,7 @@ def stub_successful_delete_checkout_key_request( allow(Excon) .to(receive(:delete) .with("#{host}#{checkout_key_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return(successful_delete_checkout_key_response_double)) end @@ -1351,7 +1353,7 @@ def stub_failed_delete_checkout_key_request( allow(Excon) .to(receive(:delete) .with("#{host}#{checkout_key_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return( failed_delete_checkout_key_response_double( host, checkout_key_path @@ -1365,7 +1367,7 @@ def stub_successful_list_checkout_keys_request( allow(Excon) .to(receive(:get) .with("#{host}#{checkout_keys_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return( successful_list_checkout_keys_response_double( checkout_keys @@ -1379,7 +1381,7 @@ def stub_failed_list_checkout_keys_request( allow(Excon) .to(receive(:get) .with("#{host}#{checkout_keys_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return( failed_list_checkout_keys_response_double( host, checkout_keys_path @@ -1393,8 +1395,8 @@ def stub_successful_create_ssh_key_request( allow(Excon) .to(receive(:post) .with("#{host}#{ssh_keys_path}", - body: JSON.dump(body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(body), + headers: authenticated_headers(api_token) }) .and_return(successful_create_ssh_key_response_double)) end @@ -1402,8 +1404,8 @@ def stub_failed_create_ssh_key_request(host, ssh_keys_path, api_token, body) allow(Excon) .to(receive(:post) .with("#{host}#{ssh_keys_path}", - body: JSON.dump(body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(body), + headers: authenticated_headers(api_token) }) .and_return(failed_create_ssh_key_response_double( host, ssh_keys_path ))) @@ -1415,8 +1417,8 @@ def stub_successful_delete_ssh_key_request( allow(Excon) .to(receive(:delete) .with("#{host}#{ssh_keys_path}", - body: JSON.dump(body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(body), + headers: authenticated_headers(api_token) }) .and_return(successful_delete_ssh_key_response_double)) end @@ -1424,8 +1426,8 @@ def stub_failed_delete_ssh_key_request(host, ssh_keys_path, api_token, body) allow(Excon) .to(receive(:delete) .with("#{host}#{ssh_keys_path}", - body: JSON.dump(body), - headers: authenticated_headers(api_token)) + { body: JSON.dump(body), + headers: authenticated_headers(api_token) }) .and_return(failed_delete_ssh_key_response_double( host, ssh_keys_path ))) @@ -1437,7 +1439,7 @@ def stub_successful_list_ssh_keys_request( allow(Excon) .to(receive(:get) .with("#{host}#{settings_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return(successful_list_ssh_keys_response_double( body ))) @@ -1447,7 +1449,7 @@ def stub_failed_list_ssh_keys_request(api_token, host, ssh_keys_path) allow(Excon) .to(receive(:get) .with("#{host}#{ssh_keys_path}", - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return(failed_list_ssh_keys_response_double( host, ssh_keys_path ))) @@ -1457,7 +1459,7 @@ def stub_successful_follow_request(host, project_slug, api_token) allow(Excon) .to(receive(:post) .with(follow_url(host, project_slug, api_token), - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return(successful_follow_response_double)) end @@ -1465,7 +1467,7 @@ def stub_failed_follow_request(api_token, host, project_slug) allow(Excon) .to(receive(:post) .with(follow_url(host, project_slug, api_token), - headers: authenticated_headers(api_token)) + { headers: authenticated_headers(api_token) }) .and_return(failed_follow_response_double( host, project_slug, api_token ))) diff --git a/spec/rake_circle_ci/task_sets/checkout_keys_spec.rb b/spec/rake_circle_ci/task_sets/checkout_keys_spec.rb index a1b3242..7bcfd12 100644 --- a/spec/rake_circle_ci/task_sets/checkout_keys_spec.rb +++ b/spec/rake_circle_ci/task_sets/checkout_keys_spec.rb @@ -44,8 +44,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['destroy'] @@ -59,8 +59,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['destroy'] @@ -82,7 +82,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['destroy'] @@ -111,8 +111,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['provision'] @@ -126,8 +126,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['provision'] @@ -149,7 +149,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['provision'] @@ -178,7 +178,7 @@ def define_tasks(opts = {}, &block) ] define_tasks( - checkout_keys: checkout_keys + checkout_keys: ) rake_task = Rake::Task['provision'] @@ -207,7 +207,7 @@ def define_tasks(opts = {}, &block) project_slug = 'gitlab/my-org/my-repo' define_tasks( - project_slug: project_slug + project_slug: ) rake_task = Rake::Task['ensure'] diff --git a/spec/rake_circle_ci/task_sets/environment_variables_spec.rb b/spec/rake_circle_ci/task_sets/environment_variables_spec.rb index ac11f05..03cf317 100644 --- a/spec/rake_circle_ci/task_sets/environment_variables_spec.rb +++ b/spec/rake_circle_ci/task_sets/environment_variables_spec.rb @@ -42,8 +42,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['destroy'] @@ -57,8 +57,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['destroy'] @@ -80,7 +80,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['destroy'] @@ -110,8 +110,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['provision'] @@ -125,8 +125,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['provision'] @@ -148,7 +148,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['provision'] @@ -172,7 +172,7 @@ def define_tasks(opts = {}, &block) } define_tasks( - environment_variables: environment_variables + environment_variables: ) rake_task = Rake::Task['provision'] @@ -201,7 +201,7 @@ def define_tasks(opts = {}, &block) project_slug = 'gitlab/my-org/my-repo' define_tasks( - project_slug: project_slug + project_slug: ) rake_task = Rake::Task['ensure'] diff --git a/spec/rake_circle_ci/task_sets/project_spec.rb b/spec/rake_circle_ci/task_sets/project_spec.rb index 858f801..24d7a29 100644 --- a/spec/rake_circle_ci/task_sets/project_spec.rb +++ b/spec/rake_circle_ci/task_sets/project_spec.rb @@ -74,8 +74,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['project:follow'] @@ -88,8 +88,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['project:follow'] @@ -110,7 +110,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['project:follow'] @@ -165,8 +165,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['env_vars:destroy'] @@ -179,8 +179,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['env_vars:destroy'] @@ -201,7 +201,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['env_vars:destroy'] @@ -230,8 +230,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['env_vars:provision'] @@ -244,8 +244,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['env_vars:provision'] @@ -265,7 +265,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['env_vars:provision'] @@ -288,7 +288,7 @@ def define_tasks(opts = {}, &block) } define_tasks( - environment_variables: environment_variables + environment_variables: ) rake_task = Rake::Task['env_vars:provision'] @@ -317,7 +317,7 @@ def define_tasks(opts = {}, &block) project_slug = 'gitlab/my-org/my-repo' define_tasks( - project_slug: project_slug + project_slug: ) rake_task = Rake::Task['env_vars:ensure'] @@ -407,8 +407,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['ssh_keys:destroy'] @@ -421,8 +421,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['ssh_keys:destroy'] @@ -442,7 +442,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['ssh_keys:destroy'] @@ -471,8 +471,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['ssh_keys:provision'] @@ -485,8 +485,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['ssh_keys:provision'] @@ -506,7 +506,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['ssh_keys:provision'] @@ -535,7 +535,7 @@ def define_tasks(opts = {}, &block) ] define_tasks( - ssh_keys: ssh_keys + ssh_keys: ) rake_task = Rake::Task['ssh_keys:provision'] @@ -564,7 +564,7 @@ def define_tasks(opts = {}, &block) project_slug = 'gitlab/my-org/my-repo' define_tasks( - project_slug: project_slug + project_slug: ) rake_task = Rake::Task['ssh_keys:ensure'] @@ -655,8 +655,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['checkout_keys:destroy'] @@ -669,8 +669,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['checkout_keys:destroy'] @@ -690,7 +690,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['checkout_keys:destroy'] @@ -719,8 +719,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['checkout_keys:provision'] @@ -733,8 +733,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['checkout_keys:provision'] @@ -754,7 +754,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['checkout_keys:provision'] @@ -782,7 +782,7 @@ def define_tasks(opts = {}, &block) ] define_tasks( - checkout_keys: checkout_keys + checkout_keys: ) rake_task = Rake::Task['checkout_keys:provision'] @@ -811,7 +811,7 @@ def define_tasks(opts = {}, &block) project_slug = 'gitlab/my-org/my-repo' define_tasks( - project_slug: project_slug + project_slug: ) rake_task = Rake::Task['checkout_keys:ensure'] diff --git a/spec/rake_circle_ci/task_sets/ssh_keys_spec.rb b/spec/rake_circle_ci/task_sets/ssh_keys_spec.rb index beef840..e621de1 100644 --- a/spec/rake_circle_ci/task_sets/ssh_keys_spec.rb +++ b/spec/rake_circle_ci/task_sets/ssh_keys_spec.rb @@ -42,8 +42,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['destroy'] @@ -56,8 +56,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['destroy'] @@ -77,7 +77,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['destroy'] @@ -106,8 +106,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['provision'] @@ -120,8 +120,8 @@ def define_tasks(opts = {}, &block) api_token = 'some-api-token' define_tasks( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) rake_task = Rake::Task['provision'] @@ -141,7 +141,7 @@ def define_tasks(opts = {}, &block) base_url = 'https://private.circleci.net/api' define_tasks( - base_url: base_url + base_url: ) rake_task = Rake::Task['provision'] @@ -170,7 +170,7 @@ def define_tasks(opts = {}, &block) ] define_tasks( - ssh_keys: ssh_keys + ssh_keys: ) rake_task = Rake::Task['provision'] @@ -199,7 +199,7 @@ def define_tasks(opts = {}, &block) project_slug = 'gitlab/my-org/my-repo' define_tasks( - project_slug: project_slug + project_slug: ) rake_task = Rake::Task['ensure'] diff --git a/spec/rake_circle_ci/tasks/checkout_keys/destroy_spec.rb b/spec/rake_circle_ci/tasks/checkout_keys/destroy_spec.rb index 1b5464d..deb0c75 100644 --- a/spec/rake_circle_ci/tasks/checkout_keys/destroy_spec.rb +++ b/spec/rake_circle_ci/tasks/checkout_keys/destroy_spec.rb @@ -81,8 +81,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -90,8 +90,8 @@ def define_task(opts = {}, &block) allow(client).to(receive(:delete_checkout_keys)) define_task( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) Rake::Task['checkout_keys:destroy'].invoke diff --git a/spec/rake_circle_ci/tasks/checkout_keys/ensure_spec.rb b/spec/rake_circle_ci/tasks/checkout_keys/ensure_spec.rb index e3009aa..ee7c73a 100644 --- a/spec/rake_circle_ci/tasks/checkout_keys/ensure_spec.rb +++ b/spec/rake_circle_ci/tasks/checkout_keys/ensure_spec.rb @@ -52,7 +52,7 @@ def define_task(opts = {}, &block) project_slug = 'github/org/repo' define_task( - project_slug: project_slug, + project_slug:, argument_names: %i[thing1 thing2] ) diff --git a/spec/rake_circle_ci/tasks/checkout_keys/provision_spec.rb b/spec/rake_circle_ci/tasks/checkout_keys/provision_spec.rb index b37ac23..5f1745c 100644 --- a/spec/rake_circle_ci/tasks/checkout_keys/provision_spec.rb +++ b/spec/rake_circle_ci/tasks/checkout_keys/provision_spec.rb @@ -118,8 +118,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -127,8 +127,8 @@ def define_task(opts = {}, &block) allow(client).to(receive(:create_checkout_key)) define_task( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, checkout_keys: [ { type: :deploy_key }, { type: :github_user_key } diff --git a/spec/rake_circle_ci/tasks/environment_variables/destroy_spec.rb b/spec/rake_circle_ci/tasks/environment_variables/destroy_spec.rb index 8650d93..9db9038 100644 --- a/spec/rake_circle_ci/tasks/environment_variables/destroy_spec.rb +++ b/spec/rake_circle_ci/tasks/environment_variables/destroy_spec.rb @@ -86,8 +86,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -95,9 +95,9 @@ def define_task(opts = {}, &block) allow(client).to(receive(:delete_env_vars)) define_task( - project_slug: project_slug, - api_token: api_token, - environment_variables: environment_variables + project_slug:, + api_token:, + environment_variables: ) Rake::Task['env_vars:destroy'].invoke diff --git a/spec/rake_circle_ci/tasks/environment_variables/ensure_spec.rb b/spec/rake_circle_ci/tasks/environment_variables/ensure_spec.rb index 2ec8af5..578dc8b 100644 --- a/spec/rake_circle_ci/tasks/environment_variables/ensure_spec.rb +++ b/spec/rake_circle_ci/tasks/environment_variables/ensure_spec.rb @@ -52,7 +52,7 @@ def define_task(opts = {}, &block) project_slug = 'github/org/repo' define_task( - project_slug: project_slug, + project_slug:, argument_names: %i[thing1 thing2] ) diff --git a/spec/rake_circle_ci/tasks/environment_variables/provision_spec.rb b/spec/rake_circle_ci/tasks/environment_variables/provision_spec.rb index 464d056..0b12bf0 100644 --- a/spec/rake_circle_ci/tasks/environment_variables/provision_spec.rb +++ b/spec/rake_circle_ci/tasks/environment_variables/provision_spec.rb @@ -99,8 +99,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -108,9 +108,9 @@ def define_task(opts = {}, &block) allow(client).to(receive(:create_env_var)) define_task( - project_slug: project_slug, - api_token: api_token, - environment_variables: environment_variables + project_slug:, + api_token:, + environment_variables: ) Rake::Task['env_vars:provision'].invoke diff --git a/spec/rake_circle_ci/tasks/projects/follow_spec.rb b/spec/rake_circle_ci/tasks/projects/follow_spec.rb index a9e551a..a2be421 100644 --- a/spec/rake_circle_ci/tasks/projects/follow_spec.rb +++ b/spec/rake_circle_ci/tasks/projects/follow_spec.rb @@ -80,8 +80,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -89,8 +89,8 @@ def define_task(opts = {}, &block) allow(client).to(receive(:follow_project)) define_task( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) Rake::Task['project:follow'].invoke diff --git a/spec/rake_circle_ci/tasks/ssh_keys/destroy_spec.rb b/spec/rake_circle_ci/tasks/ssh_keys/destroy_spec.rb index 43cc18d..2090ba2 100644 --- a/spec/rake_circle_ci/tasks/ssh_keys/destroy_spec.rb +++ b/spec/rake_circle_ci/tasks/ssh_keys/destroy_spec.rb @@ -81,8 +81,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -90,8 +90,8 @@ def define_task(opts = {}, &block) allow(client).to(receive(:delete_ssh_keys)) define_task( - project_slug: project_slug, - api_token: api_token + project_slug:, + api_token: ) Rake::Task['ssh_keys:destroy'].invoke diff --git a/spec/rake_circle_ci/tasks/ssh_keys/ensure_spec.rb b/spec/rake_circle_ci/tasks/ssh_keys/ensure_spec.rb index a84a9b1..3a16da4 100644 --- a/spec/rake_circle_ci/tasks/ssh_keys/ensure_spec.rb +++ b/spec/rake_circle_ci/tasks/ssh_keys/ensure_spec.rb @@ -52,7 +52,7 @@ def define_task(opts = {}, &block) project_slug = 'github/org/repo' define_task( - project_slug: project_slug, + project_slug:, argument_names: %i[thing1 thing2] ) diff --git a/spec/rake_circle_ci/tasks/ssh_keys/provision_spec.rb b/spec/rake_circle_ci/tasks/ssh_keys/provision_spec.rb index cf08a2d..ab99cda 100644 --- a/spec/rake_circle_ci/tasks/ssh_keys/provision_spec.rb +++ b/spec/rake_circle_ci/tasks/ssh_keys/provision_spec.rb @@ -121,8 +121,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -130,11 +130,11 @@ def define_task(opts = {}, &block) allow(client).to(receive(:create_ssh_key)) define_task( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, ssh_keys: [ - { private_key: private_key, hostname: hostname1 }, - { private_key: private_key, hostname: hostname2 } + { private_key:, hostname: hostname1 }, + { private_key:, hostname: hostname2 } ] ) @@ -162,8 +162,8 @@ def define_task(opts = {}, &block) allow(RakeCircleCI::Client) .to(receive(:new) .with(hash_including( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, base_url: 'https://circleci.com/api' )) .and_return(client)) @@ -171,8 +171,8 @@ def define_task(opts = {}, &block) allow(client).to(receive(:create_ssh_key)) define_task( - project_slug: project_slug, - api_token: api_token, + project_slug:, + api_token:, ssh_keys: [ { private_key: private_key1, hostname: hostname1 }, { private_key: private_key2 }