bard 1.9.6 → 2.0.0.beta

data/lib/bard/config.rb

@@ -1,6 +1,5 @@
 require "bard/server"
 require "bard/target"
-require "bard/deprecation"
 
 module Bard
   class Config
@@ -44,21 +43,14 @@ module Bard
 
     # Old v1.x API - creates Server instances
     def server(key, &block)
-      Deprecation.warn "`server` is deprecated; use `target` instead (will be removed in v2.0)"
       key = key.to_sym
       @servers[key] = Server.define(project_name, key, &block)
     end
 
-    def remove_target(key)
-      @servers.delete(key.to_sym)
-    end
-
     # New v2.0 API - creates Target instances
     def target(key, &block)
       key = key.to_sym
-      unless @servers[key].is_a?(Target)
-        @servers[key] = Target.new(key, self)
-      end
+      @servers[key] ||= Target.new(key, self)
       @servers[key].instance_eval(&block) if block
       @servers[key]
     end
@@ -137,7 +129,19 @@ module Bard
       return nil if @ci_system == false
 
       require "bard/ci"
-      CI.new(project_name, branch, runner_name: @ci_system)
+
+      # Use the existing CI class which handles auto-detection
+      case @ci_system
+      when :local
+        CI.new(project_name, branch, local: true)
+      when :github_actions, :jenkins, nil
+        # CI class auto-detects between github_actions and jenkins
+        CI.new(project_name, branch)
+      when false
+        nil
+      else
+        CI.new(project_name, branch)
+      end
     end
 
     private

data/lib/bard/copy.rb

@@ -29,16 +29,10 @@ module Bard
 
       ssh_key = ssh_server.ssh_key ? "-i #{ssh_server.ssh_key}" : ""
 
-      ssh_opts = "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR"
-
-      # scp uses -P for port (uppercase, unlike ssh's -p)
-      port = ssh_server.port
-      port_opt = port && port.to_s != "22" ? "-P #{port}" : ""
-
-      from_and_to = [path, target_or_server.scp_uri(path).to_s]
+      from_and_to = [path, target_or_server.scp_uri(path)]
       from_and_to.reverse! if direction == :from
 
-      command = ["scp", ssh_opts, gateway, ssh_key, port_opt, *from_and_to].reject(&:empty?).join(" ")
+      command = ["scp", gateway, ssh_key, *from_and_to].join(" ")
       Bard::Command.run! command, verbose: verbose
     end
 
@@ -65,7 +59,18 @@ module Bard
       # Support both new Target (with server attribute) and old Server
       ssh_server = target_or_server.respond_to?(:server) ? target_or_server.server : target_or_server
 
-      ssh_uri = ssh_server.ssh_uri
+      # Get ssh_uri - it might be a URI object (old Server), string (new SSHServer), or mock
+      ssh_uri_value = ssh_server.respond_to?(:ssh_uri) ? ssh_server.ssh_uri : nil
+      if ssh_uri_value.respond_to?(:port)
+        # Already a URI-like object (old Server or mock)
+        ssh_uri = ssh_uri_value
+      elsif ssh_uri_value.is_a?(String)
+        # String from new SSHServer
+        ssh_uri = URI("ssh://#{ssh_uri_value}")
+      else
+        # Fallback
+        ssh_uri = ssh_uri_value
+      end
 
       gateway = ssh_server.gateway ? "-oProxyCommand=\"ssh #{ssh_server.gateway} -W %h:%p\"" : ""
 
@@ -86,13 +91,29 @@ module Bard
 
       raise NotImplementedError if from_server.gateway || to_server.gateway || from_server.ssh_key || to_server.ssh_key
 
-      from_uri = from_server.ssh_uri
-      to_uri = to_server.ssh_uri
+      # Get ssh_uri - it might be a URI object (old Server), string (new SSHServer), or mock
+      from_uri_value = from_server.respond_to?(:ssh_uri) ? from_server.ssh_uri : nil
+      if from_uri_value.respond_to?(:port)
+        from_uri = from_uri_value
+      elsif from_uri_value.is_a?(String)
+        from_uri = URI("ssh://#{from_uri_value}")
+      else
+        from_uri = from_uri_value
+      end
+
+      to_uri_value = to_server.respond_to?(:ssh_uri) ? to_server.ssh_uri : nil
+      if to_uri_value.respond_to?(:port)
+        to_uri = to_uri_value
+      elsif to_uri_value.is_a?(String)
+        to_uri = URI("ssh://#{to_uri_value}")
+      else
+        to_uri = to_uri_value
+      end
 
       from_str = "-p#{from_uri.port || 22} #{from_uri.user}@#{from_uri.host}"
       to_str = to.rsync_uri(path).sub(%r(/[^/]+$), '/')
 
-      command = %(ssh -A #{from_str} 'rsync -e \"ssh -A -p#{to_uri.port || 22} -o StrictHostKeyChecking=no -o LogLevel=ERROR\" --delete --info=progress2 -az #{from.path}/#{path} #{to_str}')
+      command = %(ssh -A #{from_str} 'rsync -e \"ssh -A -p#{to_uri.port || 22} -o StrictHostKeyChecking=no\" --delete --info=progress2 -az #{from.path}/#{path} #{to_str}')
       Bard::Command.run! command, verbose: verbose
     end
   end

data/lib/bard/deploy_strategy/github_pages.rb

@@ -8,7 +8,7 @@ module Bard
     class GithubPages < DeployStrategy
       def initialize(target, url = nil, **options)
         super(target)
-        @url = url || target.github_pages
+        @url = url
         @options = options
 
         # Auto-configure ping URL if provided
@@ -65,15 +65,7 @@ module Bard
       ensure
         # cleanup
         run! <<~SH
-          PID=$(cat tmp/pids/server.pid 2>/dev/null)
-          if [ -n "$PID" ]; then
-            kill $PID 2>/dev/null
-            for i in 1 2 3 4 5; do
-              kill -0 $PID 2>/dev/null || break
-              sleep 1
-            done
-            kill -9 $PID 2>/dev/null || true
-          fi
+          cat tmp/pids/server.pid | xargs -I {} kill {}
           rm -rf public/assets
         SH
       end

data/lib/bard/deploy_strategy.rb

@@ -58,6 +58,3 @@ module Bard
     end
   end
 end
-
-# Auto-load all strategy files
-Dir[File.join(__dir__, "deploy_strategy", "*.rb")].each { |f| require f }

data/lib/bard/github.rb

@@ -3,7 +3,6 @@ require "json"
 require "base64"
 require "rbnacl"
 require "bard/ci/retryable"
-require "bard/secrets"
 
 module Bard
   class Github < Struct.new(:project_name)
@@ -108,7 +107,10 @@ module Bard
     private
 
     def api_key
-      @api_key ||= Bard::Secrets.fetch("github-apikey")
+      @api_key ||= begin
+        raw = `git ls-remote -t git@github.com:botandrosedesign/secrets`
+        raw[/github-apikey\|(.+)$/, 1]
+      end
     end
 
     def request path, &block

data/lib/bard/provision/apt.rb

@@ -7,7 +7,7 @@ class Bard::Provision::Apt < Bard::Provision
       %(echo "\\$nrconf{restart} = \\"a\\";" | sudo tee /etc/needrestart/conf.d/90-autorestart.conf),
       "sudo apt-get update -y",
       "sudo apt-get upgrade -y",
-      "sudo apt-get install -y curl build-essential",
+      "sudo apt-get install -y curl",
     ].join("; "), home: true
 
     puts " ✓"

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/#{config.project_name}
+      file=/etc/logrotate.d/#{server.project_name}
       if [ ! -f $file ]; then
         sudo tee $file > /dev/null <<EOF
       $(pwd)/log/*.log {

data/lib/bard/provision/mysql.rb

@@ -7,8 +7,8 @@ class Bard::Provision::MySQL < Bard::Provision
       print " Installing,"
       provision_server.run! [
         "sudo apt-get install -y mysql-server",
-        %{sudo mysql -uroot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '' PASSWORD EXPIRE NEVER; FLUSH PRIVILEGES;"},
-        %{mysql -uroot -e "UPDATE mysql.user SET password_lifetime = NULL WHERE user = 'root' AND host = 'localhost';"},
+        %(sudo mysql -uroot -e "ALTER USER \\"'\\"root\\"'\\"@\\"'\\"localhost\\"'\\" IDENTIFIED WITH mysql_native_password BY \\"'\\"\\"'\\", \\"'\\"root\\"'\\"@\\"'\\"localhost\\"'\\" PASSWORD EXPIRE NEVER; FLUSH PRIVILEGES;"),
+        %(mysql -uroot -e "UPDATE mysql.user SET password_lifetime = NULL WHERE user = \\"'\\"root\\"'\\" AND host = \\"'\\"localhost\\"'\\";"),
       ].join("; "), home: true
     end
 

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-2025.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.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/#{config.project_name} ]", quiet: true
+    provision_server.run "[ -f /etc/nginx/sites-enabled/#{server.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(config.project_name).add_deploy_key title:, key:
+        Bard::Github.new(server.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
-    config.project_name
+    server.project_name
   end
 
   def on_latest_master?

data/lib/bard/provision/ssh.rb

@@ -19,14 +19,7 @@ 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
-      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
+      provision_server.run! %(echo "Port #{target_port}" | sudo tee /etc/ssh/sshd_config.d/port_#{target_port}.conf; sudo service ssh restart), home: true
     end
 
     if !ssh_known_host?(provision_server.ssh_uri)
@@ -72,7 +65,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, home: true
+    provision_server.run! <<~SH
       if [ ! -f /swapfile ]; then
         sudo fallocate -l $(grep MemTotal /proc/meminfo | awk '{print $2}')K /swapfile
       fi
@@ -14,8 +14,6 @@ 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

@@ -1,7 +1,6 @@
 require "uri"
 require "bard/command"
 require "bard/copy"
-require "bard/deprecation"
 
 module Bard
   class Server < Struct.new(:project_name, :key, :ssh, :path, :ping, :gateway, :ssh_key, :env, :github_pages)
@@ -25,24 +24,7 @@ module Bard
       end
     end
 
-    def self.setting_with_deprecation *fields, message:
-      fields.each do |field|
-        define_method field do |*args|
-          if args.length == 1
-            Deprecation.warn message
-            send :"#{field}=", args.first
-          elsif args.length == 0
-            super()
-          else
-            raise ArgumentError
-          end
-        end
-      end
-    end
-
-    setting :ssh, :ping, :github_pages
-    setting_with_deprecation :gateway, :ssh_key, :env,
-      message: "Separate SSH options are deprecated; pass as keyword arguments to `ssh` instead, e.g., `ssh \"user@host\", path: \"/app\"` (will be removed in v2.0)"
+    setting :ssh, :path, :ping, :gateway, :ssh_key, :env, :github_pages
 
     def ping(*args)
       if args.length == 0
@@ -68,7 +50,6 @@ module Bard
 
     def path(*args)
       if args.length == 1
-        Deprecation.warn "Separate SSH options are deprecated; pass as keyword arguments to `ssh` instead, e.g., `ssh \"user@host\", path: \"/app\"` (will be removed in v2.0)"
         self.path = args.first
       elsif args.length == 0
         super() || project_name
@@ -77,34 +58,11 @@ module Bard
       end
     end
 
-    def strategy(name)
-      Deprecation.warn "`strategy` is deprecated; use the strategy method directly, e.g., `jets \"url\"` instead of `strategy :jets` (will be removed in v2.0)"
-      @strategy = name
-    end
-
-    def option(key, value)
-      Deprecation.warn "`option` is deprecated; pass options as keyword arguments to the strategy method, e.g., `jets \"url\", run_tests: true` (will be removed in v2.0)"
-      @options ||= {}
-      @options[key] = value
-    end
-
-    def strategy_name
-      @strategy
-    end
-
-    def strategy_options
-      @options || {}
-    end
-
     def ssh_uri which=:ssh
       value = send(which)
       URI("ssh://#{value}")
     end
 
-    def port
-      ssh_uri.port || 22
-    end
-
     def scp_uri file_path=nil
       ssh_uri.dup.tap do |uri|
         uri.scheme = "scp"
@@ -135,9 +93,8 @@ module Bard
       key
     end
 
-    def run! command, home: false, verbose: false, quiet: false, capture: false
-      result = Bard::Command.run!(command, on: self, home:, verbose:, quiet:)
-      result if capture
+    def run! command, home: false, verbose: false, quiet: false
+      Bard::Command.run! command, on: self, home:, verbose:, quiet:
     end
 
     def run command, home: false, verbose: false, quiet: false

data/lib/bard/ssh_server.rb

@@ -1,5 +1,4 @@
 require "uri"
-require "shellwords"
 require "bard/command"
 
 module Bard
@@ -24,19 +23,13 @@ module Bard
     end
 
     def ssh_uri
-      URI("ssh://#{user}@#{host}:#{port}")
+      "#{user}@#{host}:#{port}"
     end
 
     def hostname
       host
     end
 
-    def to_s
-      str = "#{user}@#{host}"
-      str += ":#{port}" if port && port != "22"
-      str
-    end
-
     def connection_string
       "#{user}@#{host}"
     end
@@ -100,7 +93,7 @@ module Bard
       remote_cmd += "cd #{path} && " if path
       remote_cmd += command
 
-      cmd += " #{Shellwords.shellescape(remote_cmd)}"
+      cmd += " '#{remote_cmd}'"
       cmd
     end
   end

data/lib/bard/target.rb

@@ -2,12 +2,11 @@ require "uri"
 require "bard/command"
 require "bard/copy"
 require "bard/deploy_strategy"
-require "bard/deprecation"
 
 module Bard
   class Target
-    attr_reader :key, :config
-    attr_accessor :server
+    attr_reader :key, :config, :path
+    attr_accessor :server, :gateway, :ssh_key, :env
 
     def initialize(key, config)
       @key = key
@@ -68,7 +67,7 @@ module Bard
 
         # Auto-configure ping from hostname
         hostname = @server.hostname
-        ping("https://#{hostname}") if hostname
+        ping(hostname) if hostname
       end
     end
 
@@ -79,46 +78,17 @@ module Bard
     # Path configuration
     def path(new_path = nil)
       if new_path
-        Deprecation.warn "Separate `path` call is deprecated; pass as keyword argument to `ssh` instead, e.g., `ssh \"user@host\", path: \"#{new_path}\"` (will be removed in v2.0)"
         @path = new_path
       else
         @path || config.project_name
       end
     end
 
-    # Deprecated separate setter methods - use ssh(..., option: value) instead
-    def gateway(value = nil)
-      if value
-        Deprecation.warn "Separate `gateway` call is deprecated; pass as keyword argument to `ssh` instead, e.g., `ssh \"user@host\", gateway: \"#{value}\"` (will be removed in v2.0)"
-        @gateway = value
-      else
-        @gateway
-      end
-    end
-
-    def ssh_key(value = nil)
-      if value
-        Deprecation.warn "Separate `ssh_key` call is deprecated; pass as keyword argument to `ssh` instead, e.g., `ssh \"user@host\", ssh_key: \"#{value}\"` (will be removed in v2.0)"
-        @ssh_key = value
-      else
-        @ssh_key
-      end
-    end
-
-    def env(value = nil)
-      if value
-        Deprecation.warn "Separate `env` call is deprecated; pass as keyword argument to `ssh` instead, e.g., `ssh \"user@host\", env: \"#{value}\"` (will be removed in v2.0)"
-        @env = value
-      else
-        @env
-      end
-    end
-
     # Ping configuration
     def ping(*urls)
       if urls.empty?
-        # Getter - normalize URLs like Server does
-        @ping_urls.map { |url| normalize_ping(url) }
+        # Getter
+        @ping_urls
       elsif urls.first == false
         # Disable ping
         @ping_urls = []
@@ -164,18 +134,6 @@ module Bard
       end
     end
 
-    # Deprecated strategy configuration methods
-    def strategy(name)
-      Deprecation.warn "`strategy` is deprecated; use the strategy method directly, e.g., `#{name} \"url\"` instead of `strategy :#{name}` (will be removed in v2.0)"
-      @deploy_strategy = name
-    end
-
-    def option(key, value)
-      Deprecation.warn "`option` is deprecated; pass options as keyword arguments to the strategy method, e.g., `jets \"url\", #{key}: #{value.inspect}` (will be removed in v2.0)"
-      @strategy_options_hash[@deploy_strategy] ||= {}
-      @strategy_options_hash[@deploy_strategy][key] = value
-    end
-
     def strategy_options(strategy_name)
       @strategy_options_hash[strategy_name] || {}
     end
@@ -217,44 +175,44 @@ module Bard
     end
 
     # Remote command execution
-    def run!(command, home: false, verbose: false, quiet: false, capture: false)
+    def run!(command, home: false, verbose: false, quiet: false)
       require_capability!(:ssh)
-      result = Command.run!(command, on: self, home: home, verbose: verbose, quiet: quiet)
-      result if capture
+      Command.run!(command, on: server, home: home, verbose: verbose, quiet: quiet)
     end
 
     def run(command, home: false, verbose: false, quiet: false)
       require_capability!(:ssh)
-      Command.run(command, on: self, home: home, verbose: verbose, quiet: quiet)
+      Command.run(command, on: server, home: home, verbose: verbose, quiet: quiet)
     end
 
     def exec!(command, home: false)
       require_capability!(:ssh)
-      Command.exec!(command, on: self, home: home)
+      Command.exec!(command, on: server, home: home)
     end
 
     # File transfer
     def copy_file(path, to:, verbose: false)
       require_capability!(:ssh)
-      to.require_capability!(:ssh) if to.respond_to?(:require_capability!)
+      to.require_capability!(:ssh)
       Copy.file(path, from: self, to: to, verbose: verbose)
     end
 
     def copy_dir(path, to:, verbose: false)
       require_capability!(:ssh)
-      to.require_capability!(:ssh) if to.respond_to?(:require_capability!)
+      to.require_capability!(:ssh)
       Copy.dir(path, from: self, to: to, verbose: verbose)
     end
 
     # URI methods for compatibility
     def scp_uri(file_path = nil)
-      full_path = "/#{path}"
-      full_path += "/#{file_path}" if file_path
-      URI::Generic.build(scheme: "scp", userinfo: server.user, host: server.host, port: server.port.to_i, path: full_path)
+      uri = URI("scp://#{ssh_uri}")
+      uri.path = "/#{path}"
+      uri.path += "/#{file_path}" if file_path
+      uri
     end
 
     def rsync_uri(file_path = nil)
-      uri = ssh_uri
+      uri = URI("ssh://#{ssh_uri}")
       str = "#{uri.user}@#{uri.host}"
       str += ":#{path}"
       str += "/#{file_path}" if file_path
@@ -277,14 +235,5 @@ module Bard
         end
       end
     end
-
-    private
-
-    def normalize_ping(value)
-      return nil if value == false || value.nil?
-      normalized = value.to_s
-      normalized = "https://#{normalized}" unless normalized.start_with?("http")
-      normalized
-    end
   end
 end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.9.6"
+  VERSION = "2.0.0.beta"
 end
 

data/spec/acceptance/docker/Dockerfile

@@ -3,11 +3,10 @@ FROM ubuntu:22.04
 # Prevent interactive prompts
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install SSH server, git, and basic tools
+# Install SSH server and basic tools
 RUN apt-get update && \
     apt-get install -y \
     openssh-server \
-    git \
     sudo \
     && rm -rf /var/lib/apt/lists/*