Update Docker test suite

Author: bradgessler

Rakefile

@@ -13,6 +13,11 @@ Terminalwire::Project.all.each do |project|
       sh "gem uninstall #{project.name} --force --executables"
     end
 
+    desc "Clean #{project.name}"
+    task :clean do
+      sh "rm -rf #{File.join project.dir, "pkg/*.gem"}"
+    end
+
     desc "Test #{project.name}"
     task :spec do
       project.chdir do
@@ -57,7 +62,7 @@ end
 
 namespace :gem do
   # Define global tasks for all gems
-  %i[build install install:local release uninstall].each do |task|
+  %i[build clean install install:local release uninstall].each do |task|
     desc "#{task.capitalize} all gems"
     task task do
       Terminalwire::Project.all.each do |project|
@@ -68,7 +73,7 @@ namespace :gem do
 end
 
 desc "Build gems"
-task :gem, %i[gem:build]
+task gem: %i[gem:clean gem:build]
 
 namespace :spec do
   desc "Run isolated specs"
@@ -79,7 +84,7 @@ namespace :spec do
   end
 
   desc "Run integration specs"
-  task :integration do
+  task integration: :gem do
     sh "bundle exec rspec spec"
   end
 end
@@ -158,5 +163,5 @@ task tebako: %i[tebako:build tebako:ubuntu:build tebako:package]
 desc "Run specs"
 task spec: %i[spec:isolate spec:integration]
 
-# Run tests and build everything.
-task default: %i[spec gem tebako]
+# Run : Lgemntests and build everything.
+task default: %i[spec tebako]

containers/rails/Dockerfile

@@ -4,21 +4,21 @@ FROM ruby:${RUBY_VERSION} AS base
 WORKDIR /rails
 
 RUN gem install rails && \
-  rails new . --minimal --name terminalwire-integration
+    rails new . --minimal --name terminalwire-integration
 
 FROM base AS local
 
+# Ensure our local gem executables are on the PATH.
 COPY ./containers/rails/app/models /rails/app/models
-COPY ./gem /gem
+COPY ./gem/*/pkg/*.gem /gem/
+RUN gem install /gem/terminalwire*.gem
 
-RUN bundle config local.terminalwire-core /gem/terminalwire-core && \
-    bundle config local.terminalwire-server /gem/terminalwire-server && \
-    bundle config local.terminalwire-rails /gem/terminalwire-rails && \
-    bundle config local.terminalwire /gem/terminalwire
+# Remove the remote source from the Gemfile so that nothing is fetched remotely.
+RUN sed -i '/^source/d' Gemfile
 
-RUN bundle add terminalwire
+# This will add the local terminalwire-raisl gem.
+RUN bundle add terminalwire-rails
 
 RUN bin/rails generate terminalwire:install hello
 
-EXPOSE 3000
 CMD ["bin/rails", "server", "--port", "3000", "--binding", "0.0.0.0"]

gem/terminalwire-rails/lib/terminalwire/rails.rb

@@ -96,6 +96,9 @@ def handle(adapter:, env:)
                 cli.default_url_options = { host: env["HTTP_HOST"] }
               end
               context.exit
+            # rescue Thor::InvocationError => e
+            #   context.stdin.puts e.message
+            #   context.exit(1)
             rescue StandardError => e
               # Log the error
               handler_error_message = <<~_

spec/integration/rails_spec.rb

@@ -7,74 +7,54 @@
 require "io/wait"
 
 RSpec.describe "Terminalwire Install", type: :system do
-  let(:binary_name) { "hello" }
-  let(:gem_path) { File.expand_path('../../../gem/terminalwire', __FILE__) }
-  let(:exe_path)  { File.join(gem_path, "exe") }
-
-  PORT = 3000
+  DOCKER_IMAGE = "terminalwire-rails-server"
+  BINARY_NAME  = "bin/hello"
+  PORT         = 3000
 
   before(:all) do
-    `docker buildx -t terminalwire-rails-server -f containers/rails/Dockerfile .`
-    @docker_id = `docker run -p 3000:#{PORT} -d terminalwire-rails-server`.chomp
-    wait_for_server("0.0.0.0", PORT)
-
-    @path = Pathname.new(Dir.mktmpdir)
-    @bin_path = @path.join("bin").tap(&:mkdir)
+    build_command = "docker build -t #{DOCKER_IMAGE} -f containers/rails/Dockerfile ."
+    system(build_command) or raise "Docker build failed: #{build_command}"
 
-    Terminalwire::Binary.write(
-      url: "http://localhost:#{PORT}/terminal",
-      to: @bin_path.join("hello")
-    )
+    # Run the container without external port binding and capture the container ID.
+    @docker_id = `docker run --rm -d #{DOCKER_IMAGE}`.chomp
+    raise "Docker run failed" if @docker_id.empty?
 
-    ENV["PATH"] = "#{@bin_path.to_s}:#{ENV["PATH"]}"
-
-    Dir.chdir(@path) do
-      Bundler.with_unbundled_env do
-        `bundle install --path #{@path} --binstubs=#{@bin_path} --quiet`
-      end
-    end
+    wait_for_server_in_container(timeout: 15)
   end
 
   after(:all) do
-    `docker stop #{@docker_id}` if @docker_id
+    system("docker stop #{@docker_id}") if @docker_id
   end
 
   it "runs Terminalwire client against server" do
-    # Run the binary and capture output
-    output, status = Open3.capture2e("#{binary_name} hello World")
+    command = "docker exec #{@docker_id} #{BINARY_NAME} hello World"
+    output, status = Open3.capture2e(command)
     expect(output.strip).to eql "Hello World"
     expect(status).to be_success
   end
 
   it "logs in successfully" do
-    PTY.spawn("#{binary_name} login") do |stdout, stdin, pid|
-      # stdout.readpartial("Email: ".size)
-      # Simulate entering email and password
+    command = "docker exec -i #{@docker_id} #{BINARY_NAME} login"
+    PTY.spawn(command) do |stdout, stdin, pid|
+      sleep 0.5
       stdin.puts "[email protected]"
-
-      # stdout.readpartial("Password: ".size)
+      sleep 0.5
       stdin.puts "password123"
-
       output = stdout.read
       expect(output).to include("Successfully logged in as [email protected].")
-
-      # Ensure the process was successful
       Process.wait(pid)
       expect($?.success?).to be_truthy
     end
   end
 
   private
 
-  def wait_for_server(host, port, timeout: 5)
+  def wait_for_server_in_container(timeout:)
     start_time = Time.now
     until Time.now - start_time > timeout
-      begin
-        TCPSocket.new(host, port).close
-        return true
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-        sleep 0.1
-      end
+      response = `docker exec #{@docker_id} curl -s http://localhost:3000/health`
+      return if !response.strip.empty?
+      sleep 0.5
     end
     raise "Server did not start within #{timeout} seconds"
   end