scriptorium 0.6.1 → 0.7.2

data/test/tui_integration_test.rb

@@ -7,6 +7,8 @@ require 'minitest/autorun'
 require_relative '../lib/scriptorium'
 
 class TUIIntegrationTest < Minitest::Test
+  include Scriptorium::Helpers
+  
   # Test repository path
   TEST_REPO_PATH = "scriptorium-TEST"
   
@@ -15,6 +17,10 @@ class TUIIntegrationTest < Minitest::Test
     # Don't create repo here - let the TUI create it interactively
     # Disable DBC contracts in tests
     ENV['DBC_DISABLED'] = 'true'
+    
+    # rbenv hack to ensure correct Ruby version
+    ENV['PATH'] = "#{ENV['HOME']}/.rbenv/shims:#{ENV['PATH']}"
+    ENV['RBENV_VERSION'] = '3.2.3'
   end
 
   def teardown
@@ -27,7 +33,7 @@ class TUIIntegrationTest < Minitest::Test
     # Test TUI interaction - let TUI create repo interactively
     ENV['NOREADLINE'] = '1'
     
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, '/Users/Hal/.rbenv/versions/3.2.3/bin/ruby bin/scriptorium --test') do |read, write, pid|
       begin
         run_basic_tui_interaction_test(read, write, pid)
       ensure
@@ -42,7 +48,7 @@ class TUIIntegrationTest < Minitest::Test
   def test_002_view_management
     ENV['NOREADLINE'] = '1'
     
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
         run_view_management_test(read, write, pid)
       ensure
@@ -57,7 +63,7 @@ class TUIIntegrationTest < Minitest::Test
   def test_003_command_abbreviations
     ENV['NOREADLINE'] = '1'
     
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
         run_command_abbreviations_test(read, write, pid)
       ensure
@@ -72,7 +78,7 @@ class TUIIntegrationTest < Minitest::Test
   def test_004_interactive_create_view
     ENV['NOREADLINE'] = '1'
     
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
         run_interactive_create_view_test(read, write, pid)
       ensure
@@ -87,7 +93,7 @@ class TUIIntegrationTest < Minitest::Test
   def test_005_unknown_commands
     ENV['NOREADLINE'] = '1'
     
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
         run_unknown_commands_test(read, write, pid)
       ensure
@@ -99,12 +105,24 @@ class TUIIntegrationTest < Minitest::Test
     ENV.delete('NOREADLINE')
   end
 
-  def test_006_empty_input_handling
+  def test_006_asset_management_commands
     ENV['NOREADLINE'] = '1'
-    
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
-        run_empty_input_handling_test(read, write, pid)
+        await(read, "No repository found.", "Should show 'No repository found'")
+        send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+        await(read, "No editor configured", "Should show editor setup")
+        await(read, "Available editors", "Should show available editors")
+        await(read, "Choose editor", "Should prompt for editor selection")
+        send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+        await(read, "Setup complete", "Should show setup completion")
+        await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+        send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+        send_and_expect(read, write, "list assets", /imagenotfound\.jpg/, "Should show imagenotfound.jpg in global assets")
+        send_and_expect(read, write, "list assets view", /imagenotfound\.jpg/, "Should show imagenotfound.jpg in view assets")
+        send_and_expect(read, write, "asset info test.png", /Asset not found/, "Should show asset not found error")
+        send_and_expect(read, write, "asset info", /Usage: asset info/, "Should show usage help")
+        send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
       ensure
         Process.kill('TERM', pid) rescue nil
         Process.wait(pid) rescue nil
@@ -114,12 +132,31 @@ class TUIIntegrationTest < Minitest::Test
     ENV.delete('NOREADLINE')
   end
 
-  def test_007_exit_variations
+  def test_007_deployment_commands
     ENV['NOREADLINE'] = '1'
-    
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
-        run_exit_variations_test(read, write, pid)
+        await(read, "No repository found.", "Should show 'No repository found'")
+        send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+        await(read, "No editor configured", "Should show editor setup")
+        await(read, "Available editors", "Should show available editors")
+        await(read, "Choose editor", "Should prompt for editor selection")
+        send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+        await(read, "Setup complete", "Should show setup completion")
+        await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+        send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+         write.puts "configure deployment"
+         sleep 0.3  # Give ed time to open
+         
+         # Simulate ed interaction
+         write.puts "w"  # Write file
+         sleep 0.1
+         write.puts "q"  # Quit
+         sleep 0.1
+         await(read, /Deployment configuration edited for view/, "Should edit deployment config")
+         await(read, /\[sample\]/, "Should return to main prompt")
+         send_and_expect(read, write, "deploy", /Deployment error:/, "Should show deployment error")
+        send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
       ensure
         Process.kill('TERM', pid) rescue nil
         Process.wait(pid) rescue nil
@@ -129,12 +166,47 @@ class TUIIntegrationTest < Minitest::Test
     ENV.delete('NOREADLINE')
   end
 
-  def test_008_error_conditions
+
+
+  def test_008_empty_input_handling
     ENV['NOREADLINE'] = '1'
     
-    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium') do |read, write, pid|
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       begin
-        run_error_conditions_test(read, write, pid)
+        # Wait for "No repository found" message
+        await(read, "No repository found.", "Should show 'No repository found'")
+        
+        # Send 'y' to create new repository
+        send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+        
+        # Wait for editor setup
+        await(read, "No editor configured", "Should show editor setup")
+        
+        # Wait for editor list
+        await(read, "Available editors", "Should show available editors")
+        
+        # Wait for editor choice prompt
+        await(read, "Choose editor", "Should prompt for editor selection")
+        send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+        
+        # Wait for setup completion
+        await(read, "Setup complete", "Should show setup completion")
+        
+        # Wait for assistance question
+        await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+        
+        # Send 'n' to skip assistance (simpler test)
+        send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+        
+        # Test empty input handling
+        send_and_expect(read, write, "", "[sample]", "Should handle empty input")
+        
+        # Test just Enter key
+        send_and_expect(read, write, "\n", "[sample]", "Should handle Enter key")
+        
+        # Quit
+        send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
+        
       ensure
         Process.kill('TERM', pid) rescue nil
         Process.wait(pid) rescue nil
@@ -144,494 +216,668 @@ class TUIIntegrationTest < Minitest::Test
     ENV.delete('NOREADLINE')
   end
 
-  private
-
-  def send_and_expect(read, write, input, expected_pattern, description)
-    write.puts input
-    sleep 0.1  # Small delay to ensure input is processed
-    result = get_string(read, expected_pattern, description)
-    # Add explicit assertion for the expected pattern
-    if expected_pattern.is_a?(Regexp)
-      assert result.match?(expected_pattern), "#{description}: Expected pattern '#{expected_pattern}' not found in output"
-    else
-      assert result.include?(expected_pattern), "#{description}: Expected text '#{expected_pattern}' not found in output"
-    end
-    result
-  rescue Errno::EIO => e
-    # Handle case where TUI terminates immediately after output
-    if expected_pattern.to_s.include?("Goodbye!")
-      # If we're expecting Goodbye! and get an I/O error, that's probably OK
-      # The TUI terminated after outputting Goodbye!
-      return
-    else
-      raise e
-    end
-  end
-
-  def run_basic_tui_interaction_test(read, write, pid)
-    begin
+  def test_008_exit_variations
+    ENV['NOREADLINE'] = '1'
+    
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
+      await(read, "No repository found.", "Should show 'No repository found'")
       
       # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
+      send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
       
       # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
+      await(read, "No editor configured", "Should show editor setup")
       
       # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
+      await(read, "Available editors", "Should show available editors")
       
       # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
+      await(read, "Choose editor", "Should prompt for editor selection")
       send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
       
       # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
+      await(read, "Setup complete", "Should show setup completion")
       
       # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+      await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
       
       # Send 'n' to skip assistance (simpler test)
       send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
       
-      # Send help command
-      send_and_expect(read, write, "h", "view", "Should show help")
-      
-      # Wait for prompt again
-      get_string(read, /\[.*\] /, "Should show prompt after help")
-      
-      # Send list views command
-      send_and_expect(read, write, "lsv", "sample", "Should show sample view")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after lsv")
-      
-      # Send view command to see current view
-      send_and_expect(read, write, "view", "Current view:", "Should show view info")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after view")
-      
-      # Send quit
-      send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
+      # Test different exit commands
+      send_and_expect(read, write, "quit", "Goodbye!", "Should exit with 'quit'")
     end
+  ensure
+    ENV.delete('NOREADLINE')
   end
 
-  def run_view_management_test(read, write, pid)
-    begin
+  def test_008_error_conditions
+    ENV['NOREADLINE'] = '1'
+    
+    PTY.spawn({'NOREADLINE' => '1'}, 'ruby bin/scriptorium --test') do |read, write, pid|
       # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
+      await(read, "No repository found.", "Should show 'No repository found'")
+        
+        # Send 'y' to create new repository
+        send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+        
+              # Wait for editor setup
+      await(read, "No editor configured", "Should show editor setup")
       
       # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
+      await(read, "Available editors", "Should show available editors")
       
       # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
+      await(read, "Choose editor", "Should prompt for editor selection")
+        send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+        
+              # Wait for setup completion
+      await(read, "Setup complete", "Should show setup completion")
       
       # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # List views
-      send_and_expect(read, write, "lsv", "sample", "Should show sample view")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after lsv")
-      
-      # Create a new view first
-      write.puts "new view testview123 This is just a test..."
-      get_string(read, "Enter subtitle (optional):", "Should prompt for subtitle")
-      write.puts ""  # Empty subtitle
-      get_string(read, "Created view 'testview123' with title", "Should create new view")
-      
-      # Wait for the "Switched to view" message that comes after creation
-      get_string(read, "Switched to view 'testview123'", "Should switch to new view after creation")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after creating view")
-      
-      # Now change to the new view (should already be on it, so no switch message)
-      write.puts "cv testview123"
-      # No message expected since we're already on this view
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after switching view")
-      
-      # Show current view
-      send_and_expect(read, write, "view", "Current view:", "Should show view info")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after view command")
-      
-      # Create new view (this should fail because view already exists)
-      write.puts "new view testview123 This is just a test..."
-      get_string(read, "Enter subtitle (optional):", "Should prompt for subtitle")
-      write.puts ""  # Empty subtitle
-      get_string(read, "View 'testview123' already exists", "Should show view already exists error")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after failed view creation")
-      
-      # Change to new view (already on this view, so no switch message)
-      write.puts "cv testview123"
-      # No message expected since we're already on this view
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after cv command")
-      
-      # Try to change to non-existent view
-      send_and_expect(read, write, "cv nonexistent", "View 'nonexistent' not found", "Should show error for non-existent view")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after error")
+      await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+        
+        # Send 'n' to skip assistance (simpler test)
+        send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+        
+        # Test invalid command
+        send_and_expect(read, write, "invalid_command", "Unknown command: invalid_command", "Should show error for invalid command")
+        
+        # Test invalid view name
+        send_and_expect(read, write, "new view", "Enter view name:", "Should prompt for view name")
+        
+        # Enter invalid name
+        send_and_expect(read, write, "invalid/name", "Enter view title:", "Should prompt for view title")
+        
+        # Enter title
+        send_and_expect(read, write, "Invalid Title", /Enter subtitle \(optional\):/, "Should prompt for subtitle")
+        
+        # Enter subtitle
+        send_and_expect(read, write, "Invalid Subtitle", "Cannot create view: invalid name", "Should show error for invalid name")
+        
+              # Wait for prompt
+      await(read, /\[.*\] /, "Should show prompt after error")
       
       # Quit
       send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
     end
+  ensure
+    ENV.delete('NOREADLINE')
   end
 
-  def run_command_abbreviations_test(read, write, pid)
-    begin
-      # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
-      
-      # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
-      
-      # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
-      
-      # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # Send help command
-      send_and_expect(read, write, "h", "view", "Should show help")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after help")
-      
-      # Send version command
-      send_and_expect(read, write, "v", "Scriptorium", "Should show version")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after version")
-      
-      # Send list views command
-      send_and_expect(read, write, "lsv", "sample", "Should show sample view")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after lsv")
-      
-      # Quit
-      send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
+  def send_and_expect(read, write, input, expected_pattern, description)
+          # tty "USER: #{input}"   # uncomment for debugging
+    write.puts input
+    sleep 0.1  # Small delay to ensure input is processed
+    result = await(read, expected_pattern, description)
+    result
+  rescue Errno::EIO => e
+    # Handle case where TUI terminates immediately after output
+    if expected_pattern.to_s.include?("Goodbye!")
+      # If we're expecting Goodbye! and get an I/O error, that's probably OK
+      # The TUI terminated after outputting Goodbye!
+      return
+    else
+      raise e
     end
   end
 
+  def run_basic_tui_interaction_test(read, write, pid)
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Send help command
+    send_and_expect(read, write, "h", "view", "Should show help")
+    
+    # Wait for prompt again
+    await(read, /\[.*\] /, "Should show prompt after help")
+    
+    # Send list views command
+    send_and_expect(read, write, "lsv", "sample", "Should show sample view")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after lsv")
+    
+    # Send view command to see current view
+    send_and_expect(read, write, "view", "Current view:", "Should show view info")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after view")
+    
+    # Send quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
+  end
+
+  def run_view_management_test(read, write, pid)
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # List views
+    send_and_expect(read, write, "lsv", "sample", "Should show sample view")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after lsv")
+    
+    # Create a new view first
+    send_and_expect(read, write, "new view testview123 This is just a test...", /Enter subtitle \(optional\):/, "Should prompt for subtitle")
+    send_and_expect(read, write, "", /Created view 'testview123' with title/, "Should create new view")
+    
+    # Wait for the "Switched to view" message that comes after creation
+    await(read, /Switched to view 'testview123'/, "Should switch to new view after creation")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after creating view")
+    
+    # Now change to the new view (should already be on it, so no switch message)
+    write.puts "cv testview123"
+    # No message expected since we're already on this view
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after switching view")
+    
+    # Show current view
+    send_and_expect(read, write, "view", "Current view:", "Should show view info")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after view command")
+    
+    # Create new view (this should fail because view already exists)
+    sleep 0.5  # Wait for first view creation to fully complete
+    send_and_expect(read, write, "new view testview123 This is just a test...", /Enter subtitle \(optional\):/, "Should prompt for subtitle")
+    send_and_expect(read, write, "", /View.*already exists/, "Should show view already exists error")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after failed view creation")
+    
+    # Change to new view (already on this view, so no switch message)
+    write.puts "cv testview123"
+    # No message expected since we're already on this view
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after cv command")
+    
+    # Try to change to non-existent view
+    send_and_expect(read, write, "cv nonexistent", "View 'nonexistent' not found", "Should show error for non-existent view")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after error")
+    
+    # Quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
+  end
+
+  def run_command_abbreviations_test(read, write, pid)
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Send help command
+    send_and_expect(read, write, "h", "view", "Should show help")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after help")
+    
+    # Send version command
+    send_and_expect(read, write, "v", "Scriptorium", "Should show version")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after version")
+    
+    # Send list views command
+    send_and_expect(read, write, "lsv", "sample", "Should show sample view")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after lsv")
+    
+    # Quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
+  end
+
   def run_interactive_create_view_test(read, write, pid)
-    begin
-      # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
-      
-      # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
-      
-      # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
-      
-      # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # Start interactive create view
-      send_and_expect(read, write, "new view", "Enter view name:", "Should prompt for view name")
-      
-      # Enter view name
-      send_and_expect(read, write, "interactiveview", "Enter view title:", "Should prompt for view title")
-      
-      # Enter view title
-      send_and_expect(read, write, "Interactive View", "Enter subtitle (optional):", "Should prompt for subtitle")
-      
-      # Enter subtitle
-      send_and_expect(read, write, "Interactive Subtitle", "Created view 'interactiveview'", "Should create view")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after creating view")
-      
-      # List views to verify
-      send_and_expect(read, write, "lsv", "interactiveview", "Should show new view in list")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after lsv")
-      
-      # Quit
-      send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
-    end
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Start interactive create view
+    send_and_expect(read, write, "new view", "Enter view name:", "Should prompt for view name")
+    
+    # Enter view name
+    send_and_expect(read, write, "interactiveview", "Enter view title:", "Should prompt for view title")
+    
+    # Enter view title
+    send_and_expect(read, write, "Interactive View", /Enter subtitle \(optional\):/, "Should prompt for subtitle")
+    
+    # Enter subtitle
+    send_and_expect(read, write, "Interactive Subtitle", "Created view 'interactiveview'", "Should create view")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after creating view")
+    
+    # List views to verify
+    send_and_expect(read, write, "lsv", "interactiveview", "Should show new view in list")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after lsv")
+    
+    # Quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
   end
 
   def run_unknown_commands_test(read, write, pid)
-    begin
-      # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
-      
-      # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
-      
-      # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
-      
-      # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # Send unknown command
-      send_and_expect(read, write, "unknowncommand", "Unknown command: unknowncommand", "Should show unknown command error")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after error")
-      
-      # Send another unknown command
-      send_and_expect(read, write, "xyz123", "Unknown command: xyz123", "Should show unknown command error")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after second error")
-      
-      # Quit
-      send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
-    end
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Send unknown command
+    send_and_expect(read, write, "unknowncommand", "Unknown command: unknowncommand", "Should show unknown command error")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after error")
+    
+    # Send another unknown command
+    send_and_expect(read, write, "xyz123", "Unknown command: xyz123", "Should show unknown command error")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after second error")
+    
+    # Quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
   end
 
   def run_empty_input_handling_test(read, write, pid)
-    begin
-      # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
-      
-      # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
-      
-      # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
-      
-      # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # Send empty line
-      write.puts ""
-      
-      # Send whitespace-only line
-      write.puts "   "
-      
-      # Send help command to verify we're still working
-      send_and_expect(read, write, "h", "view", "Should show help after empty input")
-      
-      # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after help")
-      
-      # Quit
-      send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
-    end
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Send empty line
+    write.puts ""
+    
+    # Send whitespace-only line
+    write.puts "   "
+    
+    # Send help command to verify we're still working
+    send_and_expect(read, write, "h", "view", "Should show help after empty input")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after help")
+    
+    # Quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
   end
 
   def run_exit_variations_test(read, write, pid)
-    begin
-      # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
-      
-      # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
-      
-      # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
-      
-      # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # Send quit command
-      send_and_expect(read, write, "quit", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
-    end
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Send quit command
+    send_and_expect(read, write, "quit", "Goodbye!", "Should show goodbye")
   end
 
   def run_error_conditions_test(read, write, pid)
+    # Wait for "No repository found" message
+    await(read, "No repository found.", "Should show 'No repository found'")
+    
+    # Send 'y' to create new repository
+    send_and_expect(read, write, "y", "Created test repository successfully.", "Should show repository created")
+    
+    # Wait for editor setup
+    await(read, "No editor configured", "Should show editor setup")
+    
+    # Wait for editor list
+    await(read, "Available editors", "Should show available editors")
+    
+    # Wait for editor choice prompt
+    await(read, "Choose editor", "Should prompt for editor selection")
+    send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
+    
+    # Wait for setup completion
+    await(read, "Setup complete", "Should show setup completion")
+    
+    # Wait for assistance question
+    await(read, "Do you want assistance in creating your first view", "Should ask about assistance")
+    
+    # Send 'n' to skip assistance (simpler test)
+    send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
+    
+    # Start interactive create view
+    send_and_expect(read, write, "new view", "Enter view name:", "Should prompt for view name")
+    
+    # Enter invalid view name
+    send_and_expect(read, write, "invalid/name", "Enter view title:", "Should prompt for view title")
+    
+    # Enter title
+            send_and_expect(read, write, "Invalid Title", /Enter subtitle \(optional\):/, "Should prompt for subtitle")
+    
+    # Enter subtitle
+    send_and_expect(read, write, "Invalid Subtitle", "Cannot create view: invalid name", "Should show error for invalid name")
+    
+    # Wait for prompt
+    await(read, /\[.*\] /, "Should show prompt after error")
+    
+    # Quit
+    send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
+  end
+
+  def get_string(read, timeout = 5)
+    # Just get a string with timeout, no pattern matching or assertions
+    output = read.expect(/.*/, timeout)
+    if output
+      return output[0].strip
+    else
+      return nil
+    end
+  rescue => e
+    return nil
+  end
+
+  def await(read, expected_pattern, description, timeout = 5)
+    sleep 0.05
+    output = read.expect(expected_pattern, timeout)
+    if output
+      # tty "CODE: '#{output[0].strip}'"   # uncomment for debugging
+      assert output[0].match?(expected_pattern), "#{description}: Expected pattern '#{expected_pattern}' not found in output"
+      return output[0]  # Return the matched string"
+    else
+      # Read what we actually got
+      available = read.read_nonblock(1000) rescue ""
+      flunk "#{description}: Pattern '#{expected_pattern}' not found within #{timeout} seconds"
+    end
+  rescue IO::EAGAINWaitReadable
+    flunk "#{description}: No output received within #{timeout} seconds"
+  rescue => e
+    flunk "#{description}: Error - #{e.message}"
+  end
+
+  def test_009_backup_commands
+    # Skip this test for now due to PTY issues
+    skip "PTY test has I/O issues - backup commands work manually"
+  end
+
+  def run_backup_commands_test(read, write, pid)
     begin
-      # Wait for "No repository found" message
-      get_string(read, "No repository found.", "Should show 'No repository found'")
-      
-      # Send 'y' to create new repository
-      send_and_expect(read, write, "y", "Created repository successfully.", "Should show repository created")
-      
-      # Wait for editor setup
-      get_string(read, "No editor configured", "Should show editor setup")
-      
-      # Wait for editor list
-      get_string(read, "Available editors", "Should show available editors")
-      
-      # Wait for editor choice prompt
-      get_string(read, "Choose editor", "Should prompt for editor selection")
-      send_and_expect(read, write, "4", "Selected editor: ed", "Should show editor selection")
-      
-      # Wait for setup completion
-      get_string(read, "Setup complete", "Should show setup completion")
-      
-      # Wait for assistance question
-      get_string(read, "Do you want assistance in creating your first view", "Should ask about assistance")
-      
-      # Send 'n' to skip assistance (simpler test)
-      send_and_expect(read, write, "n", "[sample]", "Should show main prompt")
-      
-      # Start interactive create view
-      send_and_expect(read, write, "new view", "Enter view name:", "Should prompt for view name")
-      
-      # Enter invalid view name
-      send_and_expect(read, write, "invalid/name", "Enter view title:", "Should prompt for view title")
-      
-      # Enter title
-      send_and_expect(read, write, "Invalid Title", "Enter subtitle (optional):", "Should prompt for subtitle")
-      
-      # Enter subtitle
-      send_and_expect(read, write, "Invalid Subtitle", "Cannot create view: invalid name", "Should show error for invalid name")
+      # Wait for TUI to start - handle both new repo and existing repo cases
+      begin
+        read.expect(/Create new repository\?/, 5)
+        write.puts "y"
+        
+        # Wait for view creation prompt
+        read.expect(/Do you want assistance in creating your first view\?/, 10)
+        write.puts "n"
+      rescue
+        # Repository already exists, skip setup prompts
+      end
       
       # Wait for prompt
-      get_string(read, /\[.*\] /, "Should show prompt after error")
-      
-      # Quit
-      send_and_expect(read, write, "q", "Goodbye!", "Should show goodbye")
-      
-    ensure
-      Process.kill('TERM', pid) rescue nil
-      Process.wait(pid) rescue nil
+      read.expect(/\[sample\]/, 10)
+      
+      # Small delay to ensure TUI is ready
+      sleep(0.5)
+      
+      # Test a simple command first to verify TUI is working
+      write.puts "help"
+      read.expect(/Available commands/, 5)
+      
+      # Test list backups command
+      write.puts "list backups"
+      read.expect(/No backups available/, 5)
+      
+      # Test create backup command
+      write.puts "backup full \"Test backup\""
+      read.expect(/Backup created/, 10)
+      
+      # Test list backups again
+      write.puts "list backups"
+      read.expect(/Available backups/, 5)
+      
+      # Test delete backup command (should prompt for selection)
+      write.puts "delete backup"
+      read.expect(/Available backups/, 5)
+      read.expect(/Select backup to delete/, 5)
+      write.puts "1"  # Select first (and only) backup
+      read.expect(/Are you sure/, 5)
+      write.puts "y"  # Confirm deletion
+      read.expect(/Backup deleted successfully/, 5)
+      
+      # Verify backup was deleted
+      write.puts "list backups"
+      read.expect(/No backups available/, 5)
+      
+      # Test help command to see backup commands
+      write.puts "help"
+      read.expect(/list backups/, 5)
+      read.expect(/backup.*Create backup/, 5)
+      read.expect(/restore.*Restore from backup/, 5)
+      read.expect(/delete backup/, 5)
+      
+      # Exit
+      write.puts "quit"
+      read.expect(/Goodbye/, 5)
+    rescue => e
+      # If there's an error, try to clean up gracefully
+      begin
+        write.puts "quit" if write && !write.closed?
+      rescue
+        # Ignore cleanup errors
+      end
+      raise e
     end
   end
 
-  def get_string(read, pattern, message, timeout = 5)
-    # Convenience method to get a string matching a pattern with timeout
-    # Set VERBOSE=1 to see detailed output, defaults to silent
+  def test_010_restore_commands
+    # Skip this test for now due to PTY issues
+    skip "PTY test has I/O issues - restore commands work manually"
+  end
+
+  def run_restore_commands_test(read, write, pid)
     begin
-      output = read.expect(pattern, timeout)
-      if output
-        puts "Found: #{output[0].strip}" if ENV['VERBOSE']
-        return output[0]  # Return the matched string
-      else
-        puts "Failed to find pattern: #{pattern}"
-        # Read what we actually got
-        available = read.read_nonblock(1000) rescue ""
-        puts "Available output: #{available.inspect}"
-        flunk "#{message}: Pattern '#{pattern}' not found within #{timeout} seconds"
+      # Wait for TUI to start - handle both new repo and existing repo cases
+      begin
+        read.expect(/Create new repository\?/, 5)
+        write.puts "y"
+        
+        # Wait for view creation prompt
+        read.expect(/Do you want assistance in creating your first view\?/, 10)
+        write.puts "n"
+      rescue
+        # Repository already exists, skip setup prompts
       end
-    rescue IO::EAGAINWaitReadable
-      puts "No output available within timeout"
-      flunk "#{message}: No output received within #{timeout} seconds"
+      
+      # Wait for prompt
+      read.expect(/\[sample\]/, 10)
+      
+      # Small delay to ensure TUI is ready
+      sleep(0.5)
+      
+      # Create a backup first
+      write.puts "backup full \"Test restore backup\""
+      read.expect(/Backup created/, 10)
+      
+      # Test restore command (should prompt for selection and strategy)
+      write.puts "restore"
+      read.expect(/Available backups/, 5)
+      read.expect(/Select backup/, 5)
+      write.puts "1"  # Select first (and only) backup
+      read.expect(/Strategy.*Enter=safe/, 5)
+      write.puts ""   # Press Enter for safe strategy
+      read.expect(/About to restore backup/, 5)
+      read.expect(/Continue\?/, 5)
+      write.puts "y"  # Confirm restore
+      read.expect(/Backup restored successfully/, 10)
+      
+      # Exit
+      write.puts "quit"
+      read.expect(/Goodbye/, 5)
     rescue => e
-      puts "Error in get_string: #{e.message}"
-      flunk "#{message}: Error - #{e.message}"
+      # If there's an error, try to clean up gracefully
+      begin
+        write.puts "quit" if write && !write.closed?
+      rescue
+        # Ignore cleanup errors
+      end
+      raise e
     end
   end
 
   def cleanup_test_repo
-    # Clean up test repositories
+    # Clean up test repositories - be thorough
     FileUtils.rm_rf(TEST_REPO_PATH) if Dir.exist?(TEST_REPO_PATH)
     FileUtils.rm_rf("scriptorium-TEST") if Dir.exist?("scriptorium-TEST")
+    FileUtils.rm_rf("ui/web/scriptorium-TEST") if Dir.exist?("ui/web/scriptorium-TEST")
+    
+    # Also clean up any backup directories that might be left behind
+    Dir.glob("**/scriptorium-TEST").each do |path|
+      FileUtils.rm_rf(path) if Dir.exist?(path)
+    end
   end
-end 
+end