Merge pull request uyuni-project#435 from nodeg/aruba

Author: nodeg

Gemfile.lock

@@ -3,28 +3,28 @@ PATH
   specs:
     tetra (2.0.7)
       clamp (~> 1.3.2)
-      erb (~> 4.0.3)
+      erb (~> 6.0)
       json_pure (>= 2.6.3, < 2.9.0)
       open4 (~> 1.3.4)
       rexml (>= 3.2.9, < 3.5.0)
-      rubyzip (>= 2.3.2, < 2.5.0)
+      rubyzip (~> 3.2)
       text (~> 1.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.6.2)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    aruba (2.3.3)
+      bundler (>= 1.17)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 8.0, < 11.0)
+      rspec-expectations (>= 3.4, < 5.0)
+      thor (~> 1.0)
     ast (2.4.3)
     base64 (0.3.0)
     bigdecimal (4.0.1)
     builder (3.3.0)
-    cgi (0.5.1)
-    childprocess (5.1.0)
-      logger (~> 1.5)
     clamp (1.3.2)
+    contracts (0.17.3)
     cucumber (10.2.0)
       base64 (~> 0.2)
       builder (~> 3.2)
@@ -52,8 +52,7 @@ GEM
     cucumber-tag-expressions (8.1.0)
     diff-lcs (1.6.2)
     docile (1.4.1)
-    erb (4.0.4)
-      cgi (>= 0.3.3)
+    erb (6.0.1)
     ffi (1.17.3)
     ffi (1.17.3-aarch64-linux-gnu)
     ffi (1.17.3-aarch64-linux-musl)
@@ -75,7 +74,7 @@ GEM
     multi_test (1.1.0)
     open4 (1.3.4)
     parallel (1.27.0)
-    parser (3.3.10.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
     prism (1.8.0)
@@ -118,7 +117,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     ruby-progressbar (1.13.0)
-    rubyzip (2.4.1)
+    rubyzip (3.2.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -129,6 +128,7 @@ GEM
       ffi (~> 1.1)
       memoist3 (~> 1.0.0)
     text (1.3.1)
+    thor (1.5.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
@@ -147,24 +147,23 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  aruba (~> 0.6.2)
-  rake (~> 13.3.0)
-  rspec (~> 3.13.0)
+  aruba (~> 2.3)
+  rake (~> 13.3)
+  rspec (~> 3.13)
   rubocop (~> 1.82.1)
   rubocop-rake (~> 0.7.1)
   rubocop-rspec (~> 3.9.0)
-  simplecov (~> 0.22.0)
+  simplecov (~> 0.22)
   tetra!
 
 CHECKSUMS
-  aruba (0.6.2) sha256=7c518ca72da37dc966c6a2f589d9953ab7576a43332b7bac38949d06f5009842
+  aruba (2.3.3) sha256=837a2f023368a75a38ad9be227e9738ab9af7df3b3f35afd8fb5fc5f7a93f1d4
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
-  cgi (0.5.1) sha256=e93fcafc69b8a934fe1e6146121fa35430efa8b4a4047c4893764067036f18e9
-  childprocess (5.1.0) sha256=9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec
   clamp (1.3.2) sha256=4f6a99a8678d51abbf1650263a74d1ac50939edc11986271431d2e03a0d7a022
+  contracts (0.17.3) sha256=e72e626413ea47099becb7b5683beb1c2ea902c69f5bad55c9258fe2b48314d7
   cucumber (10.2.0) sha256=fdedbd31ecf40858b60f04853f2aa15c44f5c30bbac29c6a227fa1e7005a8158
   cucumber-ci-environment (11.0.0) sha256=0df79a9e1d0b015b3d9def680f989200d96fef206f4d19ccf86a338c4f71d1e2
   cucumber-core (16.1.1) sha256=d3aaa80a1ee2865f63f1a21ef496129f675af9099993b9af9608c4ef8ae26b89
@@ -175,7 +174,7 @@ CHECKSUMS
   cucumber-tag-expressions (8.1.0) sha256=9bd8c4b6654f8e5bf2a9c99329b6f32136a75e50cd39d4cfb3927d0fa9f52e21
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
   docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
-  erb (4.0.4) sha256=de116e106205c46bc01918789b611aaad1328dcc6e9f12cf8cd2cc60ef619717
+  erb (6.0.1) sha256=28ecdd99c5472aebd5674d6061e3c6b0a45c049578b071e5a52c2a7f13c197e5
   ffi (1.17.3) sha256=0e9f39f7bb3934f77ad6feab49662be77e87eedcdeb2a3f5c0234c2938563d4c
   ffi (1.17.3-aarch64-linux-gnu) sha256=28ad573df26560f0aedd8a90c3371279a0b2bd0b4e834b16a2baa10bd7a97068
   ffi (1.17.3-aarch64-linux-musl) sha256=020b33b76775b1abacc3b7d86b287cef3251f66d747092deec592c7f5df764b2
@@ -197,7 +196,7 @@ CHECKSUMS
   multi_test (1.1.0) sha256=e9e550cdd863fb72becfe344aefdcd4cbd26ebf307847f4a6c039a4082324d10
   open4 (1.3.4) sha256=a1df037310624ecc1ea1d81264b11c83e96d0c3c1c6043108d37d396dcd0f4b1
   parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
-  parser (3.3.10.0) sha256=ce3587fa5cc55a88c4ba5b2b37621b3329aadf5728f9eafa36bbd121462aabd6
+  parser (3.3.10.1) sha256=06f6a725d2cd91e5e7f2b7c32ba143631e1f7c8ae2fb918fc4cebec187e6a688
   prism (1.8.0) sha256=84453a16ef5530ea62c5f03ec16b52a459575ad4e7b9c2b360fd8ce2c39c1254
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
@@ -214,13 +213,14 @@ CHECKSUMS
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
-  rubyzip (2.4.1) sha256=8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615
+  rubyzip (3.2.2) sha256=c0ed99385f0625415c8f05bcae33fe649ed2952894a95ff8b08f26ca57ea5b3c
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
   simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
   sys-uname (1.4.1) sha256=ed2278ec670ee8af5eb5420d3a98e22188051f6241180db7c779993db2739a16
   tetra (2.0.7)
   text (1.3.1) sha256=2fbbbc82c1ce79c4195b13018a87cbb00d762bda39241bb3cdc32792759dd3f4
+  thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
   unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
 

spec/lib/coarse/dry_run_subcommand_spec.rb

@@ -2,48 +2,58 @@
 
 describe "`tetra dry-run`", type: :aruba do
   it "does not start a dry-run if init has not run yet" do
-    run_simple("tetra dry-run")
+    # Expecting failure, so we disable fail_on_error
+    run_command_and_stop("tetra dry-run", fail_on_error: false)
 
-    expect(stderr_from("tetra dry-run")).to include("is not a tetra project directory")
+    expect(last_command_started.stderr).to include("is not a tetra project directory")
   end
 
   it "does a dry-run build" do
-    run_simple("tetra init --no-archive mypackage")
+    run_command_and_stop("tetra init --no-archive mypackage")
     cd("mypackage")
 
-    run_interactive("tetra dry-run")
+    # Interactive Step:
+    # 1. Start the command asynchronously (don't wait yet)
+    run_command("tetra dry-run")
+
+    # 2. Send input to the running process
     type("echo ciao")
     type("echo ciao > ciao.jar")
-    type("\u{0004}") # ^D (Ctrl+D), terminates bash with exit status 0
+    type("\u{0004}") # ^D (Ctrl+D) to exit the shell
+
+    # 3. Wait for the command to finish processing input and exit
+    stop_all_commands
 
-    expect(all_output).to include("Dry-run started")
-    expect(all_output).to include("bash shell")
-    expect(all_output).to include("ciao")
-    expect(all_output).to include("Dry-run finished")
+    # Check output of the interactive session
+    output = last_command_started.output
+    expect(output).to include("Dry-run started")
+    expect(output).to include("bash shell")
+    expect(output).to include("ciao")
+    expect(output).to include("Dry-run finished")
 
     # check that markers were written in git repo
-    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("tetra: dry-run-started")
+    run_command_and_stop("git rev-list --format=%B --max-count=1 HEAD~")
+    expect(last_command_started.stdout).to include("tetra: dry-run-started")
 
-    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("tetra: dry-run-finished")
-    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("tetra: build-script-line: echo ciao")
+    run_command_and_stop("git rev-list --format=%B --max-count=1 HEAD")
+    expect(last_command_started.stdout).to include("tetra: dry-run-finished")
+    expect(last_command_started.stdout).to include("tetra: build-script-line: echo ciao")
   end
 
   it "does a scripted dry-run" do
-    run_simple("tetra init --no-archive mypackage")
+    run_command_and_stop("tetra init --no-archive mypackage")
     cd("mypackage")
 
-    run_interactive("tetra dry-run -s 'echo ciao > ciao.jar'")
+    run_command_and_stop("tetra dry-run -s 'echo ciao > ciao.jar'")
 
-    expect(all_output).to include("Scripted dry-run started")
+    expect(last_command_started.output).to include("Scripted dry-run started")
 
     # check that markers were written in git repo
-    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("tetra: dry-run-started")
+    run_command_and_stop("git rev-list --format=%B --max-count=1 HEAD~")
+    expect(last_command_started.stdout).to include("tetra: dry-run-started")
 
-    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("tetra: dry-run-finished")
-    expect(stdout_from("git rev-list --format=%B --max-count=1 HEAD")).to include("tetra: build-script-line: echo ciao > ciao.jar")
+    run_command_and_stop("git rev-list --format=%B --max-count=1 HEAD")
+    expect(last_command_started.stdout).to include("tetra: dry-run-finished")
+    expect(last_command_started.stdout).to include("tetra: build-script-line: echo ciao > ciao.jar")
   end
 end