Skip to content

Commit

Permalink
CI: Update aruba dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Dominik Gedon <[email protected]>
  • Loading branch information
nodeg committed Dec 20, 2024
1 parent ecae40d commit b75d65b
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 24 deletions.
11 changes: 6 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ 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)
bigdecimal (3.1.8)
builder (3.3.0)
Expand Down Expand Up @@ -138,7 +139,7 @@ PLATFORMS
x86_64-linux-musl

DEPENDENCIES
aruba (~> 0.6.2)
aruba (~> 0.8.0)
rake (~> 13.2.0)
rspec (~> 3.13.0)
rubocop (~> 1.69.1)
Expand Down
2 changes: 1 addition & 1 deletion lib/tetra/facades/bash.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/coarse/dry_run_subcommand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")

Expand Down
8 changes: 4 additions & 4 deletions spec/lib/coarse/generate_all_subcommand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -81,7 +81,7 @@
# second dry-run, all normal
cd(File.join("src", Tetra::CCOLLECTIONS))
@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

Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/coarse/generate_spec_subcommand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 10 additions & 6 deletions spec/lib/coarse/init_subcommand_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@
cd("commons-collections")
check_directory_presence([".git", "kit", "src", "packages"], true)

check_directory_presence([File.join("src", Tetra::CCOLLECTIONS)], true)
check_file_presence([File.join("src", Tetra::CCOLLECTIONS, "pom.xml")], true)
check_directory_presence([File.join("src", Tetra::CCOLLECTIONS))], true)
# check_file_presence([File.join("src", Tetra::CCOLLECTIONS), "pom.xml")], true)
expect([File.join("src", Tetra::CCOLLECTIONS), "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")
Expand All @@ -74,10 +76,12 @@
cd("commons-collections")
check_directory_presence([".git", "kit", "src", "packages"], true)

check_directory_presence([File.join("src", Tetra::CCOLLECTIONS)], true)
check_file_presence([File.join("src", Tetra::CCOLLECTIONS, "pom.xml")], true)
check_directory_presence([File.join("src", Tetra::CCOLLECTIONS))], true)
# check_file_presence([File.join("src", Tetra::CCOLLECTIONS), "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", Tetra::CCOLLECTIONS), "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")
Expand Down
5 changes: 1 addition & 4 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tetra.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Gem::Specification.new do |s|

s.required_ruby_version = '>= 3.1.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.2.0"
s.add_development_dependency "rspec", "~> 3.13.0"
Expand Down

0 comments on commit b75d65b

Please sign in to comment.