bard 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937ff227cd4b15691d6aa48c4d5f6670aa6c0232adf650672bd8790fb6baa6fa
-  data.tar.gz: 2858f62171dedf98e5518e16a82b0e1569c8c251024e7a934b9ebcbbec15a568
+  metadata.gz: '09960cdea14d636cd11c29d1f88114783daf97c144b379645daee11077f58815'
+  data.tar.gz: 52089e9a96cd8aacb4e49bb075b03199e18f138bffdb6bc6e86d5f8262a017a3
 SHA512:
-  metadata.gz: 03ecce7b9ee18e490a207d776b92958f71d17d2738f6641ceeb9a9a1605aba169dff86f942ae727134197bbed6b5b80825ed8a9a02b17d912dee3aa176ecae89
-  data.tar.gz: b39fe1a1e8d4e92961425ffdd5856d90f926d6f96cb19690e884b2b7c00776f1251285c9ef2034303f0cd3490823206cf975903f775ac19104e4b3243ac72b14
+  metadata.gz: 564cb4579c1a1451c2281e03f6541f621fc82e5be5e9ac2170e3c06838382d84bb860e02ada2670f444bf319ab62f5a42ff50a574b48c582a9dd304bf5075122
+  data.tar.gz: b20e398b8b8e87b177c365944c157f40083231f9478da9555a324eb9f60a929abe4995ba52e421107e8ff501aebc497232ada569fc3aa53647d21537c1c4fb31

data/lib/bard/cli/provision.rb

@@ -22,7 +22,7 @@ class Bard::CLI::Provision < Bard::CLI::Command
 
   desc "provision [ssh_url] --steps=all", "takes an optional ssh url to a raw ubuntu 22.04 install, and readies it in the shape of :production"
   option :steps, type: :array, default: STEPS
-  def provision ssh_url=config[:production].ssh
+  def provision ssh_url=config[:production].ssh&.to_s
     # unfreeze the string for later mutation
     ssh_url = ssh_url.dup
     options[:steps].each do |step|

data/lib/bard/cli/stage.rb

@@ -12,7 +12,16 @@ module Bard::CLI::Stage
         end
 
         run! "git push -u origin #{branch}", verbose: true
-        config[:staging].run! "git fetch && git checkout -f origin/#{branch} && bin/setup"
+
+        target = config[:staging]
+        if target.respond_to?(:deploy_strategy) && target.deploy_strategy
+          require "bard/deploy_strategy/#{target.deploy_strategy}"
+          strategy = target.deploy_strategy_instance
+          strategy.deploy
+        else
+          target.run! "git fetch && git checkout -f origin/#{branch} && bin/setup"
+        end
+
         puts green("Stage Succeeded")
 
         ping :staging

data/lib/bard/cli.rb

@@ -1,6 +1,7 @@
 # this file gets loaded in the CLI context, not the Rails boot context
 
 require "thor"
+require "bard/version"
 require "bard/config"
 require "bard/command"
 require "bard/plugin"
@@ -33,6 +34,12 @@ module Bard
     require "bard/ci/local"
     require "bard/ci/github_actions"
 
+    map "--version" => :version
+    desc "version", "Display version"
+    def version
+      puts Bard::VERSION
+    end
+
     def self.exit_on_failure? = true
 
     no_commands do

data/lib/bard/command.rb

@@ -1,4 +1,5 @@
 require "open3"
+require "shellwords"
 
 module Bard
   class Command < Struct.new(:command, :on, :home)
@@ -17,9 +18,9 @@ module Bard
     end
 
     def run! verbose: false, quiet: false
-      if !run(verbose:, quiet:)
-        raise Error.new(full_command)
-      end
+      result = run(verbose:, quiet:)
+      raise Error.new(full_command) unless result
+      result
     end
 
     def run verbose: false, quiet: false
@@ -100,7 +101,7 @@ module Bard
         end
       end
 
-      cmd = "ssh #{ssh_opts.join(' ')} #{ssh_target} '#{cmd}'"
+      cmd = "ssh #{ssh_opts.join(' ')} #{ssh_target} #{Shellwords.shellescape(cmd)}"
 
       cmd += " 2>&1" if quiet
       cmd

data/lib/bard/config.rb

@@ -52,7 +52,9 @@ module Bard
     # New v2.0 API - creates Target instances
     def target(key, &block)
       key = key.to_sym
-      @servers[key] ||= Target.new(key, self)
+      unless @servers[key].is_a?(Target)
+        @servers[key] = Target.new(key, self)
+      end
       @servers[key].instance_eval(&block) if block
       @servers[key]
     end

data/lib/bard/provision/logrotation.rb

@@ -5,7 +5,7 @@ class Bard::Provision::LogRotation < Bard::Provision
     print "Log Rotation:"
 
     provision_server.run! <<~SH, quiet: true
-      file=/etc/logrotate.d/#{server.project_name}
+      file=/etc/logrotate.d/#{config.project_name}
       if [ ! -f $file ]; then
         sudo tee $file > /dev/null <<EOF
       $(pwd)/log/*.log {

data/lib/bard/provision/passenger.rb

@@ -9,7 +9,7 @@ class Bard::Provision::Passenger < Bard::Provision
         %(grep -qxF "RAILS_ENV=production" /etc/environment || echo "RAILS_ENV=production" | sudo tee -a /etc/environment),
         %(grep -qxF "EDITOR=vim" /etc/environment || echo "EDITOR=vim" | sudo tee -a /etc/environment),
         "sudo apt-get install -y vim dirmngr gnupg apt-transport-https ca-certificates",
-        "curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null",
+        "curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key-2025.txt | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null",
         %(echo "deb https://oss-binaries.phusionpassenger.com/apt/passenger jammy main" | sudo tee /etc/apt/sources.list.d/passenger.list),
         "sudo apt-get update -y",
         "sudo apt-get install -y nginx libnginx-mod-http-passenger",
@@ -30,7 +30,7 @@ class Bard::Provision::Passenger < Bard::Provision
   end
 
   def app_configured?
-    provision_server.run "[ -f /etc/nginx/sites-enabled/#{server.project_name} ]", quiet: true
+    provision_server.run "[ -f /etc/nginx/sites-enabled/#{config.project_name} ]", quiet: true
   end
 end
 

data/lib/bard/provision/repo.rb

@@ -16,7 +16,7 @@ class Bard::Provision::Repo < Bard::Provision
         print " Add public key to GitHub repo deploy keys,"
         title = "#{server.ssh_uri.user}@#{server.ssh_uri.host}"
         key = provision_server.run "cat ~/.ssh/id_rsa.pub", home: true
-        Bard::Github.new(server.project_name).add_deploy_key title:, key:
+        Bard::Github.new(config.project_name).add_deploy_key title:, key:
       end
       print " Cloning repo,"
       provision_server.run! "git clone git@github.com:botandrosedesign/#{project_name}", home: true
@@ -50,7 +50,7 @@ class Bard::Provision::Repo < Bard::Provision
   end
 
   def project_name
-    server.project_name
+    config.project_name
   end
 
   def on_latest_master?

data/lib/bard/provision/ssh.rb

@@ -19,7 +19,14 @@ class Bard::Provision::SSH < Bard::Provision
         add_ssh_known_host!(provision_server.ssh_uri)
       end
       print " Reconfiguring port to #{target_port},"
-      provision_server.run! %(echo "Port #{target_port}" | sudo tee /etc/ssh/sshd_config.d/port_#{target_port}.conf; sudo service ssh restart), home: true
+      provision_server.run! %(echo "Port #{target_port}" | sudo tee /etc/ssh/sshd_config.d/port_#{target_port}.conf && sudo service ssh restart), home: true
+      5.times do
+        sleep 1
+        break if ssh_available?(provision_server.ssh_uri, port: target_port)
+      end
+      if !ssh_available?(provision_server.ssh_uri, port: target_port)
+        raise "reconfigured SSH to port #{target_port} but it's not responding — check firewall and sshd_config Include directive"
+      end
     end
 
     if !ssh_known_host?(provision_server.ssh_uri)
@@ -65,7 +72,7 @@ class Bard::Provision::SSH < Bard::Provision
 
   def disable_password_auth!
     provision_server.run!(
-      %q{echo "PasswordAuthentication no" | sudo tee /etc/ssh/sshd_config.d/disable_password_auth.conf; sudo service ssh restart},
+      %q{echo "PasswordAuthentication no" | sudo tee /etc/ssh/sshd_config.d/disable_password_auth.conf && sudo service ssh restart},
       home: true
     )
   end

data/lib/bard/provision/swapfile.rb

@@ -4,7 +4,7 @@ class Bard::Provision::Swapfile < Bard::Provision
   def call
     print "Swapfile:"
 
-    provision_server.run! <<~SH
+    provision_server.run! <<~SH, home: true
       if [ ! -f /swapfile ]; then
         sudo fallocate -l $(grep MemTotal /proc/meminfo | awk '{print $2}')K /swapfile
       fi
@@ -14,6 +14,8 @@ class Bard::Provision::Swapfile < Bard::Provision
       grep -q '/swapfile none swap sw 0 0' /etc/fstab || echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
     SH
 
+    provision_server.run! "sudo swapon --show | grep -q /swapfile", home: true
+
     puts " ✓"
   end
 end

data/lib/bard/server.rb

@@ -135,8 +135,9 @@ module Bard
       key
     end
 
-    def run! command, home: false, verbose: false, quiet: false
-      Bard::Command.run! command, on: self, home:, verbose:, quiet:
+    def run! command, home: false, verbose: false, quiet: false, capture: false
+      result = Bard::Command.run!(command, on: self, home:, verbose:, quiet:)
+      result if capture
     end
 
     def run command, home: false, verbose: false, quiet: false

data/lib/bard/ssh_server.rb

@@ -1,4 +1,5 @@
 require "uri"
+require "shellwords"
 require "bard/command"
 
 module Bard
@@ -30,6 +31,12 @@ module Bard
       host
     end
 
+    def to_s
+      str = "#{user}@#{host}"
+      str += ":#{port}" if port && port != "22"
+      str
+    end
+
     def connection_string
       "#{user}@#{host}"
     end
@@ -93,7 +100,7 @@ module Bard
       remote_cmd += "cd #{path} && " if path
       remote_cmd += command
 
-      cmd += " '#{remote_cmd}'"
+      cmd += " #{Shellwords.shellescape(remote_cmd)}"
       cmd
     end
   end

data/lib/bard/target.rb

@@ -217,9 +217,10 @@ module Bard
     end
 
     # Remote command execution
-    def run!(command, home: false, verbose: false, quiet: false)
+    def run!(command, home: false, verbose: false, quiet: false, capture: false)
       require_capability!(:ssh)
-      Command.run!(command, on: self, home: home, verbose: verbose, quiet: quiet)
+      result = Command.run!(command, on: self, home: home, verbose: verbose, quiet: quiet)
+      result if capture
     end
 
     def run(command, home: false, verbose: false, quiet: false)

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.9.0"
+  VERSION = "1.9.2"
 end
 

data/spec/bard/cli/stage_spec.rb

@@ -55,6 +55,26 @@ describe Bard::CLI::Stage do
       end
     end
 
+    context "when staging target has a deploy strategy" do
+      let(:strategy_instance) { double("strategy") }
+      let(:staging_server) { double("staging", deploy_strategy: :fake) }
+
+      before do
+        allow(staging_server).to receive(:respond_to?).with(:deploy_strategy).and_return(true)
+        allow(staging_server).to receive(:deploy_strategy_instance).and_return(strategy_instance)
+        allow(cli).to receive(:require).with("bard/deploy_strategy/fake").and_return(true)
+      end
+
+      it "uses the deploy strategy instead of SSH" do
+        expect(cli).to receive(:run!).with("git push -u origin main", verbose: true)
+        expect(strategy_instance).to receive(:deploy)
+        expect(staging_server).not_to receive(:run!)
+        expect(cli).to receive(:ping).with(:staging)
+
+        cli.stage
+      end
+    end
+
     context "when production server is not defined" do
       let(:servers) { { staging: staging_server } }
 

data/spec/bard/command_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "bard/command"
+require "shellwords"
 
 describe Bard::Command do
   let(:remote) { double("remote", to_sym: :remote, ssh: true, env: nil, path: "/path/to", ssh_key: nil, ssh_uri: "user@example.com", gateway: nil) }
@@ -11,7 +12,8 @@ describe Bard::Command do
     end
 
     it "should run a command on a remote server" do
-      expect(Open3).to receive(:capture3).with("ssh -tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR user@example.com 'cd /path/to && ls -l'").and_return(["output", "", 0])
+      expected_cmd = "ssh -tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR user@example.com #{Shellwords.shellescape("cd /path/to && ls -l")}"
+      expect(Open3).to receive(:capture3).with(expected_cmd).and_return(["output", "", 0])
       Bard::Command.run "ls -l", on: remote
     end
   end

data/spec/bard/config_spec.rb

@@ -148,6 +148,18 @@ describe Bard::Config do
     end
   end
 
+  context "with target overriding default server" do
+    subject { described_class.new("tracker", source: <<~SOURCE) }
+      target :staging do
+        ssh false
+      end
+    SOURCE
+
+    it "replaces the default Server with a Target" do
+      expect(subject[:staging]).to be_a(Bard::Target)
+    end
+  end
+
   context "with github_pages directive" do
     subject { described_class.new("test", source: "github_pages 'example.com'") }
 

data/spec/bard/provision/logrotation_spec.rb

@@ -4,7 +4,7 @@ require "bard/provision/logrotation"
 
 describe Bard::Provision::LogRotation do
   let(:server) { double("server", project_name: "test_app") }
-  let(:config) { { production: server } }
+  let(:config) { double("config", project_name: "test_app", :[] => server) }
   let(:ssh_url) { "user@example.com" }
   let(:provision_server) { double("provision_server") }
   let(:logrotation) { Bard::Provision::LogRotation.new(config, ssh_url) }

data/spec/bard/provision/passenger_spec.rb

@@ -4,7 +4,7 @@ require "bard/provision/passenger"
 
 describe Bard::Provision::Passenger do
   let(:server) { double("server", project_name: "test_app") }
-  let(:config) { { production: server } }
+  let(:config) { double("config", project_name: "test_app", :[] => server) }
   let(:ssh_url) { "user@example.com" }
   let(:provision_server) { double("provision_server") }
   let(:passenger) { Bard::Provision::Passenger.new(config, ssh_url) }

data/spec/bard/provision/repo_spec.rb

@@ -5,7 +5,7 @@ require "bard/provision/repo"
 describe Bard::Provision::Repo do
   let(:ssh_uri) { double("ssh_uri", user: "deploy", host: "example.com") }
   let(:server) { double("server", ssh_uri: ssh_uri, project_name: "test_project") }
-  let(:config) { { production: server } }
+  let(:config) { double("config", project_name: "test_project", :[] => server) }
   let(:ssh_url) { "deploy@example.com" }
   let(:provision_server) { double("provision_server") }
   let(:github_api) { double("github_api") }

data/spec/bard/provision/ssh_spec.rb

@@ -45,26 +45,39 @@ describe Bard::Provision::SSH do
     context "when SSH is not available on target port but available on default port" do
       it "reconfigures SSH port and adds to known hosts" do
         allow(ssh_provisioner).to receive(:password_auth_enabled?).and_return(false)
-        allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri, port: 2222).and_return(false)
+        allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri, port: 2222).and_return(false, true)
         allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri).and_return(true)
         allow(ssh_provisioner).to receive(:ssh_known_host?).with(provision_ssh_uri).and_return(false)
+        allow(ssh_provisioner).to receive(:sleep)
 
         expect(ssh_provisioner).to receive(:add_ssh_known_host!).with(provision_ssh_uri).twice
         expect(provision_server).to receive(:run!).with(
-          'echo "Port 2222" | sudo tee /etc/ssh/sshd_config.d/port_2222.conf; sudo service ssh restart',
+          'echo "Port 2222" | sudo tee /etc/ssh/sshd_config.d/port_2222.conf && sudo service ssh restart',
           home: true
         )
 
         ssh_provisioner.call
       end
 
-      it "prints status messages during reconfiguration" do
+      it "raises if new port is not responding after reconfiguration" do
         allow(ssh_provisioner).to receive(:password_auth_enabled?).and_return(false)
         allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri, port: 2222).and_return(false)
         allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri).and_return(true)
+        allow(ssh_provisioner).to receive(:ssh_known_host?).with(provision_ssh_uri).and_return(true)
+        allow(provision_server).to receive(:run!)
+        allow(ssh_provisioner).to receive(:sleep)
+
+        expect { ssh_provisioner.call }.to raise_error(/reconfigured SSH to port 2222 but it's not responding/)
+      end
+
+      it "prints status messages during reconfiguration" do
+        allow(ssh_provisioner).to receive(:password_auth_enabled?).and_return(false)
+        allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri, port: 2222).and_return(false, true)
+        allow(ssh_provisioner).to receive(:ssh_available?).with(provision_ssh_uri).and_return(true)
         allow(ssh_provisioner).to receive(:ssh_known_host?).and_return(false)
         allow(ssh_provisioner).to receive(:add_ssh_known_host!)
         allow(provision_server).to receive(:run!)
+        allow(ssh_provisioner).to receive(:sleep)
 
         expect(ssh_provisioner).to receive(:print).with("SSH:")
         expect(ssh_provisioner).to receive(:print).with(" Adding known host,")
@@ -218,7 +231,7 @@ describe Bard::Provision::SSH do
     describe "#disable_password_auth!" do
       it "creates sshd config file to disable password authentication and restarts ssh" do
         expect(provision_server).to receive(:run!).with(
-          %q{echo "PasswordAuthentication no" | sudo tee /etc/ssh/sshd_config.d/disable_password_auth.conf; sudo service ssh restart},
+          %q{echo "PasswordAuthentication no" | sudo tee /etc/ssh/sshd_config.d/disable_password_auth.conf && sudo service ssh restart},
           home: true
         )
 

data/spec/bard/provision/swapfile_spec.rb

@@ -16,7 +16,8 @@ describe Bard::Provision::Swapfile do
 
   describe "#call" do
     it "sets up swapfile on the server" do
-      expect(provision_server).to receive(:run!).with(/if \[ ! -f \/swapfile \]/)
+      expect(provision_server).to receive(:run!).with(/if \[ ! -f \/swapfile \]/, home: true).ordered
+      expect(provision_server).to receive(:run!).with("sudo swapon --show | grep -q /swapfile", home: true).ordered
 
       swapfile.call
     end

data/spec/bard/ssh_server_spec.rb

@@ -81,7 +81,7 @@ describe Bard::SSHServer do
 
     it "executes command via SSH" do
       expect(Open3).to receive(:capture3)
-        .with(/ssh.*deploy@example.com.*cd \/app && ls/)
+        .with(/ssh.*deploy@example.com.*cd.+\/app.+ls/)
         .and_return(["output", "", 0])
 
       server.run("ls")
@@ -94,7 +94,7 @@ describe Bard::SSHServer do
       )
 
       expect(Open3).to receive(:capture3)
-        .with(/RAILS_ENV=production/)
+        .with(/RAILS_ENV.*production/)
         .and_return(["output", "", 0])
 
       server_with_env.run("ls")
@@ -108,7 +108,7 @@ describe Bard::SSHServer do
 
     it "executes command via SSH" do
       expect(Open3).to receive(:capture3)
-        .with(/ssh.*deploy@example.com.*cd \/app && ls/)
+        .with(/ssh.*deploy@example.com.*cd.+\/app.+ls/)
         .and_return(["output", "", 0])
 
       server.run!("ls")
@@ -129,7 +129,7 @@ describe Bard::SSHServer do
 
     it "replaces current process with SSH command" do
       expect(server).to receive(:exec)
-        .with(/ssh.*deploy@example.com.*cd \/app && ls/)
+        .with(/ssh.*deploy@example.com.*cd.+\/app.+ls/)
 
       server.exec!("ls")
     end
@@ -140,7 +140,7 @@ describe Bard::SSHServer do
       server = described_class.new("deploy@example.com:22", path: "/var/www/app")
 
       expect(Open3).to receive(:capture3)
-        .with(/cd \/var\/www\/app && ls/)
+        .with(/cd.+\/var\/www\/app.+ls/)
         .and_return(["output", "", 0])
 
       server.run("ls")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-02-10 00:00:00.000000000 Z
+date: 2026-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor