bard 2.2.0 → 3.1.0

data/lib/bard/plugins/ssh/connection.rb

@@ -1,8 +1,8 @@
 require "uri"
-require "shellwords"
 require "bard/plugins/ssh/server"
-require "bard/command"
 
+# Data-only SSH mixin: enough for the parser to hold a target's connection details and
+# derive its url. The command-running methods (run!/ssh_command) live in bard-cli.
 module Bard
   module SSH
     def server
@@ -38,38 +38,5 @@ module Bard
       str += "/#{file_path}" if file_path
       str
     end
-
-    def run!(command, home: false, verbose: false, quiet: false, capture: false)
-      result = Command.run!(ssh_command(command, home:), verbose:, quiet:)
-      result if capture
-    end
-
-    def run(command, home: false, verbose: false, quiet: false)
-      Command.run(ssh_command(command, home:), verbose:, quiet:)
-    end
-
-    def exec!(command, home: false)
-      Command.exec!(ssh_command(command, home:))
-    end
-
-    private
-
-    def ssh_command(command, home: false)
-      cmd = command
-      cmd = "#{env} #{command}" if env
-
-      unless home
-        cmd = "cd #{path} && #{cmd}" if path
-      end
-
-      ssh_opts = ["-tt", "-o StrictHostKeyChecking=no", "-o UserKnownHostsFile=/dev/null", "-o LogLevel=ERROR"]
-      ssh_opts << "-i #{ssh_key}" if ssh_key
-      ssh_opts << "-p #{server.port}" if server.port && server.port != "22"
-      ssh_opts << "-o ProxyJump=#{gateway}" if gateway
-
-      ssh_target = "#{server.user}@#{server.host}"
-
-      "ssh #{ssh_opts.join(" ")} #{ssh_target} #{Shellwords.shellescape(cmd)}"
-    end
   end
 end

data/lib/bard/target.rb

@@ -1,5 +1,3 @@
-require "bard/command"
-
 module Bard
   class Target
     attr_reader :key, :config
@@ -30,19 +28,6 @@ module Bard
       @path || config.project_name
     end
 
-    def run!(command, home: false, verbose: false, quiet: false, capture: false)
-      result = Command.run!(command, verbose:, quiet:)
-      result if capture
-    end
-
-    def run(command, home: false, verbose: false, quiet: false)
-      Command.run(command, verbose:, quiet:)
-    end
-
-    def exec!(command, home: false)
-      Command.exec!(command)
-    end
-
     # Utility methods
     def to_s
       key.to_s

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "2.2.0"
+  VERSION = "3.1.0"
 end
 

data/lib/bard.rb

@@ -1 +1,2 @@
-require "bard/cli"
+require "bard/version"
+require "bard/config"

data/spec/bard/capability_spec.rb

@@ -44,12 +44,4 @@ describe "Capability System" do
     end
   end
 
-  describe "capability dependency checking" do
-    context "URL-dependent methods" do
-      it "ping! requires url capability" do
-        expect { target.ping! }
-          .to raise_error(/url capability not configured/)
-      end
-    end
-  end
 end

data/spec/bard/config_spec.rb

@@ -1,7 +1,7 @@
+require "tmpdir"
+require "fileutils"
 require "bard/config"
 require "bard/plugins/ssh/target_methods"
-require "bard/plugins/data"
-require "bard/plugins/github_pages"
 
 describe Bard::Config do
   describe ".detect_project_name" do
@@ -56,8 +56,8 @@ describe Bard::Config do
     end
 
     describe "#targets" do
-      it "is prefilled with default targets" do
-        expect(subject.targets.keys).to eq %i[local gubs ci staging production]
+      it "is prefilled with the generic local target" do
+        expect(subject.targets.keys).to eq %i[local]
       end
 
       it "creates Target instances for defaults" do
@@ -66,19 +66,6 @@ describe Bard::Config do
         end
       end
     end
-
-    describe "#[]" do
-      it "defines a default production target equivalent to staging" do
-        expect(subject[:production]).to eq subject[:staging]
-        expect(subject[:production]).not_to equal subject[:staging]
-      end
-    end
-
-    describe "#data" do
-      it "return an empty array" do
-        expect(subject.data).to eq []
-      end
-    end
   end
 
   context "with production definition" do
@@ -87,8 +74,6 @@ describe Bard::Config do
         ssh "www@ssh.botandrose.com:22022"
         url "tracker.botandrose.com"
       end
-
-      data "public/system", "public/ckeditor"
     SOURCE
 
     describe "#project_name" do
@@ -98,75 +83,53 @@ describe Bard::Config do
     end
 
     describe "#targets" do
-      it "contains the defined target" do
-        expect(subject.targets.keys).to eq %i[local gubs ci staging production]
+      it "contains the defined target alongside the local default" do
+        expect(subject.targets.keys).to eq %i[local production]
       end
     end
 
     describe "#target" do
-      it "can overwrite existing definition" do
+      it "can define a target" do
         subject.target :staging do
           ssh "www@tracker-staging.botandrose.com:22022"
         end
         expect(subject[:staging].server.to_s).to eq "www@tracker-staging.botandrose.com:22022"
       end
     end
-
-    describe "#data" do
-      it "returns the data setting" do
-        expect(subject.data).to eq ["public/system", "public/ckeditor"]
-      end
-    end
   end
 
-  context "with remove_target" do
-    subject { described_class.new("tracker", source: <<~SOURCE) }
-      remove_target :staging
-      target :staging do
-        ssh "deploy@new-host.com"
-      end
-    SOURCE
+  describe "unknown DSL (plugin-contributed)" do
+    after { Bard::Config.strict = false }
 
-    it "replaces the default with a fresh target" do
-      staging = subject[:staging]
-      expect(staging).to be_a(Bard::Target)
-      expect(staging.ssh.to_s).to eq "deploy@new-host.com"
-      expect(staging.url).to eq "https://new-host.com"
+    it "is tolerated as an attribute by default (server/test parsing)" do
+      config = described_class.new("tracker", source: <<~SOURCE)
+        ci :github_actions
+        data "public/system", "public/ckeditor"
+      SOURCE
+      expect(config.ci).to eq :github_actions
+      expect(config.data).to eq ["public/system", "public/ckeditor"]
     end
-  end
 
-  context "with github_pages directive" do
-    subject { described_class.new("test", source: "github_pages 'example.com'") }
-
-    describe "#target" do
-      it "creates a production target with github_pages enabled" do
-        production = subject[:production]
-        expect(production).not_to be_nil
-        expect(production.github_pages).to eq "example.com"
-        expect(production.ssh).to be_nil
-      end
+    it "raises in strict mode (CLI parsing) so typos surface" do
+      Bard::Config.strict = true
+      expect {
+        described_class.new("tracker", source: "typoed_directive :oops")
+      }.to raise_error(NoMethodError)
     end
   end
 
-  context "with github_pages directive and no domain" do
-    subject { described_class.new("test", source: "github_pages") }
-
-    before do
-      allow(Bard::Git).to receive(:github_pages_url).and_return("https://acme.github.io/widgets/")
-    end
+  describe "#remove_target" do
+    subject { described_class.new("tracker") }
 
-    describe "#target" do
-      it "creates a production target with github_pages enabled and no custom domain" do
-        production = subject[:production]
-        expect(production).not_to be_nil
-        expect(production.has_capability?(:github_pages)).to be true
-        expect(production.github_pages).to be_nil
-        expect(production.ssh).to be_nil
+    it "removes a defined target" do
+      subject.target :staging do
+        ssh "deploy@new-host.com"
       end
+      expect(subject[:staging].ssh.to_s).to eq "deploy@new-host.com"
+      expect(subject[:staging].url).to eq "https://new-host.com"
 
-      it "uses the derived github.io url for pinging" do
-        expect(subject[:production].url).to eq "https://acme.github.io/widgets/"
-      end
+      subject.remove_target :staging
+      expect(subject[:staging]).to be_nil
     end
   end
 end

data/spec/bard/target_spec.rb

@@ -4,6 +4,7 @@ require "bard/target"
 require "bard/plugins/url/target_methods"
 require "bard/plugins/ssh/target_methods"
 require "bard/plugins/ping/target_methods"
+require "bard/plugins/deploy_url/target_methods"
 
 describe Bard::Target do
   let(:config) { double("config", project_name: "testapp") }
@@ -134,54 +135,52 @@ describe Bard::Target do
     end
   end
 
-  describe "#path" do
-    it "defaults to project name" do
-      expect(target.path).to eq("testapp")
+  describe "#deploy_url" do
+    it "builds the /bard/deploy endpoint from an ssh-derived url" do
+      target.ssh("www@example.com:22022")
+      expect(target.deploy_url).to eq("https://example.com/bard/deploy")
     end
 
-    it "can be set via ssh options" do
-      target.ssh("deploy@example.com:22", path: "/app")
-      expect(target.path).to eq("/app")
+    it "prefers the ping host over the ssh-derived url" do
+      target.ssh("www@ssh.example.com:22022")
+      target.ping("example.com")
+      expect(target.deploy_url).to eq("https://example.com/bard/deploy")
     end
-  end
 
-  describe "command execution" do
-    describe "local (base)" do
-      it "runs commands locally" do
-        expect(Bard::Command).to receive(:run!)
-          .with("ls", verbose: false, quiet: false)
-        target.run!("ls")
-      end
+    it "anchors to the host root, dropping any ping path" do
+      target.ping("admin.example.com/up")
+      expect(target.deploy_url).to eq("https://admin.example.com/bard/deploy")
     end
 
-    describe "remote (SSH)" do
-      before do
-        target.ssh("deploy@example.com:22", path: "/app")
-      end
+    it "uses the first ping when several are configured" do
+      target.ping("primary.example.com", "secondary.example.com")
+      expect(target.deploy_url).to eq("https://primary.example.com/bard/deploy")
+    end
 
-      it "runs commands on remote server" do
-        expected_cmd = "ssh -tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR deploy@example.com #{Shellwords.shellescape("cd /app && ls")}"
-        expect(Bard::Command).to receive(:run!)
-          .with(expected_cmd, verbose: false, quiet: false)
-        target.run!("ls")
-      end
+    it "falls back to url when ping is disabled" do
+      target.url("example.com")
+      target.ping(false)
+      expect(target.deploy_url).to eq("https://example.com/bard/deploy")
+    end
 
-      it "runs commands without raising on remote server" do
-        expected_cmd = "ssh -tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR deploy@example.com #{Shellwords.shellescape("cd /app && ls")}"
-        expect(Bard::Command).to receive(:run)
-          .with(expected_cmd, verbose: false, quiet: false)
-        target.run("ls")
-      end
+    it "returns nil when the target has no web address" do
+      expect(target.deploy_url).to be_nil
+    end
+  end
 
-      it "replaces process with remote command" do
-        expected_cmd = "ssh -tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR deploy@example.com #{Shellwords.shellescape("cd /app && ls")}"
-        expect(Bard::Command).to receive(:exec!)
-          .with(expected_cmd)
-        target.exec!("ls")
-      end
+  describe "#path" do
+    it "defaults to project name" do
+      expect(target.path).to eq("testapp")
+    end
+
+    it "can be set via ssh options" do
+      target.ssh("deploy@example.com:22", path: "/app")
+      expect(target.path).to eq("/app")
     end
   end
 
+  # command execution (run!/run/exec!) lives in bard-cli now; covered by its target_spec.
+
   describe "#to_s" do
     it "returns the target key as string" do
       expect(target.to_s).to eq("production")

metadata

@@ -1,70 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-07-06 00:00:00.000000000 Z
+date: 2026-07-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: rvm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbnacl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,52 +51,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: testcontainers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 email:
 - micah@botandrose.com
-executables:
-- bard
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -160,108 +61,27 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
-- ARCHITECTURE.md
 - CLAUDE.md
-- CUSTOM_STRATEGIES.md
 - Gemfile
 - LICENSE
-- MIGRATION_GUIDE.md
-- PLUGINS.md
 - README.md
 - Rakefile
 - bard.gemspec
-- bin/bard
 - bin/setup
 - cucumber.yml
-- features/ci.feature
-- features/data.feature
-- features/deploy.feature
-- features/deploy_git_workflow.feature
-- features/run.feature
-- features/step_definitions/bard_steps.rb
-- features/support/bard-coverage
-- features/support/env.rb
-- features/support/test_server.rb
 - lib/bard.rb
-- lib/bard/cli.rb
-- lib/bard/command.rb
 - lib/bard/config.rb
-- lib/bard/copy.rb
-- lib/bard/plugins/data.rb
-- lib/bard/plugins/deploy.rb
-- lib/bard/plugins/deploy/ci.rb
-- lib/bard/plugins/deploy/ci/github_actions.rb
-- lib/bard/plugins/deploy/ci/jenkins.rb
-- lib/bard/plugins/deploy/ci/local.rb
-- lib/bard/plugins/deploy/ci/runner.rb
-- lib/bard/plugins/deploy/ci/state.rb
-- lib/bard/plugins/deploy/ssh_strategy.rb
-- lib/bard/plugins/deploy/strategy.rb
-- lib/bard/plugins/git.rb
-- lib/bard/plugins/github.rb
-- lib/bard/plugins/github_pages.rb
-- lib/bard/plugins/github_pages/strategy.rb
-- lib/bard/plugins/hurt.rb
-- lib/bard/plugins/install.rb
-- lib/bard/plugins/install/.github/dependabot.yml
-- lib/bard/plugins/install/.github/workflows/cache-ci.yml
-- lib/bard/plugins/install/.github/workflows/ci.yml
-- lib/bard/plugins/install/apt_dependencies.rb
-- lib/bard/plugins/install/ci
-- lib/bard/plugins/install/setup
-- lib/bard/plugins/install/specified_bundler.rb
-- lib/bard/plugins/install/specified_ruby.rb
-- lib/bard/plugins/open.rb
-- lib/bard/plugins/ping.rb
-- lib/bard/plugins/ping/check.rb
+- lib/bard/plugins/deploy_url/target_methods.rb
 - lib/bard/plugins/ping/target_methods.rb
-- lib/bard/plugins/run.rb
-- lib/bard/plugins/setup.rb
-- lib/bard/plugins/ssh.rb
 - lib/bard/plugins/ssh/connection.rb
-- lib/bard/plugins/ssh/copy.rb
 - lib/bard/plugins/ssh/server.rb
 - lib/bard/plugins/ssh/target_methods.rb
 - lib/bard/plugins/url.rb
 - lib/bard/plugins/url/target_methods.rb
-- lib/bard/plugins/vim.rb
-- lib/bard/retryable.rb
-- lib/bard/secrets.rb
 - lib/bard/target.rb
 - lib/bard/version.rb
-- spec/acceptance/.gitignore
-- spec/acceptance/docker/Dockerfile
-- spec/acceptance/docker/test_key
-- spec/acceptance/docker/test_key.pub
 - spec/bard/capability_spec.rb
-- spec/bard/ci/github_actions_spec.rb
-- spec/bard/ci/jenkins_spec.rb
-- spec/bard/ci/runner_spec.rb
-- spec/bard/ci_spec.rb
-- spec/bard/cli/ci_spec.rb
-- spec/bard/cli/data_spec.rb
-- spec/bard/cli/deploy_spec.rb
-- spec/bard/cli/hurt_spec.rb
-- spec/bard/cli/install_spec.rb
-- spec/bard/cli/master_key_spec.rb
-- spec/bard/cli/open_spec.rb
-- spec/bard/cli/ping_spec.rb
-- spec/bard/cli/run_spec.rb
-- spec/bard/cli/setup_spec.rb
-- spec/bard/cli/ssh_spec.rb
-- spec/bard/cli/stage_spec.rb
-- spec/bard/cli/vim_spec.rb
-- spec/bard/command_spec.rb
 - spec/bard/config_spec.rb
-- spec/bard/copy_spec.rb
-- spec/bard/deploy_strategy/github_pages_spec.rb
-- spec/bard/deploy_strategy/ssh_spec.rb
-- spec/bard/deploy_strategy_spec.rb
-- spec/bard/dynamic_dsl_spec.rb
-- spec/bard/git_spec.rb
-- spec/bard/github_spec.rb
-- spec/bard/ping_spec.rb
-- spec/bard/ssh_copy_spec.rb
 - spec/bard/ssh_server_spec.rb
 - spec/bard/target_spec.rb
 - spec/bard_spec.rb
@@ -288,50 +108,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.2
 specification_version: 4
-summary: CLI to automate common development tasks.
+summary: Config core for bard.
 test_files:
-- features/ci.feature
-- features/data.feature
-- features/deploy.feature
-- features/deploy_git_workflow.feature
-- features/run.feature
-- features/step_definitions/bard_steps.rb
-- features/support/bard-coverage
-- features/support/env.rb
-- features/support/test_server.rb
-- spec/acceptance/.gitignore
-- spec/acceptance/docker/Dockerfile
-- spec/acceptance/docker/test_key
-- spec/acceptance/docker/test_key.pub
 - spec/bard/capability_spec.rb
-- spec/bard/ci/github_actions_spec.rb
-- spec/bard/ci/jenkins_spec.rb
-- spec/bard/ci/runner_spec.rb
-- spec/bard/ci_spec.rb
-- spec/bard/cli/ci_spec.rb
-- spec/bard/cli/data_spec.rb
-- spec/bard/cli/deploy_spec.rb
-- spec/bard/cli/hurt_spec.rb
-- spec/bard/cli/install_spec.rb
-- spec/bard/cli/master_key_spec.rb
-- spec/bard/cli/open_spec.rb
-- spec/bard/cli/ping_spec.rb
-- spec/bard/cli/run_spec.rb
-- spec/bard/cli/setup_spec.rb
-- spec/bard/cli/ssh_spec.rb
-- spec/bard/cli/stage_spec.rb
-- spec/bard/cli/vim_spec.rb
-- spec/bard/command_spec.rb
 - spec/bard/config_spec.rb
-- spec/bard/copy_spec.rb
-- spec/bard/deploy_strategy/github_pages_spec.rb
-- spec/bard/deploy_strategy/ssh_spec.rb
-- spec/bard/deploy_strategy_spec.rb
-- spec/bard/dynamic_dsl_spec.rb
-- spec/bard/git_spec.rb
-- spec/bard/github_spec.rb
-- spec/bard/ping_spec.rb
-- spec/bard/ssh_copy_spec.rb
 - spec/bard/ssh_server_spec.rb
 - spec/bard/target_spec.rb
 - spec/bard_spec.rb