markdown_exec 2.7.5 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0463a06b2bac6770c2443819a9cedee15e7aa3404649f077924074fd3c639ab
-  data.tar.gz: 0f8b10556113950d468d92cfc11510178d7019d5b0e1c3f7ba0f61fdcab57414
+  metadata.gz: d752af0db5e1c1a770b64f9341c3d08e1e9bc8612230a9cb44ddc7fddc4c3051
+  data.tar.gz: 5ba8524b3323bd8333b82a5d0607fbb9db59a5157a1c7ae0564b3f624f26addd
 SHA512:
-  metadata.gz: 32d0e93870011249641e929ab4c6963905321301b508831ef5b56f7be925f69857e0bab3b4f030cfe39f6a8dff83376a099bd568616df872b8d4b7291c2f5227
-  data.tar.gz: aad2c863dd5bf6da344342e9336f6efa7045ec51d1471581b42bd26f42c1b1368d380b5f64781fb653154fd45f5f47db4d1fd7f22c8cc2f78c31a4781307b0dc
+  metadata.gz: 29b210e56b46a1edf099c02267e2b3c7cdae6701f7ee99d5a946d06eea7272da3534765110ec36a6de017a10d0f4833c9075c27dacb0cec8b050192d3892d748
+  data.tar.gz: e73cd906ce9035c8c78d2e301866af4a76bc7a730c5109fc8cc59ecf64679cb578fb04b324e700df064886d250c394c441f77850b9e21230d346d08bd92a9a5f

data/.rubocop.yml

@@ -97,6 +97,9 @@ Style/GlobalVars:
 Style/IfUnlessModifier: # 2024-08 suggests lines that are too long
   Enabled: false
 
+Style/KeywordParametersOrder:
+  Enabled: false
+
 Style/Lambda:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [2.8.0] - 2025-02-10
+
+### Added
+
+- Block type `ux` to facilitate the evaluation, display, and editing of shell variables.
+  The body of the `ux` block is in YAML.
+
+  A valid shell variable name is required as block key `name`. The remaining block keys are optional.
+
+  When the block is executed, its value is computed from the `default`, `exec`, `prompt`, `transform`, and `validate` keys and its output is assigned to the shell variable.
+
+  When a document is loaded, if one or more block names match `document_load_ux_block_name`, they are executed.
+  `ux_auto_load_force_default` limits the setting of the shell variable resulting from the execution of blocks executed at this time.
+
+  When an `ux` block is executed (after initial document load):
+  If the `default` value is the `exec` symbol, the command in the `exec` key is executed and its output is processed.
+  Else if the `allowed` value has one or more items, the user must pick from one of the items.
+  Else if the `prompt` value exists, the user must enter a value or nothing for the `default` value. The user is prompted with `prompt_ux_enter_a_value`.
+  Else the `default` value, as a string, is processed.
+
+  The output is validated/parsed by the regular expression in `validate`.
+  If the string matches, named groups are formatted with `menu_ux_row_format` and assigned to the shell variable.
+
+  The default `menu_ux_row_format` looks like a shell variable assignment.
+  If the output of `menu_ux_row_format` matches an immediately preceding table, the row is merged into that table.
+  Else the output is decorated with `menu_ux_color`.
+- Improve final output of `test` Rake task so failures are visible.
+
 ## [2.7.5] - 2025-02-02
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_exec (2.7.5)
+    markdown_exec (2.8.1)
       clipboard (~> 1.3.6)
       open3 (~> 0.1.1)
       optparse (~> 0.1.1)

data/Rakefile

@@ -155,9 +155,30 @@ end
 
 desc 'test'
 task :test do
-  system 'bundle exec rspec'
+  success = true
+  
+  # Run all tests and track failures
+  rspec_success = system('bundle exec rspec')
+  success = false unless rspec_success
+  
   Rake::Task['minitest'].invoke
+  minitest_success = $?.success?
+  success = false unless minitest_success
+  
   Rake::Task['bats'].invoke
+  bats_success = $?.success?
+  success = false unless bats_success
+  
+  # Report failures and exit with non-zero status if any test failed
+  unless success
+    failed_tests = []
+    failed_tests << 'RSpec' unless rspec_success
+    failed_tests << 'Minitest' unless minitest_success
+    failed_tests << 'Bats' unless bats_success
+    
+    puts "\nThe following test suites failed: #{failed_tests.join(', ')}"
+    exit 1
+  end
 end
 
 private

data/bats/block-type-ux-auto.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Initial values' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-auto.md \
+   'v1 = _v2 = _v3 = 12_v4 = 21_v5 = markdown_exec_v6 = 31'
+}

data/bats/block-type-ux-exec.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Output of executed commands as initial value' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-exec.md \
+   "ux0=_ux1=Unknown_ux2=markdown_exec_ux3=markdown_exec_ux4=Xform: 'markdown'"
+}

data/bats/block-type-ux-row-format.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Row format merges with prior table' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-row-format.md \
+   '  | Variable  | Value            | Prompt              |_  | --------- | ---------------- | ------------------- |_  | Species   | Pongo tapanulien | New species?    |_ | Name: Gen | Value: Pongo     | Prompt: New genus? |_  | Family    | Hominidae        | Enter a value:  |'
+}

data/bats/block-type-ux-transform.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Transformed output of executed commands' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/block-type-ux-transform.md \
+   '_Execution output has a trailing newline._Var0=markdown_exec_00000000  6d 61 72 6b 64 6f 77 6e  5f 65 78 65 63 0a        |markdown_exec.|__With validate and transform, output has no newline._Var1=markdown_exec_00000000  6d 61 72 6b 64 6f 77 6e  5f 65 78 65 63           |markdown_exec|__With transform :chomp, output has no newline._Var2=markdown_exec_00000000  6d 61 72 6b 64 6f 77 6e  5f 65 78 65 63           |markdown_exec|__With transform :upcase, output is in upper case w/ newline._Var3=MARKDOWN_EXEC_00000000  4d 41 52 4b 44 4f 57 4e  5f 45 58 45 43 0a        |MARKDOWN_EXEC.|'
+}

data/bats/command-substitution.bats

@@ -4,5 +4,5 @@ load 'test_helper'
 
 @test 'Command substitution' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/command-substitution.md \
-   'CURRENT BASE NAME IS: MARKDOWN_EXEC_current base name is: markdown_exec_current base name is: markdown_exec_| current base name |_| ----------------- |_| markdown_exec     |_: notice the string is not expanded in Shell block types (names or body)._  echo "current base name is now $(basename `pwd`)"__load: file_markdown_exec.sh'
+   'CURRENT BASE NAME IS: MARKDOWN_EXEC_current base name is: markdown_exec_current base name is: markdown_exec_| current base name |_| ----------------- |_| markdown_exec     |_: notice the string is not expanded in Shell block types (names or body)._  echo "current base name is now $(basename `pwd`)"__load: file_markdown_exec.sh_Status not zero: $(err)'
 }

data/bats/line-wrapping.bats

@@ -4,5 +4,5 @@ load 'test_helper'
 
 @test 'Text and Headings' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/line-wrapping.md \
-   "          DEMO WRAPPING LONG LINES__MDE detects the screen's dimensions:_height (lines) and width (characters)__Normal document text is displayed as_disabled menu lines. The width of these_lines is limited according to the screen's_width.__Test Indented Lines__  Indented with two spaces, this line_  should wrap in an aesthetically pleasing_  way.__    Indented with a tab, this line should_    wrap in an aesthetically pleasing way.__  SPECIES GENUS FAMILY ORDER CLASS PHYLUM_               KINGDOM DOMAIN_species genus family order class phylum_kingdom domain"
+   "         DEMO WRAPPING LONG LINES__MDE detects the screen's dimensions:_height (lines) and width (characters)__Normal document text is displayed as_disabled menu lines. The width of these_lines is limited according to the_screen's width.__Test Indented Lines__  Indented with two spaces, this line_  should wrap in an aesthetically_  pleasing way.__    Indented with a tab, this line should_    wrap in an aesthetically pleasing_    way.__  SPECIES GENUS FAMILY ORDER CLASS PHYLUM_              KINGDOM DOMAIN_species genus family order class phylum_kingdom domain"
 }

data/bats/table-column-truncate.bats

@@ -0,0 +1,8 @@
+#!/usr/bin/env bats
+
+load 'test_helper'
+
+@test 'Tables - truncate columns' {
+  spec_mde_xansi_dname_doc_blocks_expect docs/dev/table-column-truncate.md \
+   'DEMONSTRATE TRUNCATION OF TEXT IN TABLE CELLS__| Common Name  | Species      | Genus |  Family | Year Di |_| ------------ | ------------ | ----- | ------- | ------- |_| Tapanuli Ora | Pongo tapanu | Pongo | Hominid |  2017   |_| Psychedelic  | Histiophryne | Histi | Antenna |  2009   |_| Ruby Seadrag | Phyllopteryx | Phyll | Syngnat |  2015   |_| Illacme tobi | Illacme tobi | Illac | Siphono |  2016   |_| Spiny Dandel | Taraxacum ja | Tarax | Asterac |  2022   |__'
+}

data/bats/table.bats

@@ -4,7 +4,7 @@ load 'test_helper'
 
 @test 'Tables - indented' {
   spec_mde_xansi_dname_doc_blocks_expect docs/dev/table-indent.md \
-   'DEMONSTRATE TABLE INDENTATION__Table flush at left._Centered columns._|     Common Name      |          Species          |    Genus     |    Family     | Year Discovered |_| -------------------- | ------------------------- | ------------ | ------------- | --------------- |_|  Tapanuli Orangutan  |    Pongo tapanuliensis    |    Pongo     |   Hominidae   |      2017       |_| Psychedelic Frogfish | Histiophryne psychedelica | Histiophryne | Antennariidae |      2009       |_|    Ruby Seadragon    |   Phyllopteryx dewysea    | Phyllopteryx | Syngnathidae  |      2015       |__  Table indented with two spaces._  Left-justified columns._  | Common Name                | Species        | Genus   | Family          | Year Discovered |_  | -------------------------- | -------------- | ------- | --------------- | --------------- |_  | Illacme tobini (Millipede) | Illacme tobini | Illacme | Siphonorhinidae | 2016            |__    Table indented with one tab._    Right-justified columns._    |     Common Name |             Species |     Genus |     Family | Year Discovered |_    | --------------- | ------------------- | --------- | ---------- | --------------- |_    | Spiny Dandelion | Taraxacum japonicum | Taraxacum | Asteraceae |            2022 |'
+   'DEMONSTRATE TABLE INDENTATION__Table flush at left._Centered columns._|    Common Name     |        Species         |   Genus    |   Family    | Year Discover |_| ------------------ | ---------------------- | ---------- | ----------- | ------------- |_| Tapanuli Orangutan |  Pongo tapanuliensis   |   Pongo    |  Hominidae  |     2017      |_| Psychedelic Frogfi | Histiophryne psychedel | Histiophry | Antennariid |     2009      |_|   Ruby Seadragon   |  Phyllopteryx dewysea  | Phyllopter | Syngnathida |     2015      |__  Table indented with two spaces._  Left-justified columns._  | Common Name               | Species       | Genus  | Family         | Year Discovere |_  | ------------------------- | ------------- | ------ | -------------- | -------------- |_  | Illacme tobini (Millipede | Illacme tobin | Illacm | Siphonorhinida | 2016           |__    Table indented with one tab._    Right-justified columns._    |     Common Name |             Species |     Genus |     Family | Year Discovered |_    | --------------- | ------------------- | --------- | ---------- | --------------- |_    | Spiny Dandelion | Taraxacum japonicum | Taraxacum | Asteraceae |            2022 |'
 }
 
 @test 'Tables - invalid' {

data/bin/tab_completion.sh

@@ -13,7 +13,7 @@ __filedirs_all()
 }
 
 _mde_echo_version() {
-  echo "2.7.5"
+  echo "2.8.1"
 }
 
 _mde() {

data/docs/dev/bats-document-configuration.md

@@ -10,6 +10,9 @@ dump_selected_block: false     # Dump selected block
 execute_in_own_window: false
 
 menu_divider_format:
+
+menu_for_saved_lines: false
+
 menu_with_back: false
 menu_with_exit: false
 menu_with_shell: false

data/docs/dev/block-type-ux-auto.md

@@ -0,0 +1,43 @@
+/ v2025-02-08
+/ name only
+```ux
+name: v1
+```
+/ name and default
+/ transform and validate options not applied to default
+```ux
+default: 11
+name: v2
+```
+/ name and default; auto-load
+/ prompt option is ignored during auto-load
+```ux :[document_ux_v3]
+default: 12
+name: v3
+```
+/ name, default, exec; auto-load static
+```ux :[document_ux_v4]
+default: 21
+exec: basename $(pwd)
+name: v4
+```
+/ name, default, exec; auto-load executed `basename $(pwd)`
+/ allowed is ignored by exec
+```ux :[document_ux_v5]
+default: :exec
+exec: basename $(pwd)
+name: v5
+```
+/ name, default, allowed; auto-load static default
+```ux :[document_ux_v6]
+allowed:
+- 32
+- 33
+default: 31
+name: v6
+```
+@import bats-document-configuration.md
+```opts :(document_opts)
+menu_ux_row_format: '%{name} = ${%{name}}'
+ux_auto_load_force_default: true
+```

data/docs/dev/block-type-ux-exec.md

@@ -0,0 +1,42 @@
+/ auto-load block, does not execute command to calculate
+/ click block to calculate
+```ux :[document_ux0]
+exec: basename $(pwd)
+name: ux0
+```
+/ auto-load block and execute command to calculate
+/ click block to recalculate
+```ux :[document_ux1]
+default: Unknown
+exec: basename $(pwd)
+name: ux1
+```
+/ auto-load block and execute command to calculate
+/ click block to recalculate
+```ux :[document_ux2]
+default: :exec
+exec: basename $(pwd)
+name: ux2
+```
+/ required block defining a function used in exec
+```bash :(bash3)
+# function from bash3
+val () { basename $(pwd) ; }
+```
+```ux :[document_ux3] +(bash3)
+default: :exec
+exec: val
+name: ux3
+```
+/ default is computed
+/ output of execution is validated/parsed
+/ parsing is transformed
+```ux :[document_ux4]
+default: :exec
+exec: basename $(pwd)
+name: ux4
+transform: "Xform: '%{name}'"
+validate: |
+  ^(?<name>.*)(_.*)$
+```
+@import bats-document-configuration.md

data/docs/dev/block-type-ux-row-format.md

@@ -0,0 +1,47 @@
+/ v2025-02-08
+| Variable| Value| Prompt
+| -| -| -
+/ auto-load default value
+/ custom prompt
+/ select list
+/ default value
+```ux :[document_ux_Species]
+allowed:
+- Pongo tapanuliensis
+- Histiophryne psychedelica
+- Phyllopteryx dewysea
+default: Pongo tapanuliensis
+name: Species
+prompt: New species?
+```
+/ auto-load default value
+/ cell text is prefixed Name/Value/Prompt
+/ select list contains additional text
+/ selected value is validated with named groups
+/ selected value is transformed; named capture is prefixed Xform
+```ux :[document_ux_Genus]
+allowed:
+- 1. Pongo
+- 2. Histiophryne
+- 3. Phyllopteryx
+default: Pongo
+menu_format: "| Name: %{name}| Value: ${%{name}}| Prompt: %{prompt}"
+name: Genus
+prompt: New genus?
+transform: "Xform: '%{name}'"
+validate: |
+  ^\d+\. *(?<name>[^ ].*)$
+```
+/ default
+/ auto-load default value
+```ux :[document_ux_Family]
+default: Hominidae
+name: Family
+```
+@import bats-document-configuration.md
+```opts :(document_opts)
+menu_ux_row_format: '| %{name}| ${%{name}}| %{prompt}'
+screen_width: 64
+table_center: true
+ux_auto_load_force_default: true
+```

data/docs/dev/block-type-ux-transform.md

@@ -0,0 +1,41 @@
+:::
+**Execution output has a trailing newline.**
+```ux :[document_ux_transform_0]
+default: :exec
+exec: basename $(pwd)
+name: Var0
+```
+$(echo -n "$Var0" | hexdump -C)
+:::
+**With validate and transform, output has no newline.**
+```ux :[document_ux_transform_1]
+default: :exec
+exec: basename $(pwd)
+name: Var1
+transform: '%{name}'
+validate: (?<name>.+)
+```
+$(echo -n "$Var1" | hexdump -C)
+:::
+**With transform `:chomp`, output has no newline.**
+```ux :[document_ux_transform_2]
+default: :exec
+exec: basename $(pwd)
+name: Var2
+transform: :chomp
+```
+$(echo -n "$Var2" | hexdump -C)
+:::
+**With transform `:upcase`, output is in upper case w/ newline.**
+```ux :[document_ux_transform_3]
+default: :exec
+exec: basename $(pwd)
+name: Var3
+transform: :upcase
+```
+$(echo -n "$Var3" | hexdump -C)
+@import bats-document-configuration.md
+```opts :(document_opts)
+divider4_collapsible: false
+table_center: false
+```

data/docs/dev/command-substitution.md

@@ -11,6 +11,7 @@ echo "current base name is now $(basename `pwd`)"
 ```link
 load: file_$(basename `pwd`).sh
 ```
+Status not zero: $(err)
 / This should not be evaluated $(err). It errs with "Error: HashDelegator.blocks_from_nested_files -- Shell script execution failed: /bin/bash: line 2: err: command not found"
 @import bats-document-configuration.md
 ```opts :(document_opts)

data/docs/dev/table-column-truncate.md

@@ -0,0 +1,17 @@
+# Demonstrate Truncation of Text in Table Cells
+
+| Common Name| Species| Genus| Family| Year Discovered
+| -| -|:-|-:|:-:
+| Tapanuli Orangutan| Pongo tapanuliensis| Pongo| Hominidae| 2017
+| Psychedelic Frogfish| Histiophryne psychedelica| Histiophryne| Antennariidae| 2009
+| Ruby Seadragon| Phyllopteryx dewysea| Phyllopteryx| Syngnathidae| 2015
+| Illacme tobini (Millipede)| Illacme tobini| Illacme| Siphonorhinidae| 2016
+| Spiny Dandelion| Taraxacum japonicum| Taraxacum| Asteraceae| 2022
+```
+```
+@import bats-document-configuration.md
+```opts :(document_opts)
+heading1_center: false
+screen_width: 60
+table_center: false
+```

data/docs/dev/table-indent.md

@@ -22,5 +22,6 @@ Centered columns.
 @import bats-document-configuration.md
 ```opts :(document_opts)
 heading1_center: false
+screen_width: 100
 table_center: false
 ```

data/examples/colors.md

@@ -33,6 +33,7 @@ menu_opts_color: fg_rgbh_1f_00_1f
 menu_opts_set_color: fg_rgbh_7f_00_1f
 menu_save_color: fg_rgbh_e0_e0_20
 menu_task_color: fg_rgbh_1f_1f_1f
+menu_ux_color: fg_rgbh_2f_c0_2f
 menu_vars_color: fg_rgbh_1f_a0_1f
 menu_vars_set_color: fg_rgbh_00_1f_1f
 output_execution_label_name_color: fg_rgbh_00_1f_00
@@ -60,6 +61,7 @@ menu_opts_set_color: fg_rgbh_7f_00_ff
 # menu_save_color: fg_rgbh_ea_ea_20
 menu_save_color: fg_rgbh_ff_ff_20
 menu_task_color: fg_rgbh_ff_ff_ff
+menu_ux_color: fg_rgbh_df_c0_df
 menu_vars_color: fg_rgbh_ff_a0_ff
 menu_vars_set_color: fg_rgbh_00_ff_ff
 output_execution_label_name_color: fg_rgbh_00_ff_00

data/lib/block_types.rb

@@ -14,6 +14,7 @@ class BlockType
     SAVE = 'save',
     SHELL = 'shell',
     TEXT = 'text',
+    UX = 'ux',
     VARS = 'vars',
     VIEW = 'view',
     YAML = 'yaml'

data/lib/constants.rb

@@ -27,12 +27,12 @@ BLOCK_TYPE_COLOR_OPTIONS = {
   BlockType::OPTS => :menu_opts_color,
   BlockType::SAVE => :menu_save_color,
   BlockType::SHELL => :menu_bash_color,
+  BlockType::UX => :menu_ux_color,
   BlockType::VARS => :menu_vars_color
 }.freeze
 
-
 COLLAPSIBLE_SYMBOL_COLLAPSED = '⬢' # '<+>' # '∆'
-COLLAPSIBLE_SYMBOL_EXPANDED = '⬡' # '< >' # '…' 
+COLLAPSIBLE_SYMBOL_EXPANDED = '⬡' # '< >' # '…'
 
 # in regexp (?<collapse>[+-~]?)
 COLLAPSIBLE_TOKEN_COLLAPSE = '+'
@@ -100,8 +100,10 @@ end
 
 # selected block and subsequent menu state
 #
+BlockSelection = Struct.new(:id)
 SelectedBlockMenuState = Struct.new(:block, :source, :state)
 
 class TtyMenu
+  ENABLE = nil
   DISABLE = ''
 end

data/lib/evaluate_shell_expressions.rb

@@ -5,8 +5,12 @@
 
 require 'open3'
 
+class EvaluateShellExpression
+  StatusFail = :script_execution_failed unless const_defined?(:StatusFail)
+end
+
 def evaluate_shell_expressions(initial_code, expressions, shell: '/bin/bash',
-                               key_format: "%%<%s>",
+                               key_format: '%%<%s>',
                                initial_code_required: false)
   # !!p initial_code expressions key_format shell
   return if (initial_code_required && (initial_code.nil? || initial_code.empty?)) ||
@@ -18,23 +22,26 @@ def evaluate_shell_expressions(initial_code, expressions, shell: '/bin/bash',
 
   # Construct a single shell script
   script = initial_code.dup
-  expressions.each_with_index do |(key, expression), index|
+  expressions.each_with_index do |(_key, expression), index|
     script << "\necho #{token}#{index}\n"
     script << expression << "\n"
   end
 
   # Execute
-  stdout_str, stderr_str, status = Open3.capture3(shell, "-c", script)
+  stdout_str, stderr_str, status = Open3.capture3(shell, '-c', script)
 
   unless status.success?
-    raise "Shell script execution failed: #{stderr_str}"
+    return EvaluateShellExpression::StatusFail
   end
 
   # Extract output for expressions
   result_hash = {}
-  stdout_str.split(/\n?#{token}\d+\n/)[1..-1].tap do |output_parts|
-    expressions.each_with_index do |(key, _expression), index|
-      result_hash[sprintf(key_format, key)] = output_parts[index].chomp
+  part = stdout_str.split(/\n?#{token}\d+\n/)
+  unless part.empty?
+    part[1..-1].tap do |output_parts|
+      expressions.each_with_index do |(key, _expression), index|
+        result_hash[format(key_format, key)] = output_parts[index].chomp
+      end
     end
   end
 
@@ -58,23 +65,23 @@ class TestShellExpressionEvaluator < Minitest::Test
   end
 
   def test_single_expression
-    expressions = { "greeting" => "echo 'Hello, World!'" }
+    expressions = { 'greeting' => "echo 'Hello, World!'" }
     result = evaluate_shell_expressions(@initial_code, expressions)
 
-    assert_equal "Hello, World!", result["%<greeting>"]
+    assert_equal 'Hello, World!', result['%<greeting>']
   end
 
   def test_multiple_expressions
     expressions = {
-      "greeting" => "echo 'Hello, World!'",
-      "date" => "date +%Y-%m-%d",
-      "kernel" => "uname -r"
+      'greeting' => "echo 'Hello, World!'",
+      'date' => 'date +%Y-%m-%d',
+      'kernel' => 'uname -r'
     }
     result = evaluate_shell_expressions(@initial_code, expressions)
 
-    assert_equal "Hello, World!", result["%<greeting>"]
-    assert_match /\d{4}-\d{2}-\d{2}/, result["%<date>"]
-    assert_match /\d+\.\d+\.\d+/, result["%<kernel>"]
+    assert_equal 'Hello, World!', result['%<greeting>']
+    assert_match(/\d{4}-\d{2}-\d{2}/, result['%<date>'])
+    assert_match(/\d+\.\d+\.\d+/, result['%<kernel>'])
   end
 
   def test_empty_expressions_list
@@ -85,13 +92,11 @@ class TestShellExpressionEvaluator < Minitest::Test
   end
 
   def test_invalid_expression
-    expressions = { "invalid" => "invalid_command" }
+    expressions = { 'invalid' => 'invalid_command' }
 
-    error = assert_raises(RuntimeError) do
-      evaluate_shell_expressions(@initial_code, expressions)
-    end
+    result = evaluate_shell_expressions(@initial_code, expressions)
 
-    assert_match /Shell script execution failed/, error.message
+    assert_equal EvaluateShellExpression::StatusFail, result
   end
 
   def test_initial_code_execution
@@ -99,17 +104,17 @@ class TestShellExpressionEvaluator < Minitest::Test
       #!/bin/sh
       echo "Custom setup message"
     BASH
-    expressions = { "test" => "echo Test after initial setup" }
+    expressions = { 'test' => 'echo Test after initial setup' }
 
     result = evaluate_shell_expressions(initial_code, expressions)
 
-    assert_equal "Test after initial setup", result["%<test>"]
+    assert_equal 'Test after initial setup', result['%<test>']
   end
 
   def test_large_number_of_expressions
-    expressions = (1..100).map { |i|
+    expressions = (1..100).map do |i|
       ["expr_#{i}", "echo Expression #{i}"]
-    }.to_h
+    end.to_h
 
     result = evaluate_shell_expressions(@initial_code, expressions)