From 912c8e834a10b14a0407ed0727ad0a8fa1d19e12 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Tue, 10 Jan 2023 15:00:05 +0100 Subject: [PATCH] CI: Update aruba dependency Signed-off-by: Dominik Gedon --- Gemfile.lock | 67 +++++++++---------- lib/tetra/facades/bash.rb | 2 +- spec/lib/coarse/dry_run_subcommand_spec.rb | 4 +- .../coarse/generate_all_subcommand_spec.rb | 8 +-- .../coarse/generate_spec_subcommand_spec.rb | 2 +- spec/lib/coarse/init_subcommand_spec.rb | 12 ++-- spec/spec_helper.rb | 5 +- tetra.gemspec | 3 +- 8 files changed, 49 insertions(+), 54 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5aa31b4c..29eb605c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,45 +13,42 @@ PATH GEM remote: https://rubygems.org/ specs: - aruba (0.6.2) - childprocess (>= 0.3.6) - cucumber (>= 1.1.1) - rspec-expectations (>= 2.7.0) + aruba (0.8.0) + childprocess (~> 0.5.6) + contracts (~> 0.9) + cucumber (>= 1.3.19) + rspec-expectations (>= 2.99) ast (2.4.2) builder (3.2.4) - cgi (0.3.5) - childprocess (4.1.0) + cgi (0.3.6) + childprocess (0.5.9) + ffi (~> 1.0, >= 1.0.11) clamp (1.3.2) - cucumber (7.1.0) + contracts (0.17) + cucumber (8.0.0) builder (~> 3.2, >= 3.2.4) - cucumber-core (~> 10.1, >= 10.1.0) - cucumber-create-meta (~> 6.0, >= 6.0.1) - cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) - cucumber-gherkin (~> 22.0, >= 22.0.0) - cucumber-html-formatter (~> 17.0, >= 17.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) - cucumber-wire (~> 6.2, >= 6.2.0) - diff-lcs (~> 1.4, >= 1.4.4) - mime-types (~> 3.3, >= 3.3.1) - multi_test (~> 0.1, >= 0.1.2) + cucumber-ci-environment (~> 9.0, >= 9.0.4) + cucumber-core (~> 11.0, >= 11.0.0) + cucumber-cucumber-expressions (~> 15.1, >= 15.1.1) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-html-formatter (~> 19.1, >= 19.1.0) + cucumber-messages (~> 18.0, >= 18.0.0) + diff-lcs (~> 1.5, >= 1.5.0) + mime-types (~> 3.4, >= 3.4.1) + multi_test (~> 1.1, >= 1.1.0) sys-uname (~> 1.2, >= 1.2.2) - cucumber-core (10.1.1) - cucumber-gherkin (~> 22.0, >= 22.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-ci-environment (9.1.0) + cucumber-core (11.0.0) + cucumber-gherkin (~> 23.0, >= 23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) cucumber-tag-expressions (~> 4.1, >= 4.1.0) - cucumber-create-meta (6.0.4) - cucumber-messages (~> 17.1, >= 17.1.1) - sys-uname (~> 1.2, >= 1.2.2) - cucumber-cucumber-expressions (14.0.0) - cucumber-gherkin (22.0.0) - cucumber-messages (~> 17.1, >= 17.1.1) - cucumber-html-formatter (17.0.0) - cucumber-messages (~> 17.1, >= 17.1.0) - cucumber-messages (17.1.1) + cucumber-cucumber-expressions (15.2.0) + cucumber-gherkin (23.0.1) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-html-formatter (19.2.0) + cucumber-messages (~> 18.0, >= 18.0.0) + cucumber-messages (18.0.0) cucumber-tag-expressions (4.1.0) - cucumber-wire (6.2.1) - cucumber-core (~> 10.1, >= 10.1.0) - cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) diff-lcs (1.5.0) docile (1.4.0) erb (4.0.2) @@ -62,7 +59,7 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - multi_test (0.1.2) + multi_test (1.1.0) open4 (1.3.4) parallel (1.22.1) parser (3.2.0.0) @@ -110,12 +107,10 @@ GEM unicode-display_width (2.4.2) PLATFORMS - x86_64-darwin-21 x86_64-darwin-22 - x86_64-linux DEPENDENCIES - aruba (~> 0.6.2) + aruba (~> 0.8.0) rake (~> 13.0.6) rspec (~> 3.12.0) rubocop (~> 1.43.0) diff --git a/lib/tetra/facades/bash.rb b/lib/tetra/facades/bash.rb index b437ff50..e19c6544 100644 --- a/lib/tetra/facades/bash.rb +++ b/lib/tetra/facades/bash.rb @@ -38,7 +38,7 @@ def bash(command = nil) run("bash --rcfile #{bashrc_file.path} -i -c '#{command}'") [command] else - run_interactive("bash --rcfile #{bashrc_file.path} -i") + run("bash --rcfile #{bashrc_file.path} -i") history = File.read(history_file) log.debug "history contents:" log.debug history diff --git a/spec/lib/coarse/dry_run_subcommand_spec.rb b/spec/lib/coarse/dry_run_subcommand_spec.rb index 1fba6c1d..1eb878ce 100644 --- a/spec/lib/coarse/dry_run_subcommand_spec.rb +++ b/spec/lib/coarse/dry_run_subcommand_spec.rb @@ -11,7 +11,7 @@ run_simple("tetra init --no-archive mypackage") cd("mypackage") - run_interactive("tetra dry-run") + run("tetra dry-run") type("echo ciao") type("echo ciao > ciao.jar") type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0 @@ -34,7 +34,7 @@ run_simple("tetra init --no-archive mypackage") cd("mypackage") - run_interactive("tetra dry-run -s 'echo ciao > ciao.jar'") + run("tetra dry-run -s 'echo ciao > ciao.jar'") expect(all_output).to include("Scripted dry-run started") diff --git a/spec/lib/coarse/generate_all_subcommand_spec.rb b/spec/lib/coarse/generate_all_subcommand_spec.rb index 19bb4719..6c25b4c0 100644 --- a/spec/lib/coarse/generate_all_subcommand_spec.rb +++ b/spec/lib/coarse/generate_all_subcommand_spec.rb @@ -11,7 +11,7 @@ # first dry-run, all normal @aruba_timeout_seconds = 240 - run_interactive("tetra dry-run --very-very-verbose") + run("tetra dry-run --very-very-verbose") type("mvn package -DskipTests") type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0 @@ -38,7 +38,7 @@ run_simple("tetra patch") # third dry-run succeeds with patch - run_interactive("tetra dry-run") + run("tetra dry-run") type("mvn package -DskipTests") type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0 @@ -81,7 +81,7 @@ # second dry-run, all normal cd(File.join("src", "commons-collections4-4.4-src")) @aruba_timeout_seconds = 240 - run_interactive("tetra dry-run") + run("tetra dry-run") type("mvn package -DskipTests") type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0 @@ -107,7 +107,7 @@ run_simple("tetra patch") # third dry-run succeeds with patch - run_interactive("tetra dry-run") + run("tetra dry-run") type("mvn package -DskipTests") type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0 expect(all_output).to include("[INFO] BUILD SUCCESS") diff --git a/spec/lib/coarse/generate_spec_subcommand_spec.rb b/spec/lib/coarse/generate_spec_subcommand_spec.rb index cd3b0884..80fc62f5 100644 --- a/spec/lib/coarse/generate_spec_subcommand_spec.rb +++ b/spec/lib/coarse/generate_spec_subcommand_spec.rb @@ -16,7 +16,7 @@ expect(output_from("tetra change-sources --no-archive")).to include("New sources committed") @aruba_timeout_seconds = 300 - run_interactive("tetra dry-run") + run("tetra dry-run") type("mvn package -DskipTests") type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0 diff --git a/spec/lib/coarse/init_subcommand_spec.rb b/spec/lib/coarse/init_subcommand_spec.rb index 95117efb..66689529 100644 --- a/spec/lib/coarse/init_subcommand_spec.rb +++ b/spec/lib/coarse/init_subcommand_spec.rb @@ -49,9 +49,11 @@ check_directory_presence([".git", "kit", "src", "packages"], true) check_directory_presence([File.join("src", "commons-collections4-4.4-src")], true) - check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true) + # check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true) + expect([File.join("src", "commons-collections4-4.4-src", "pom.xml")]).to be_an_existing_file - check_file_presence([File.join("packages", "commons-collections", "commons-collections.zip")], true) + # check_file_presence([File.join("packages", "commons-collections", "commons-collections.zip")], true) + expect([File.join("packages", "commons-collections", "commons-collections.zip")]).to be_an_existing_file run_simple("git rev-list --format=%B --max-count=1 HEAD") expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("Inital sources added from archive") @@ -75,9 +77,11 @@ check_directory_presence([".git", "kit", "src", "packages"], true) check_directory_presence([File.join("src", "commons-collections4-4.4-src")], true) - check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true) + # check_file_presence([File.join("src", "commons-collections4-4.4-src", "pom.xml")], true) - check_file_presence([File.join("packages", "commons-collections", "commons-collections.tar.gz")], true) + # check_file_presence([File.join("packages", "commons-collections", "commons-collections.tar.gz")], true) + expect([File.join("src", "commons-collections4-4.4-src", "pom.xml")]).to be_an_existing_file + expect([File.join("packages", "commons-collections", "commons-collections.tar.gz")]).to be_an_existing_file run_simple("git rev-list --format=%B --max-count=1 HEAD") expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("Inital sources added from archive") diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ee82f6f5..2f0ba018 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,10 +18,7 @@ end # set up aruba API - config.before(:each) do - restore_env - clean_current_dir - end + config.before(:each) { setup_aruba } end module Tetra diff --git a/tetra.gemspec b/tetra.gemspec index 28ac65c0..4cc91d55 100644 --- a/tetra.gemspec +++ b/tetra.gemspec @@ -23,10 +23,9 @@ Gem::Specification.new do |s| s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) } s.require_paths = ["lib"] - s.required_ruby_version = '>= 2.7.0' - s.add_development_dependency "aruba", "~> 0.6.2" + s.add_development_dependency "aruba", "~> 0.8.0" s.add_development_dependency "simplecov", "~> 0.22.0" s.add_development_dependency "rake", "~> 13.0.6" s.add_development_dependency "rspec", "~> 3.12.0"