bard 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd823956fef238023d672971dd80049518eb8f3408383132db92077ddabe957
-  data.tar.gz: 6a69bcac5891b545fabec4009b7b84148a1448fe62567813e8377e963791099a
+  metadata.gz: 21d6d4352d9957502860997ea4c05c9df90cffd4eab76391041c913483892c7f
+  data.tar.gz: ad893862a2a2a3968f12c8c034a08c8c92d3f07aade157ba60ab676e39f10ae0
 SHA512:
-  metadata.gz: 4ea3c080d440a8cd560f713951f9ec5052a89cb9b1dfc0194f02e49f13623c8292379fcc47f6e90d3f1971c9b37e9a33a15e0f357d88a2428e11bd0af202bbc4
-  data.tar.gz: cda529a9823733f871fb8f2274c39790e69b142317f016168643e908e75c8551b11437e8fa478b84cec84584331951d8c5c79a3935ced531f2154b556e4700c8
+  metadata.gz: 7036c5b3d97b827c62905238d4cf66c53e56aeac82f847c29877ae7482dabeece807f6ffec6cf9bfbf9b2c4796ae33e40d2713509b906ee8754aa2f4cc1521be
+  data.tar.gz: 895b98dc68a3144eee0d4ad72a4a47d38bfffdbdf520d5f029a8484a356f57d80b447e7d335d2f67e49cae2e566e7e7601c4109fc2b6664be0078040b6224d35

data/.github/workflows/ci.yml

@@ -18,5 +18,21 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - name: Install Podman
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y podman
+          # Start podman service as root using TCP for better compatibility in CI
+          sudo nohup podman system service --time=0 tcp://127.0.0.1:8080 > /tmp/podman-service.log 2>&1 &
+          # Wait for service to be ready
+          for i in {1..30}; do
+            if curl --silent --fail http://127.0.0.1:8080/v1.40/version >/dev/null 2>&1; then
+              echo "Podman REST API ready at tcp://127.0.0.1:8080"
+              break
+            fi
+            sleep 1
+          done
+          echo "DOCKER_HOST=tcp://127.0.0.1:8080" >> $GITHUB_ENV
+
       - name: Run tests
         run: bundle exec rake

data/bard.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "debug"
+  spec.add_development_dependency "testcontainers"
 end

data/lib/bard/ci/github_actions.rb

@@ -103,7 +103,7 @@ module Bard
           sha = `git rev-parse #{branch}`.chomp
 
           loop do
-            runs = client.get("actions/runs", head_sha: sha, created: ">#{start_time.iso8601}")
+            runs = client.get("actions/runs", event: "workflow_dispatch", head_sha: sha, created: ">#{start_time.iso8601}")
             if json = runs["workflow_runs"].first
               return Run.new(self, json)
             end

data/lib/bard/config.rb

@@ -65,14 +65,20 @@ module Bard
       end
     end
 
-    def backup *args
-      if args.length == 1
-        @backup = args.first
-      elsif args.length == 0
+    def backup(value = nil, &block)
+      if block_given?
+        @backup = BackupConfig.new(&block)
+      elsif value == false
+        @backup = false
+      elsif value == true
+        # Backward compatibility: backup true
+        @backup = BackupConfig.new { bard }
+      elsif value.nil?
+        # Getter
         return @backup if defined?(@backup)
-        @backup = true
+        @backup = BackupConfig.new { bard }  # Default
       else
-        raise ArgumentError
+        raise ArgumentError, "backup accepts a block, true, or false"
       end
     end
 
@@ -98,4 +104,35 @@ module Bard
       backup false
     end
   end
+
+  class BackupConfig
+    attr_reader :bard_enabled, :destinations
+
+    def initialize(&block)
+      @bard_enabled = false
+      @destinations = []
+      instance_eval(&block) if block_given?
+    end
+
+    def bard
+      @bard_enabled = true
+    end
+
+    def s3(name, credentials:, path:)
+      @destinations << {
+        name: name,
+        type: :s3,
+        credentials: credentials,
+        path: path
+      }
+    end
+
+    def bard?
+      @bard_enabled
+    end
+
+    def self_managed?
+      @destinations.any?
+    end
+  end
 end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.5.4"
+  VERSION = "1.6.0"
 end
 

data/spec/acceptance/.gitignore

@@ -0,0 +1,4 @@
+# Ignore generated test keys (if you regenerate them)
+# But keep the example ones in the repo
+# docker/test_key
+# docker/test_key.pub

data/spec/acceptance/docker/Dockerfile

@@ -0,0 +1,35 @@
+FROM ubuntu:22.04
+
+# Prevent interactive prompts
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install SSH server and basic tools
+RUN apt-get update && \
+    apt-get install -y \
+    openssh-server \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create deploy user
+RUN useradd -m -s /bin/bash deploy && \
+    echo 'deploy:password' | chpasswd
+
+# Setup SSH
+RUN mkdir /var/run/sshd && \
+    mkdir -p /home/deploy/.ssh && \
+    chmod 700 /home/deploy/.ssh
+
+# Copy SSH authorized key
+COPY test_key.pub /home/deploy/.ssh/authorized_keys
+RUN chown -R deploy:deploy /home/deploy/.ssh && \
+    chmod 600 /home/deploy/.ssh/authorized_keys
+
+# Allow SSH login with keys
+RUN sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config && \
+    sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/sshd_config
+
+# Expose SSH port
+EXPOSE 22
+
+# Start SSH service
+CMD ["/usr/sbin/sshd", "-D"]

data/spec/acceptance/docker/test_key

@@ -0,0 +1,27 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAQEAuvnrkoVh6AISBhqUOtmvTf6TMoq/Do6i/ayn1aqs9YmbN57tNVnY
+XEKBQ15HL5bquY0A4Fcf5mO73LyrHGdUODrJS6vZo4J8wcoyEyKxOC2UYV5ssCUntq13de
+E4WVHfSykMEo9z3U7bxFSwtwU8ECYQHKLb4OBmQb4hp/nDvx4EM554laBUByGm8fgSKOlY
+GEdWE0KAFVsKfkRW8AiR2RtQ5C1hIT/zCmHo01WTtHMpuyZk4cxpBlS3xz6wsD61f6SgMh
+M0X575jfV/MxhbDd3FGkxIk8kM24DtLfLW9idYWDD25dfQuXK3eQZDJ3vcoKa+2W73XfHd
+fBrAGrvjaQAAA8jQXv0u0F79LgAAAAdzc2gtcnNhAAABAQC6+euShWHoAhIGGpQ62a9N/p
+Myir8OjqL9rKfVqqz1iZs3nu01WdhcQoFDXkcvluq5jQDgVx/mY7vcvKscZ1Q4OslLq9mj
+gnzByjITIrE4LZRhXmywJSe2rXd14ThZUd9LKQwSj3PdTtvEVLC3BTwQJhAcotvg4GZBvi
+Gn+cO/HgQznniVoFQHIabx+BIo6VgYR1YTQoAVWwp+RFbwCJHZG1DkLWEhP/MKYejTVZO0
+cym7JmThzGkGVLfHPrCwPrV/pKAyEzRfnvmN9X8zGFsN3cUaTEiTyQzbgO0t8tb2J1hYMP
+bl19C5crd5BkMne9ygpr7Zbvdd8d18GsAau+NpAAAAAwEAAQAAAQACxR+WkYfNtbQkfNcm
+gmGXZ0wGeGmUCAxwSNMetlMu0GL+jAn0cPg52660ZmHpxFOwu971Xo0QLyOSGwXHm1ydza
+R8TMI3atWO0xWdVMr+gPxdBJavIF8ff3U7h5fmXjEPmRQpn+WbSScL2FEFkRwJRYsWZYTv
+kVt/zKw3zm/g4Fo7ieeM51heWDOVbNdCk0dcy2YK0L7Kb0FO+zvu3vxXrvWAqKmuRjxefc
+FiumkkgaTn78ZIHdfYZa26PmZPIUxVNxRkauvHxYo921t634O0Ji1gwbT5hK8Y7JoGRIp0
+alwgjjdbE80ZPuTspmeHQ7OKephb+c8qvoJu/LC8hQiBAAAAgCFGqbOsY9AcIfXY4hlADt
+94P5ySq5q3FbXeriy/CEklDPVER/w4iZaSRwMUqd7V36iZaLwHZyFQSNgIwiN1ysBPbcsq
+c642pv4XuAyNTMtD+y8CxcH1LgL7EOEn6if8cgTJ7ayTGT4qIDaUgzf6Ot8z4wDGNKyCpE
+lgPfdb8LKiAAAAgQDbrXnetOikB9+p+vf8M59UlfMYx7X9qLDsj0CUn1S0RyxgPWiJDBQl
+fZg7WyYOQwRYF0b0s8JlpGLkhLDM6nhBzT1M+nrN0axTAvYkBZV5MJPNg31F/iHxEtt+/V
+fMkH6VhmscVyiwEJkDP212dTAaDW3UremlRk77NIZ1PpPKKQAAAIEA2eRCJwNOvdsHYoJ6
+k6mEpwISzglbs+y6tTeIwiI7AVGEzvVuKVTCV3n9ljofmnh0UChczIOyywEKSqJi2pos/B
+kJoOmCxYMecB9lCxf61MUKdbpWaKF52+GvqT34Ne+VrYGuUp/0+asSTczVudJWRSzcdCji
+NEMB0tV88Vro90EAAAANYmFyZC10ZXN0LWtleQECAwQFBg==
+-----END OPENSSH PRIVATE KEY-----

data/spec/acceptance/docker/test_key.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6+euShWHoAhIGGpQ62a9N/pMyir8OjqL9rKfVqqz1iZs3nu01WdhcQoFDXkcvluq5jQDgVx/mY7vcvKscZ1Q4OslLq9mjgnzByjITIrE4LZRhXmywJSe2rXd14ThZUd9LKQwSj3PdTtvEVLC3BTwQJhAcotvg4GZBviGn+cO/HgQznniVoFQHIabx+BIo6VgYR1YTQoAVWwp+RFbwCJHZG1DkLWEhP/MKYejTVZO0cym7JmThzGkGVLfHPrCwPrV/pKAyEzRfnvmN9X8zGFsN3cUaTEiTyQzbgO0t8tb2J1hYMPbl19C5crd5BkMne9ygpr7Zbvdd8d18GsAau+Np bard-test-key

data/spec/acceptance/podman_testcontainers_spec.rb

@@ -0,0 +1,140 @@
+# Acceptance test for Bard using Podman + TestContainers
+#
+# This test validates end-to-end functionality of `bard run ls` by:
+# 1. Starting an SSH server container using TestContainers
+# 2. Configuring Bard to connect to it
+# 3. Running bard commands against the container
+# 4. Automatically cleaning up when done
+#
+# Prerequisites:
+# - gem install testcontainers
+# - podman installed
+# - podman socket running (systemctl --user start podman.socket)
+# - Set DOCKER_HOST to podman socket
+
+require 'spec_helper'
+require 'testcontainers'
+require 'open3'
+
+RSpec.describe "Bard acceptance test with Podman + TestContainers", type: :acceptance do
+  # Disable WebMock for acceptance tests - we need real HTTP connections to Podman
+  before(:all) do
+    WebMock.allow_net_connect!
+  end
+
+  after(:all) do
+    WebMock.disable_net_connect!
+  end
+  # Configure TestContainers to use Podman
+  before(:all) do
+    # Set up podman socket for TestContainers
+    # Use existing DOCKER_HOST if set (e.g., in CI), otherwise use default location
+    unless ENV['DOCKER_HOST']
+      podman_socket = "/run/user/#{Process.uid}/podman/podman.sock"
+
+      # Start podman socket if not running
+      unless File.exist?(podman_socket)
+        system("systemctl --user start podman.socket 2>/dev/null || podman system service --time=0 unix://#{podman_socket} &")
+        sleep 2
+      end
+
+      # Configure TestContainers to use podman
+      ENV['DOCKER_HOST'] = "unix://#{podman_socket}"
+    end
+
+    # Ensure SSH key has correct permissions
+    system("chmod 600 spec/acceptance/docker/test_key")
+
+    # Check if we can pull images
+    unless system("podman pull ubuntu:22.04 >/dev/null 2>&1")
+      skip "Cannot pull images in this environment. Run in a network-enabled environment."
+    end
+
+    # Build the test image
+    unless system("podman build -t bard-test-server -f spec/acceptance/docker/Dockerfile spec/acceptance/docker 2>&1")
+      skip "Failed to build test image"
+    end
+  end
+
+  # TestContainers will automatically manage this container
+  let(:container) do
+    Testcontainers::DockerContainer.new("localhost/bard-test-server:latest")
+      .with_exposed_port(22)
+      .with_name("bard-test-#{SecureRandom.hex(4)}")
+      .start
+  end
+
+  let(:ssh_port) { container.mapped_port(22) }
+
+  before(:each) do
+    # Ensure container is started
+    container
+
+    # Wait for SSH to be ready
+    30.times do
+      break if system("ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -p #{ssh_port} deploy@localhost -i spec/acceptance/docker/test_key 'echo ready' 2>/dev/null")
+      sleep 0.5
+    end
+
+    # Create test project directory
+    system("ssh -o StrictHostKeyChecking=no -p #{ssh_port} deploy@localhost -i spec/acceptance/docker/test_key 'mkdir -p testproject'")
+
+    # Create bard config for this container
+    @bard_config_path = "tmp/test_bard_#{SecureRandom.hex(4)}.rb"
+    FileUtils.mkdir_p("tmp")
+    ssh_key_path = File.expand_path("spec/acceptance/docker/test_key")
+    File.write(@bard_config_path, <<~RUBY)
+      server :production do
+        ssh "deploy@localhost:#{ssh_port}"
+        path "testproject"
+        ssh_key "#{ssh_key_path}"
+        ping false
+      end
+    RUBY
+  end
+
+  after(:each) do
+    # Clean up bard config
+    FileUtils.rm_f(@bard_config_path) if @bard_config_path
+
+    # TestContainers will automatically stop and remove the container
+    container.stop if container
+    container.remove if container
+  end
+
+  it "runs ls command via bard run" do
+    # Create a test file in the container
+    result = system("ssh -o StrictHostKeyChecking=no -p #{ssh_port} deploy@localhost -i spec/acceptance/docker/test_key 'touch testproject/test-file.txt'")
+    expect(result).to be true
+
+    # Run bard command
+    Dir.chdir("tmp") do
+      # Copy config to bard.rb
+      FileUtils.cp("../#{@bard_config_path}", "bard.rb")
+
+      output, status = Open3.capture2e("bard run ls")
+
+      # Clean up
+      FileUtils.rm_f("bard.rb")
+
+      # Verify the command succeeded
+      expect(status).to be_success, "bard run failed with output: #{output}"
+      expect(output).to include("test-file.txt")
+    end
+  end
+
+  it "runs multiple commands in isolated containers" do
+    # Each test gets its own container automatically!
+    result = system("ssh -o StrictHostKeyChecking=no -p #{ssh_port} deploy@localhost -i spec/acceptance/docker/test_key 'echo content > testproject/another-file.txt'")
+    expect(result).to be true
+
+    Dir.chdir("tmp") do
+      FileUtils.cp("../#{@bard_config_path}", "bard.rb")
+      output, status = Open3.capture2e("bard run 'cat another-file.txt'")
+      FileUtils.rm_f("bard.rb")
+
+      expect(status).to be_success, "bard run failed with output: #{output}"
+      expect(output).to include("content")
+    end
+  end
+end

data/spec/bard/cli/new_spec.rb

@@ -59,7 +59,7 @@ describe Bard::CLI::New do
   end
 
   describe "#install_and_extract_version" do
-    it "correctly installs a gem and extracts its version" do
+    it "correctly installs a gem and extracts its version", skip: !!ENV["CI"] do
       cmd = new_cli.send :build_bash_env do
         <<~SH
           #{new_cli.send(:build_gem_install, "bundler", "~> 2.0")}

data/spec/bard/config_spec.rb

@@ -29,8 +29,11 @@ describe Bard::Config do
     end
 
     describe "#backup" do
-      it "returns true" do
-        expect(subject.backup).to eq true
+      it "returns a BackupConfig with bard enabled by default" do
+        backup = subject.backup
+        expect(backup).to be_a(Bard::BackupConfig)
+        expect(backup.bard?).to eq true
+        expect(backup.destinations).to be_empty
       end
     end
   end
@@ -79,5 +82,82 @@ describe Bard::Config do
       end
     end
   end
+
+  context "with new backup block syntax" do
+    describe "#backup with bard directive" do
+      subject { described_class.new("test", source: "backup { bard }") }
+
+      it "returns a BackupConfig with bard enabled" do
+        backup = subject.backup
+        expect(backup).to be_a(Bard::BackupConfig)
+        expect(backup.bard?).to eq true
+        expect(backup.destinations).to be_empty
+        expect(backup.self_managed?).to eq false
+      end
+    end
+
+    describe "#backup with s3 directive" do
+      subject { described_class.new("test", source: "backup { s3 :primary, credentials: :backup, path: 'bucket/path' }") }
+
+      it "returns a BackupConfig with s3 destination" do
+        backup = subject.backup
+        expect(backup).to be_a(Bard::BackupConfig)
+        expect(backup.bard?).to eq false
+        expect(backup.destinations.length).to eq 1
+        expect(backup.self_managed?).to eq true
+
+        dest = backup.destinations.first
+        expect(dest[:name]).to eq :primary
+        expect(dest[:type]).to eq :s3
+        expect(dest[:credentials]).to eq :backup
+        expect(dest[:path]).to eq 'bucket/path'
+      end
+    end
+
+    describe "#backup with both bard and s3 directives" do
+      subject { described_class.new("test", source: "backup { bard; s3 :custom, credentials: :backup, path: 'bucket/path' }") }
+
+      it "returns a BackupConfig with bard and s3 destination" do
+        backup = subject.backup
+        expect(backup).to be_a(Bard::BackupConfig)
+        expect(backup.bard?).to eq true
+        expect(backup.destinations.length).to eq 1
+        expect(backup.self_managed?).to eq true
+      end
+    end
+
+    describe "#backup with multiple s3 destinations" do
+      subject do
+        described_class.new("test", source: <<~SOURCE)
+          backup do
+            s3 :primary, credentials: :backup1, path: 'bucket1/path'
+            s3 :secondary, credentials: :backup2, path: 'bucket2/path'
+          end
+        SOURCE
+      end
+
+      it "returns a BackupConfig with multiple destinations" do
+        backup = subject.backup
+        expect(backup).to be_a(Bard::BackupConfig)
+        expect(backup.bard?).to eq false
+        expect(backup.destinations.length).to eq 2
+        expect(backup.self_managed?).to eq true
+
+        expect(backup.destinations[0][:name]).to eq :primary
+        expect(backup.destinations[1][:name]).to eq :secondary
+      end
+    end
+
+    describe "#backup true (backward compatibility)" do
+      subject { described_class.new("test", source: "backup true") }
+
+      it "returns a BackupConfig with bard enabled" do
+        backup = subject.backup
+        expect(backup).to be_a(Bard::BackupConfig)
+        expect(backup.bard?).to eq true
+        expect(backup.destinations).to be_empty
+      end
+    end
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -121,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: testcontainers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - micah@botandrose.com
 executables:
@@ -210,6 +224,11 @@ files:
 - lib/bard/provision/user.rb
 - lib/bard/server.rb
 - lib/bard/version.rb
+- spec/acceptance/.gitignore
+- spec/acceptance/docker/Dockerfile
+- spec/acceptance/docker/test_key
+- spec/acceptance/docker/test_key.pub
+- spec/acceptance/podman_testcontainers_spec.rb
 - spec/bard/ci/github_actions_spec.rb
 - spec/bard/ci_spec.rb
 - spec/bard/cli/ci_spec.rb
@@ -274,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CLI to automate common development tasks.
 test_files:
@@ -290,6 +309,11 @@ test_files:
 - features/support/env.rb
 - features/support/grit_ext.rb
 - features/support/io.rb
+- spec/acceptance/.gitignore
+- spec/acceptance/docker/Dockerfile
+- spec/acceptance/docker/test_key
+- spec/acceptance/docker/test_key.pub
+- spec/acceptance/podman_testcontainers_spec.rb
 - spec/bard/ci/github_actions_spec.rb
 - spec/bard/ci_spec.rb
 - spec/bard/cli/ci_spec.rb