bard 1.8.0 → 2.0.0.beta

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
@@ -219,41 +177,42 @@ module Bard
     # Remote command execution
     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 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
@@ -276,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.8.0"
+  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/*
 

data/spec/bard/command_spec.rb

@@ -11,7 +11,7 @@ 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])
+      expect(Open3).to receive(:capture3).with("ssh -tt  user@example.com 'cd /path/to && ls -l'").and_return(["output", "", 0])
       Bard::Command.run "ls -l", on: remote
     end
   end

data/spec/bard/copy_spec.rb

@@ -2,17 +2,17 @@ require "spec_helper"
 require "bard/copy"
 
 describe Bard::Copy do
-  let(:production) { double("production", key: :production, scp_uri: "user@example.com:/path/to/file", rsync_uri: "user@example.com:/path/to/", gateway: nil, ssh_key: nil, port: "22", path: "/path/to") }
+  let(:production) { double("production", key: :production, scp_uri: "user@example.com:/path/to/file", rsync_uri: "user@example.com:/path/to/", gateway: nil, ssh_key: nil, path: "/path/to") }
   let(:local) { double("local", key: :local) }
 
   context ".file" do
     it "should copy a file from a remote server to the local machine" do
-      expect(Bard::Command).to receive(:run!).with("scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR user@example.com:/path/to/file path/to/file", verbose: false)
+      expect(Bard::Command).to receive(:run!).with("scp   user@example.com:/path/to/file path/to/file", verbose: false)
       Bard::Copy.file "path/to/file", from: production, to: local
     end
 
     it "should copy a file from the local machine to a remote server" do
-      expect(Bard::Command).to receive(:run!).with("scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR path/to/file user@example.com:/path/to/file", verbose: false)
+      expect(Bard::Command).to receive(:run!).with("scp   path/to/file user@example.com:/path/to/file", verbose: false)
       Bard::Copy.file "path/to/file", from: local, to: production
     end
   end

data/spec/bard/ssh_server_spec.rb

@@ -40,18 +40,14 @@ describe Bard::SSHServer do
   end
 
   describe "#ssh_uri" do
-    it "returns a URI object" do
+    it "returns the SSH connection string" do
       server = described_class.new("deploy@example.com:22")
-      expect(server.ssh_uri).to be_a(URI::Generic)
-      expect(server.ssh_uri.scheme).to eq("ssh")
-      expect(server.ssh_uri.user).to eq("deploy")
-      expect(server.ssh_uri.host).to eq("example.com")
-      expect(server.ssh_uri.port).to eq(22)
+      expect(server.ssh_uri).to eq("deploy@example.com:22")
     end
 
     it "includes port if non-standard" do
       server = described_class.new("deploy@example.com:2222")
-      expect(server.ssh_uri.port).to eq(2222)
+      expect(server.ssh_uri).to eq("deploy@example.com:2222")
     end
   end
 

data/spec/bard/target_spec.rb

@@ -37,11 +37,7 @@ describe Bard::Target do
       end
 
       it "parses SSH URI" do
-        expect(target.ssh_uri).to be_a(URI::Generic)
-        expect(target.ssh_uri.scheme).to eq("ssh")
-        expect(target.ssh_uri.user).to eq("deploy")
-        expect(target.ssh_uri.host).to eq("example.com")
-        expect(target.ssh_uri.port).to eq(22)
+        expect(target.ssh_uri).to eq("deploy@example.com:22")
       end
     end
 
@@ -76,7 +72,7 @@ describe Bard::Target do
       end
 
       it "auto-configures ping URL from hostname" do
-        expect(target.ping_urls).to include("https://example.com")
+        expect(target.ping_urls).to include("example.com")
       end
     end
 
@@ -141,7 +137,7 @@ describe Bard::Target do
 
       it "executes command on remote server" do
         expect(Bard::Command).to receive(:run!)
-          .with("ls", on: target, home: false, verbose: false, quiet: false)
+          .with("ls", on: target.server, home: false, verbose: false, quiet: false)
         target.run!("ls")
       end
     end
@@ -155,7 +151,7 @@ describe Bard::Target do
 
       it "executes command on remote server without raising" do
         expect(Bard::Command).to receive(:run)
-          .with("ls", on: target, home: false, verbose: false, quiet: false)
+          .with("ls", on: target.server, home: false, verbose: false, quiet: false)
         target.run("ls")
       end
     end
@@ -169,7 +165,7 @@ describe Bard::Target do
 
       it "replaces process with remote command" do
         expect(Bard::Command).to receive(:exec!)
-          .with("ls", on: target, home: false)
+          .with("ls", on: target.server, home: false)
         target.exec!("ls")
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-01-22 00:00:00.000000000 Z
+date: 2025-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,13 +171,21 @@ files:
 - bard.gemspec
 - bin/bard
 - bin/setup
-- cucumber.yml
-- features/data.feature
-- features/deploy.feature
-- features/run.feature
-- features/step_definitions/bard_steps.rb
+- features/bard_check.feature
+- features/bard_deploy.feature
+- features/bard_pull.feature
+- features/bard_push.feature
+- features/podman_testcontainers.feature
+- features/step_definitions/check_steps.rb
+- features/step_definitions/git_steps.rb
+- features/step_definitions/global_steps.rb
+- features/step_definitions/podman_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/submodule_steps.rb
 - features/support/env.rb
-- features/support/test_server.rb
+- features/support/grit_ext.rb
+- features/support/io.rb
+- features/support/podman.rb
 - install_files/.github/dependabot.yml
 - install_files/.github/workflows/cache-ci.yml
 - install_files/.github/workflows/ci.yml
@@ -219,7 +227,6 @@ files:
 - lib/bard/deploy_strategy.rb
 - lib/bard/deploy_strategy/github_pages.rb
 - lib/bard/deploy_strategy/ssh.rb
-- lib/bard/deprecation.rb
 - lib/bard/git.rb
 - lib/bard/github.rb
 - lib/bard/github_pages.rb
@@ -272,7 +279,6 @@ files:
 - spec/bard/copy_spec.rb
 - spec/bard/deploy_strategy/ssh_spec.rb
 - spec/bard/deploy_strategy_spec.rb
-- spec/bard/deprecation_spec.rb
 - spec/bard/dynamic_dsl_spec.rb
 - spec/bard/git_spec.rb
 - spec/bard/github_pages_spec.rb
@@ -323,12 +329,21 @@ rubygems_version: 3.6.2
 specification_version: 4
 summary: CLI to automate common development tasks.
 test_files:
-- features/data.feature
-- features/deploy.feature
-- features/run.feature
-- features/step_definitions/bard_steps.rb
+- features/bard_check.feature
+- features/bard_deploy.feature
+- features/bard_pull.feature
+- features/bard_push.feature
+- features/podman_testcontainers.feature
+- features/step_definitions/check_steps.rb
+- features/step_definitions/git_steps.rb
+- features/step_definitions/global_steps.rb
+- features/step_definitions/podman_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/submodule_steps.rb
 - features/support/env.rb
-- features/support/test_server.rb
+- features/support/grit_ext.rb
+- features/support/io.rb
+- features/support/podman.rb
 - spec/acceptance/.gitignore
 - spec/acceptance/docker/Dockerfile
 - spec/acceptance/docker/test_key
@@ -357,7 +372,6 @@ test_files:
 - spec/bard/copy_spec.rb
 - spec/bard/deploy_strategy/ssh_spec.rb
 - spec/bard/deploy_strategy_spec.rb
-- spec/bard/deprecation_spec.rb
 - spec/bard/dynamic_dsl_spec.rb
 - spec/bard/git_spec.rb
 - spec/bard/github_pages_spec.rb

data/cucumber.yml

@@ -1 +0,0 @@
-default: --publish-quiet

data/features/data.feature

@@ -1,12 +0,0 @@
-Feature: bard data
-  Copy database from a remote server to local.
-
-  Background:
-    Given a test server is running
-
-  Scenario: copies database from production to local
-    When I run: bard data
-    Then the output should contain "Dumping production database to file"
-    And the output should contain "Transfering file from production to local"
-    And the output should contain "Loading file into local database"
-    And a file "db/data.sql.gz" should exist locally

data/features/deploy.feature

@@ -1,13 +0,0 @@
-Feature: bard deploy
-  Deploy code changes to a remote server.
-
-  Background:
-    Given a test server is running
-
-  Scenario: deploys code changes to the remote server
-    Given I create a file "DEPLOYED.txt" with content "deployed by bard"
-    And I commit the changes with message "Add deployed marker"
-    When I run: bard deploy --skip-ci
-    Then the output should contain "Deploy Succeeded"
-    When I run: bard run "cat DEPLOYED.txt"
-    Then the output should contain "deployed by bard"

data/features/run.feature

@@ -1,13 +0,0 @@
-Feature: bard run
-  Execute commands on a remote server.
-
-  Background:
-    Given a test server is running
-
-  Scenario: executes a command on the remote server
-    When I run: bard run "echo hello"
-    Then the output should contain "hello"
-
-  Scenario: operates in the configured path
-    When I run: bard run "pwd"
-    Then the output should contain "testproject"

data/features/step_definitions/bard_steps.rb

@@ -1,39 +0,0 @@
-Given /^a test server is running$/ do
-  raise "Test server failed to start" unless @container && @ssh_port
-end
-
-When /^I run: bard (.+)$/ do |command|
-  run_bard(command)
-  unless @status.success?
-    raise "Command failed with status: #{@status}\nOutput: #{@stdout}"
-  end
-end
-
-When /^I run expecting failure: bard (.+)$/ do |command|
-  run_bard(command)
-  unless !@status.success?
-    raise "Command succeeded but was expected to fail\nOutput: #{@stdout}"
-  end
-end
-
-Then /^the output should contain "([^\"]+)"$/ do |expected|
-  expect(@stdout).to include(expected)
-end
-
-Given /^I create a file "([^\"]+)" with content "([^\"]+)"$/ do |filename, content|
-  Dir.chdir(@test_dir) do
-    File.write(filename, content)
-  end
-end
-
-Given /^I commit the changes with message "([^\"]+)"$/ do |message|
-  Dir.chdir(@test_dir) do
-    system("git add -A", out: File::NULL, err: File::NULL)
-    system("git commit -m '#{message}'", out: File::NULL, err: File::NULL)
-  end
-end
-
-Then /^a file "([^\"]+)" should exist locally$/ do |filename|
-  path = File.join(@test_dir, filename)
-  expect(File.exist?(path)).to be(true), "Expected file #{filename} to exist at #{path}"
-end

data/features/support/test_server.rb

@@ -1,215 +0,0 @@
-require "fileutils"
-require "open3"
-require "tmpdir"
-require "docker-api"
-
-module TestServerWorld
-  class << self
-    attr_accessor :server_available, :image_built
-  end
-
-  class PrerequisiteError < StandardError; end
-
-  def ensure_server_available
-    return if TestServerWorld.server_available
-
-    unless system("command -v podman >/dev/null 2>&1")
-      raise PrerequisiteError, "podman is not installed"
-    end
-
-    configure_container_socket
-    build_test_image
-    FileUtils.chmod(0o600, ssh_key_path)
-
-    TestServerWorld.server_available = true
-  end
-
-  def configure_container_socket
-    if ENV["DOCKER_HOST"]
-      Docker.url = ENV["DOCKER_HOST"]
-      return
-    end
-
-    socket_path = "/run/user/#{Process.uid}/podman/podman.sock"
-    unless File.exist?(socket_path)
-      system("systemctl --user start podman.socket 2>/dev/null")
-      sleep 2
-    end
-
-    unless File.exist?(socket_path)
-      raise PrerequisiteError, "Podman socket not available"
-    end
-
-    ENV["DOCKER_HOST"] = "unix://#{socket_path}"
-    Docker.url = ENV["DOCKER_HOST"]
-  end
-
-  def build_test_image
-    return if TestServerWorld.image_built
-
-    # Check if image already exists (e.g., pre-built in CI)
-    if image_exists?("bard-test-server")
-      TestServerWorld.image_built = true
-      return
-    end
-
-    system("podman pull ubuntu:22.04 >/dev/null 2>&1")
-
-    docker_dir = File.join(ROOT, "spec/acceptance/docker")
-    unless system("podman build -t bard-test-server -f #{docker_dir}/Dockerfile #{docker_dir} 2>&1")
-      raise PrerequisiteError, "Failed to build test image"
-    end
-
-    TestServerWorld.image_built = true
-  end
-
-  def image_exists?(name)
-    Docker::Image.get(name)
-    true
-  rescue Docker::Error::NotFoundError
-    false
-  end
-
-  def start_test_server
-    ensure_server_available
-
-    @container = Docker::Container.create(
-      "Image" => "localhost/bard-test-server:latest",
-      "ExposedPorts" => { "22/tcp" => {} },
-      "HostConfig" => {
-        "PortBindings" => { "22/tcp" => [{ "HostPort" => "" }] },
-        "PublishAllPorts" => true
-      }
-    )
-    @container.start
-    @container.refresh!
-
-    @ssh_port = @container.info["NetworkSettings"]["Ports"]["22/tcp"].first["HostPort"].to_i
-
-    wait_for_ssh
-    setup_test_directory
-  end
-
-  def wait_for_ssh
-    30.times do
-      return if system(
-        "ssh", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null",
-        "-o", "ConnectTimeout=1", "-p", @ssh_port.to_s, "-i", ssh_key_path,
-        "deploy@localhost", "true",
-        out: File::NULL, err: File::NULL
-      )
-      sleep 0.5
-    end
-    raise PrerequisiteError, "SSH not ready"
-  end
-
-  def setup_test_directory
-    # Set up git repos on the remote container
-    run_ssh "git config --global user.email 'test@example.com'"
-    run_ssh "git config --global user.name 'Test User'"
-    run_ssh "git config --global init.defaultBranch master"
-    run_ssh "mkdir -p ~/repos/testproject.git"
-    run_ssh "cd ~/repos/testproject.git && git init --bare"
-    run_ssh "git clone ~/repos/testproject.git ~/testproject"
-    run_ssh "mkdir -p ~/testproject/bin ~/testproject/db"
-
-    # bin/setup script
-    run_ssh "echo '#!/bin/bash' > ~/testproject/bin/setup"
-    run_ssh "echo 'echo Setup complete' >> ~/testproject/bin/setup"
-    run_ssh "chmod +x ~/testproject/bin/setup"
-
-    # bin/rake script for db:dump and db:load
-    run_ssh <<~'SETUP'
-      cat > ~/testproject/bin/rake << 'SCRIPT'
-#!/bin/bash
-case "$1" in
-  db:dump)
-    echo "production data" | gzip > db/data.sql.gz
-    ;;
-  db:load)
-    gunzip -c db/data.sql.gz > /dev/null
-    echo "Data loaded"
-    ;;
-esac
-SCRIPT
-    SETUP
-    run_ssh "chmod +x ~/testproject/bin/rake"
-    run_ssh "cd ~/testproject && git add . && git commit -m 'Initial commit'"
-    run_ssh "cd ~/testproject && git push origin master"
-
-    # Set up local git repo in isolated temp directory
-    setup_local_git_repo
-  end
-
-  def setup_local_git_repo
-    @test_dir = Dir.mktmpdir("bard_test")
-    @ssh_command = "ssh -i #{ssh_key_path} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-
-    Dir.chdir(@test_dir) do
-      # Clone directly into the temp directory (pass SSH command via env, not global ENV)
-      ssh_url = "ssh://deploy@localhost:#{@ssh_port}/home/deploy/repos/testproject.git"
-      system({ "GIT_SSH_COMMAND" => @ssh_command }, "git clone #{ssh_url} .", out: File::NULL, err: File::NULL)
-
-      # Configure git settings locally in this repo only
-      system("git config user.email 'test@example.com'", out: File::NULL, err: File::NULL)
-      system("git config user.name 'Test User'", out: File::NULL, err: File::NULL)
-      system("git config core.sshCommand '#{@ssh_command}'", out: File::NULL, err: File::NULL)
-
-      # Ensure db directory exists locally
-      FileUtils.mkdir_p("db")
-
-      # Write bard config in the test directory
-      File.write("bard.rb", <<~RUBY)
-        target :production do
-          ssh "deploy@localhost:#{@ssh_port}",
-            path: "testproject",
-            ssh_key: "#{ssh_key_path}"
-          ping false
-        end
-      RUBY
-    end
-  end
-
-  def run_ssh(command)
-    stdout, status = Open3.capture2e(
-      "ssh", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null",
-      "-p", @ssh_port.to_s, "-i", ssh_key_path,
-      "deploy@localhost", command
-    )
-    unless status.success?
-      raise PrerequisiteError, "SSH command failed: #{command}\nOutput: #{stdout}"
-    end
-    true
-  end
-
-  def run_bard(command)
-    Dir.chdir(@test_dir) do
-      @stdout, @status = Open3.capture2e("bard #{command}")
-    end
-  end
-
-  def ssh_key_path
-    File.join(ROOT, "spec/acceptance/docker/test_key")
-  end
-
-  def stop_test_server
-    return unless @container
-    @container.stop rescue nil
-    @container.delete(force: true) rescue nil
-  ensure
-    @container = nil
-    @ssh_port = nil
-    FileUtils.rm_rf(@test_dir) if @test_dir
-    @test_dir = nil
-  end
-end
-
-World(TestServerWorld)
-
-Before do
-  start_test_server
-end
-
-After do
-  stop_test_server
-end