#66 Update Ruby dependencies

.github/workflows/kotlin-tests.yml

@@ -1,5 +1,9 @@
 name: Kotlin Tests
-on: [push, pull_request]
+on:
+ push:
+ branches:
+ - main
+ pull_request:
 jobs:
  test:
  runs-on: ubuntu-latest # Assuming Kotlin projects can be built on Linux
@@ -21,7 +25,6 @@ jobs:
  ${{ runner.os }}-gradle-
  - uses: ruby/setup-ruby@v1
  with:
- ruby-version: '3.2'
  bundler-cache: true # Runs 'bundle install' and caches installed gems automatically
  - name: Generate Kotlin Code & Run Tests
  run: bundle exec rake test_kotlin

.github/workflows/push.yml → .github/workflows/run-tests.yml

@@ -3,10 +3,9 @@ on:
  push:
  branches:
  - main
+ pull_request:
 jobs:
  test:
- env:
- CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
  strategy:
  fail-fast: false
  matrix:
@@ -20,5 +19,5 @@ jobs:
  with:
  ruby-version: ${{ matrix.ruby }}
  bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- - name: Run tests
+ - name: Run tests and linter
  run: bundle exec rake

.github/workflows/swift-tests.yml

@@ -1,5 +1,9 @@
 name: Swift Tests
-on: [push, pull_request]
+on:
+ push:
+ branches:
+ - main
+ pull_request:
 jobs:
  test:
  runs-on: macos-latest
@@ -8,7 +12,6 @@ jobs:
  - uses: actions/checkout@v2
  - uses: ruby/setup-ruby@v1
  with:
- ruby-version: '3.1'
  bundler-cache: true # Runs 'bundle install' and caches installed gems automatically
  - name: Generate Swift Code & Run Tests
  run: bundle exec rake test_swift

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.3

Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in arkana.gemspec
 gemspec
 
+gem "bundler", "< 2.5" # 2.4.x is the latest that supports Ruby 2.7, which is the minimum required by Arkana
 gem "rake"
 gem "rspec"
 gem "rubocop"

Gemfile.lock

@@ -10,67 +10,61 @@ GEM
  remote: https://rubygems.org/
  specs:
  ast (2.4.2)
- base64 (0.1.1)
- diff-lcs (1.5.0)
+ diff-lcs (1.5.1)
  docile (1.4.0)
  dotenv (2.8.1)
- json (2.6.3)
+ json (2.7.2)
  language_server-protocol (3.17.0.3)
- parallel (1.23.0)
- parser (3.2.2.3)
+ parallel (1.25.1)
+ parser (3.3.3.0)
  ast (~> 2.4.1)
  racc
  pastel (0.8.0)
  tty-color (~> 0.5)
- racc (1.7.1)
+ racc (1.8.0)
  rainbow (3.1.1)
- rake (13.0.6)
- regexp_parser (2.8.1)
- 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)
+ rake (13.2.1)
+ regexp_parser (2.9.2)
+ rexml (3.3.0)
+ 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.0)
  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.56.3)
- base64 (~> 0.1.1)
+ rspec-support (~> 3.13.0)
+ rspec-support (3.13.1)
+ rubocop (1.64.1)
  json (~> 2.3)
  language_server-protocol (>= 3.17.0)
  parallel (~> 1.10)
- parser (>= 3.2.2.3)
+ parser (>= 3.3.0.2)
  rainbow (>= 2.2.2, < 4.0)
  regexp_parser (>= 1.8, < 3.0)
  rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.28.1, < 2.0)
+ rubocop-ast (>= 1.31.1, < 2.0)
  ruby-progressbar (~> 1.7)
  unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.29.0)
- parser (>= 3.2.1.0)
- rubocop-capybara (2.18.0)
- rubocop (~> 1.41)
- rubocop-factory_bot (2.23.1)
- rubocop (~> 1.33)
+ rubocop-ast (1.31.3)
+ parser (>= 3.3.1.0)
  rubocop-rake (0.6.0)
  rubocop (~> 1.0)
- rubocop-rspec (2.24.0)
- rubocop (~> 1.33)
- rubocop-capybara (~> 2.17)
- rubocop-factory_bot (~> 2.22)
+ rubocop-rspec (3.0.1)
+ rubocop (~> 1.61)
  ruby-progressbar (1.13.0)
  simplecov (0.22.0)
  docile (~> 1.1)
  simplecov-html (~> 0.11)
  simplecov_json_formatter (~> 0.1)
  simplecov-html (0.12.3)
  simplecov_json_formatter (0.1.4)
+ strscan (3.1.0)
  tty-color (0.6.0)
  tty-cursor (0.7.1)
  tty-prompt (0.23.1)
@@ -80,19 +74,20 @@ GEM
  tty-cursor (~> 0.7)
  tty-screen (~> 0.8)
  wisper (~> 2.0)
- tty-screen (0.8.1)
- unicode-display_width (2.4.2)
+ tty-screen (0.8.2)
+ unicode-display_width (2.5.0)
  wisper (2.0.1)
  yaml (0.3.0)
 
 PLATFORMS
- arm64-darwin-21
+ arm64-darwin-23
  ruby
  x86_64-darwin-19
  x86_64-linux
 
 DEPENDENCIES
  arkana!
+ bundler (< 2.5)
  rake
  rspec
  rubocop
@@ -102,4 +97,4 @@ DEPENDENCIES
  tty-prompt
 
 BUNDLED WITH
- 2.2.32
+ 2.3.27

lib/arkana/encoder.rb

@@ -26,10 +26,9 @@ def self.encode(string, cipher)
  result << (byte ^ cipher[index % cipher.length]) # XOR operation with a value of the cipher array.
  end
 
- encoded_key = []
- result.each do |element|
+ encoded_key = result.map do |element|
  # Warning: this might be specific to Swift implementation. When generating code for other languages, beware.
- encoded_key << format("%#x", element) # Format the binary number to "0xAB" format.
+ format("%#x", element) # Format the binary number to "0xAB" format.
  end
 
  encoded_key.join(", ")

lib/arkana/models/salt.rb

@@ -10,10 +10,9 @@ class Salt
 
  def initialize(raw:)
  @raw = raw
- formatted_salt = []
- raw.each do |element|
+ formatted_salt = raw.map do |element|
  # Warning: this might be specific to Swift implementation. When generating code for other languages, beware.
- formatted_salt << format("%#x", element)
+ format("%#x", element)
  end
  @formatted = formatted_salt.join(", ")
  end

spec/models/config_spec.rb

@@ -55,7 +55,7 @@
  end
  end
 
- describe `#environment_keys` do
+ describe "#environment_keys" do
  context "when there are no environments" do
  subject { super().environment_keys }
 
@@ -130,7 +130,7 @@
  end
  end
 
- describe `#all_keys` do
+ describe "#all_keys" do
  it "is not empty" do
  expect(subject.all_keys).not_to be_empty
  end

spec/models/secret_spec.rb

@@ -18,7 +18,7 @@
  end
  end
 
- describe `#environment` do
+ describe "#environment" do
  subject { super().environment }
 
  context "when key is equal to protocol_key" do