bard 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d66092e3bc2b19b6010e668ead98981db7d41ce14434be33b02caa7c7c23e97
-  data.tar.gz: bbe41031b2b9c5974069bae36a5606063d3d4a75f43bf86ac61787b60e12eb9b
+  metadata.gz: '09960cdea14d636cd11c29d1f88114783daf97c144b379645daee11077f58815'
+  data.tar.gz: 52089e9a96cd8aacb4e49bb075b03199e18f138bffdb6bc6e86d5f8262a017a3
 SHA512:
-  metadata.gz: d13c12fc322c9cdcfa2ae0c8a6a5fd9c4e033e026ef423823494d02f63eec55a5bd1a7268689017b56bf7e4243ece08f2b041d41958b751f2808d5403529d745
-  data.tar.gz: 26a9703810bc8c2063803a8efc8720ca2bb9e9f6cb82667e18b00297b76256a745434a453cabd1bb6f1966337a6b1b27e6bcd62674671922d300ccdad53e25e3
+  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/command.rb

@@ -1,4 +1,5 @@
 require "open3"
+require "shellwords"
 
 module Bard
   class Command < Struct.new(:command, :on, :home)
@@ -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/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/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/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/version.rb

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

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/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/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.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-02-11 00:00:00.000000000 Z
+date: 2026-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor