bard 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937ff227cd4b15691d6aa48c4d5f6670aa6c0232adf650672bd8790fb6baa6fa
-  data.tar.gz: 2858f62171dedf98e5518e16a82b0e1569c8c251024e7a934b9ebcbbec15a568
+  metadata.gz: 9d66092e3bc2b19b6010e668ead98981db7d41ce14434be33b02caa7c7c23e97
+  data.tar.gz: bbe41031b2b9c5974069bae36a5606063d3d4a75f43bf86ac61787b60e12eb9b
 SHA512:
-  metadata.gz: 03ecce7b9ee18e490a207d776b92958f71d17d2738f6641ceeb9a9a1605aba169dff86f942ae727134197bbed6b5b80825ed8a9a02b17d912dee3aa176ecae89
-  data.tar.gz: b39fe1a1e8d4e92961425ffdd5856d90f926d6f96cb19690e884b2b7c00776f1251285c9ef2034303f0cd3490823206cf975903f775ac19104e4b3243ac72b14
+  metadata.gz: d13c12fc322c9cdcfa2ae0c8a6a5fd9c4e033e026ef423823494d02f63eec55a5bd1a7268689017b56bf7e4243ece08f2b041d41958b751f2808d5403529d745
+  data.tar.gz: 26a9703810bc8c2063803a8efc8720ca2bb9e9f6cb82667e18b00297b76256a745434a453cabd1bb6f1966337a6b1b27e6bcd62674671922d300ccdad53e25e3

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

@@ -17,9 +17,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

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/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/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/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.1"
 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/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/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
         )
 

metadata

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