bard 1.8.0 → 1.9.0

data/spec/bard/cli/ci_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 require "bard/cli"
 require "bard/cli/ci"
 require "thor"
+require "ostruct"
 
 class TestCICLI < Thor
   include Bard::CLI::CI
@@ -16,6 +17,10 @@ class TestCICLI < Thor
   def project_name
     "test_project"
   end
+
+  def config
+    @config ||= OpenStruct.new(ci: nil)
+  end
 end
 
 describe Bard::CLI::CI do
@@ -101,12 +106,9 @@ describe Bard::CLI::CI do
       it "shows error message and exits" do
         allow(cli).to receive(:options).and_return({})
         allow(ci_runner).to receive(:exists?).and_return(false)
+        allow(cli).to receive(:exit).with(1).and_raise(SystemExit)
 
-        expect(cli).to receive(:puts) # "No CI found for test_project!"
-        expect(cli).to receive(:puts) # "Re-run with --skip-ci to bypass CI..."
-        expect(cli).to receive(:exit).with(1)
-
-        cli.ci
+        expect { cli.ci }.to raise_error(SystemExit)
       end
     end
 
@@ -116,7 +118,7 @@ describe Bard::CLI::CI do
         allow(ci_runner).to receive(:exists?).and_return(true)
         allow(ci_runner).to receive(:run).and_return(true)
 
-        expect(Bard::CI).to receive(:new).with("test_project", "develop", local: nil)
+        expect(Bard::CI).to receive(:new).with("test_project", "develop", runner_name: nil)
         expect(cli).to receive(:puts).with("Continuous integration: starting build on develop...")
 
         cli.ci("develop")
@@ -124,12 +126,36 @@ describe Bard::CLI::CI do
     end
 
     context "with local-ci option" do
-      it "passes local option to CI runner" do
+      it "passes local runner_name to CI" do
         allow(cli).to receive(:options).and_return({ "local-ci" => true })
         allow(ci_runner).to receive(:exists?).and_return(true)
         allow(ci_runner).to receive(:run).and_return(true)
 
-        expect(Bard::CI).to receive(:new).with("test_project", "feature-branch", local: true)
+        expect(Bard::CI).to receive(:new).with("test_project", "feature-branch", runner_name: :local)
+
+        cli.ci
+      end
+    end
+
+    context "with ci option" do
+      it "passes specified runner_name to CI" do
+        allow(cli).to receive(:options).and_return({ "ci" => "jenkins" })
+        allow(ci_runner).to receive(:exists?).and_return(true)
+        allow(ci_runner).to receive(:run).and_return(true)
+
+        expect(Bard::CI).to receive(:new).with("test_project", "feature-branch", runner_name: :jenkins)
+
+        cli.ci
+      end
+    end
+
+    context "with both local-ci and ci options" do
+      it "local-ci takes precedence" do
+        allow(cli).to receive(:options).and_return({ "local-ci" => true, "ci" => "jenkins" })
+        allow(ci_runner).to receive(:exists?).and_return(true)
+        allow(ci_runner).to receive(:run).and_return(true)
+
+        expect(Bard::CI).to receive(:new).with("test_project", "feature-branch", runner_name: :local)
 
         cli.ci
       end

data/spec/bard/cli/deploy_spec.rb

@@ -26,6 +26,7 @@ describe Bard::CLI::Deploy do
 
   before do
     allow(cli).to receive(:config).and_return(config)
+    allow(cli).to receive(:options).and_return({ target: "production" })
     allow(cli).to receive(:puts)
     allow(cli).to receive(:exit)
     allow(cli).to receive(:run!)
@@ -48,7 +49,7 @@ describe Bard::CLI::Deploy do
     context "when on master branch" do
       before do
         allow(Bard::Git).to receive(:current_branch).and_return("master")
-        allow(cli).to receive(:options).and_return({})
+        allow(cli).to receive(:options).and_return({ target: "production" })
       end
 
       context "when up to date with remote" do
@@ -79,7 +80,7 @@ describe Bard::CLI::Deploy do
 
       context "with skip-ci option" do
         it "skips CI step" do
-          allow(cli).to receive(:options).and_return({ "skip-ci" => true })
+          allow(cli).to receive(:options).and_return({ "skip-ci" => true, target: "production" })
 
           expect(cli).not_to receive(:invoke).with(:ci, anything, anything)
           expect(production_server).to receive(:run!).with("git pull origin master && bin/setup")
@@ -91,16 +92,16 @@ describe Bard::CLI::Deploy do
 
     context "when on feature branch" do
       before do
-        allow(cli).to receive(:options).and_return({})
+        allow(cli).to receive(:options).and_return({ target: "production" })
       end
 
       context "with fast-forward merge possible" do
         it "fetches master, pushes branch, runs CI, merges to master, and deploys" do
-          expect(cli).to receive(:run!).with("git fetch origin master:master")
+          expect(cli).to receive(:run!).with("git fetch origin")
+          expect(cli).to receive(:run!).with("git fetch origin master:master").twice
           expect(cli).to receive(:run!).with("git push -f origin feature-branch:feature-branch")
           expect(cli).to receive(:invoke).with(:ci, ["feature-branch"], {})
           expect(cli).to receive(:run!).with("git push origin feature-branch:master")
-          expect(cli).to receive(:run!).with("git fetch origin master:master")
           expect(production_server).to receive(:run!).with("git pull origin master && bin/setup")
 
           cli.deploy
@@ -141,7 +142,7 @@ describe Bard::CLI::Deploy do
 
     context "with clone option" do
       it "clones repository and sets up application" do
-        allow(cli).to receive(:options).and_return({ clone: true })
+        allow(cli).to receive(:options).and_return({ clone: true, target: "production" })
 
         expect(production_server).to receive(:run!).with("git clone git@github.com:botandrosedesign/test_project /var/www/test_project", home: true)
         expect(cli).to receive(:invoke).with(:master_key, [], from: "local", to: :production)
@@ -168,13 +169,14 @@ describe Bard::CLI::Deploy do
 
       before do
         allow(config).to receive(:[]).with(:staging).and_return(staging_server)
+        allow(cli).to receive(:options).and_return({ target: "staging" })
       end
 
       it "deploys to specified target" do
         expect(staging_server).to receive(:run!).with("git pull origin master && bin/setup")
         expect(cli).to receive(:ping).with(:staging)
 
-        cli.deploy(:staging)
+        cli.deploy
       end
     end
 
@@ -191,12 +193,22 @@ describe Bard::CLI::Deploy do
 
     context "with local-ci option" do
       it "passes local-ci option to CI invocation" do
-        allow(cli).to receive(:options).and_return({ "local-ci" => true })
+        allow(cli).to receive(:options).and_return({ "local-ci" => true, target: "production" })
 
         expect(cli).to receive(:invoke).with(:ci, ["feature-branch"], { "local-ci" => true })
 
         cli.deploy
       end
     end
+
+    context "with ci option" do
+      it "passes ci option to CI invocation" do
+        allow(cli).to receive(:options).and_return({ "ci" => "jenkins", target: "production" })
+
+        expect(cli).to receive(:invoke).with(:ci, ["feature-branch"], { "ci" => "jenkins" })
+
+        cli.deploy
+      end
+    end
   end
 end

data/spec/bard/cli/hurt_spec.rb

@@ -4,7 +4,7 @@ require "bard/cli/hurt"
 require "thor"
 
 class TestHurtCLI < Thor
-  include Bard::CLI::Hurt
+  Bard::CLI::Hurt.setup(self)
 end
 
 describe Bard::CLI::Hurt do
@@ -20,4 +20,4 @@ describe Bard::CLI::Hurt do
       expect(cli).to respond_to(:hurt)
     end
   end
-end
+end

data/spec/bard/cli/install_spec.rb

@@ -4,7 +4,7 @@ require "bard/cli/install"
 require "thor"
 
 class TestInstallCLI < Thor
-  include Bard::CLI::Install
+  Bard::CLI::Install.setup(self)
 end
 
 describe Bard::CLI::Install do
@@ -16,10 +16,10 @@ describe Bard::CLI::Install do
     end
 
     it "should copy install files to bin directory" do
-      expect(cli).to receive(:system).with(/cp -R .*install_files\/\* bin\//)
-      expect(cli).to receive(:system).with(/cp -R .*install_files\/\.github \.\//)
+      expect_any_instance_of(Bard::CLI::Install).to receive(:system).with(/cp -R .*install_files\/\* bin\//)
+      expect_any_instance_of(Bard::CLI::Install).to receive(:system).with(/cp -R .*install_files\/\.github \.\//)
 
       cli.install
     end
   end
-end
+end

data/spec/bard/cli/open_spec.rb

@@ -4,7 +4,7 @@ require "bard/cli/open"
 require "thor"
 
 class TestOpenCLI < Thor
-  include Bard::CLI::Open
+  Bard::CLI::Open.setup(self)
 
   attr_reader :config
 
@@ -25,7 +25,7 @@ describe Bard::CLI::Open do
 
   before do
     allow(cli).to receive(:config).and_return(config)
-    allow(cli).to receive(:exec)
+    allow_any_instance_of(Bard::CLI::Open).to receive(:exec)
   end
 
   describe "#open" do
@@ -34,7 +34,7 @@ describe Bard::CLI::Open do
     end
 
     it "should open production server URL by default" do
-      expect(cli).to receive(:exec).with("xdg-open https://example.com")
+      expect_any_instance_of(Bard::CLI::Open).to receive(:exec).with("xdg-open https://example.com")
 
       cli.open
     end
@@ -43,13 +43,13 @@ describe Bard::CLI::Open do
       staging_server = double("staging", ping: ["https://staging.example.com"])
       allow(config).to receive(:[]).with(:staging).and_return(staging_server)
 
-      expect(cli).to receive(:exec).with("xdg-open https://staging.example.com")
+      expect_any_instance_of(Bard::CLI::Open).to receive(:exec).with("xdg-open https://staging.example.com")
 
       cli.open(:staging)
     end
 
     it "should open CI URL when server is ci" do
-      expect(cli).to receive(:exec).with("xdg-open https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
+      expect_any_instance_of(Bard::CLI::Open).to receive(:exec).with("xdg-open https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
 
       cli.open(:ci)
     end
@@ -57,11 +57,13 @@ describe Bard::CLI::Open do
 
   describe "#open_url" do
     it "returns CI URL for ci server" do
-      expect(cli.send(:open_url, :ci)).to eq("https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
+      command = Bard::CLI::Open.new(cli)
+      expect(command.send(:open_url, :ci)).to eq("https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
     end
 
     it "returns server ping URL for other servers" do
-      expect(cli.send(:open_url, :production)).to eq("https://example.com")
+      command = Bard::CLI::Open.new(cli)
+      expect(command.send(:open_url, :production)).to eq("https://example.com")
     end
   end
-end
+end

data/spec/bard/cli/ping_spec.rb

@@ -4,7 +4,7 @@ require "bard/cli/ping"
 require "thor"
 
 class TestPingCLI < Thor
-  include Bard::CLI::Ping
+  Bard::CLI::Ping.setup(self)
 
   attr_reader :config
 
@@ -21,8 +21,8 @@ describe Bard::CLI::Ping do
 
   before do
     allow(cli).to receive(:config).and_return(config)
-    allow(cli).to receive(:puts)
-    allow(cli).to receive(:exit)
+    allow_any_instance_of(Bard::CLI::Ping).to receive(:puts)
+    allow_any_instance_of(Bard::CLI::Ping).to receive(:exit)
   end
 
   describe "#ping" do
@@ -39,9 +39,9 @@ describe Bard::CLI::Ping do
     it "should print down URLs when they exist" do
       down_urls = ["https://down.example.com"]
       allow(Bard::Ping).to receive(:call).and_return(down_urls)
-      expect(cli).to receive(:puts).with("https://down.example.com is down!")
+      expect_any_instance_of(Bard::CLI::Ping).to receive(:puts).with("https://down.example.com is down!")
 
       cli.ping
     end
   end
-end
+end

data/spec/bard/cli/run_spec.rb

@@ -25,6 +25,7 @@ describe Bard::CLI::Run do
     allow(cli).to receive(:exit)
     allow(cli).to receive(:red).and_return("")
     allow(cli).to receive(:yellow).and_return("")
+    allow(cli).to receive(:options).and_return({ target: "production" })
   end
 
   describe "#run" do
@@ -33,7 +34,25 @@ describe Bard::CLI::Run do
     end
 
     it "should run command on production server" do
-      expect(server).to receive(:run!).with("ls -la", verbose: true)
+      expect(server).to receive(:run!).with("ls -la", verbose: true, home: nil)
+
+      cli.run("ls", "-la")
+    end
+
+    it "should run command on specified target" do
+      staging_server = double("staging_server")
+      allow(cli).to receive(:config).and_return(config.merge(staging: staging_server))
+      allow(cli).to receive(:options).and_return({ target: "staging" })
+
+      expect(staging_server).to receive(:run!).with("ls -la", verbose: true, home: nil)
+
+      cli.run("ls", "-la")
+    end
+
+    it "should pass home option to target" do
+      allow(cli).to receive(:options).and_return({ target: "production", home: true })
+
+      expect(server).to receive(:run!).with("ls -la", verbose: true, home: true)
 
       cli.run("ls", "-la")
     end

data/spec/bard/cli/vim_spec.rb

@@ -4,14 +4,14 @@ require "bard/cli/vim"
 require "thor"
 
 class TestVimCLI < Thor
-  include Bard::CLI::Vim
+  Bard::CLI::Vim.setup(self)
 end
 
 describe Bard::CLI::Vim do
   let(:cli) { TestVimCLI.new }
 
   before do
-    allow(cli).to receive(:exec)
+    allow_any_instance_of(Bard::CLI::Vim).to receive(:exec)
   end
 
   describe "#vim" do
@@ -20,15 +20,15 @@ describe Bard::CLI::Vim do
     end
 
     it "should exec vim with git diff files by default" do
-      expect(cli).to receive(:exec).with("vim -p `(git diff master --name-only; git ls-files --others --exclude-standard) | grep -v '^app/assets/images/' | grep -v '^app/assets/stylesheets/' | while read f; do [ -f \"$f\" ] && ! file -b \"$f\" | grep -q \"binary\" && echo \"$f\"; done | tac`")
+      expect_any_instance_of(Bard::CLI::Vim).to receive(:exec).with("vim -p `(git diff master --name-only; git ls-files --others --exclude-standard) | grep -v '^app/assets/images/' | grep -v '^app/assets/stylesheets/' | while read f; do [ -f \"$f\" ] && ! file -b \"$f\" | grep -q \"binary\" && echo \"$f\"; done | tac`")
 
       cli.vim
     end
 
     it "should exec vim with specified branch" do
-      expect(cli).to receive(:exec).with("vim -p `(git diff develop --name-only; git ls-files --others --exclude-standard) | grep -v '^app/assets/images/' | grep -v '^app/assets/stylesheets/' | while read f; do [ -f \"$f\" ] && ! file -b \"$f\" | grep -q \"binary\" && echo \"$f\"; done | tac`")
+      expect_any_instance_of(Bard::CLI::Vim).to receive(:exec).with("vim -p `(git diff develop --name-only; git ls-files --others --exclude-standard) | grep -v '^app/assets/images/' | grep -v '^app/assets/stylesheets/' | while read f; do [ -f \"$f\" ] && ! file -b \"$f\" | grep -q \"binary\" && echo \"$f\"; done | tac`")
 
       cli.vim("develop")
     end
   end
-end
+end

data/spec/bard/github_spec.rb

@@ -5,7 +5,7 @@ describe Bard::Github do
   let(:github) { Bard::Github.new("test-project") }
 
   before do
-    allow(github).to receive(:`).with("git ls-remote -t git@github.com:botandrosedesign/secrets").and_return("github-apikey|12345")
+    allow(Bard::Secrets).to receive(:fetch).with("github-apikey").and_return("12345")
   end
 
   describe "#get" do

data/spec/bard/plugin_spec.rb

@@ -0,0 +1,79 @@
+require "bard/plugin"
+
+RSpec.describe Bard::Plugin do
+  before do
+    described_class.reset!
+  end
+
+  describe ".register" do
+    it "registers a plugin by name" do
+      described_class.register :test_plugin
+
+      expect(described_class[:test_plugin]).to be_a(Bard::Plugin)
+      expect(described_class[:test_plugin].name).to eq :test_plugin
+    end
+
+    it "accepts a block to configure the plugin" do
+      described_class.register :test_plugin do
+        require_file "some/file"
+      end
+
+      plugin = described_class[:test_plugin]
+      expect(plugin.instance_variable_get(:@requires)).to include("some/file")
+    end
+  end
+
+  describe ".all" do
+    it "returns all registered plugins" do
+      described_class.register :plugin1
+      described_class.register :plugin2
+
+      expect(described_class.all.map(&:name)).to contain_exactly(:plugin1, :plugin2)
+    end
+  end
+
+  describe ".reset!" do
+    it "clears the registry" do
+      described_class.register :test_plugin
+
+      described_class.reset!
+
+      expect(described_class.all).to be_empty
+    end
+  end
+
+  describe "#cli" do
+    it "stores CLI modules to include" do
+      described_class.register :test_plugin do
+        cli "SomeModule", require: "some/module"
+      end
+
+      plugin = described_class[:test_plugin]
+      expect(plugin.cli_modules).to include("SomeModule")
+    end
+  end
+
+  describe "#target_method" do
+    it "stores target methods to define" do
+      block = proc { "value" }
+      described_class.register :test_plugin do
+        target_method :custom_method, &block
+      end
+
+      plugin = described_class[:test_plugin]
+      expect(plugin.instance_variable_get(:@target_methods)).to have_key(:custom_method)
+    end
+  end
+
+  describe "#config_method" do
+    it "stores config methods to define" do
+      block = proc { "value" }
+      described_class.register :test_plugin do
+        config_method :custom_method, &block
+      end
+
+      plugin = described_class[:test_plugin]
+      expect(plugin.instance_variable_get(:@config_methods)).to have_key(:custom_method)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
 require "simplecov"
-SimpleCov.start
+SimpleCov.start do
+  command_name "RSpec"
+  track_files "lib/**/*.rb"
+  add_filter "spec/"
+  add_filter "features/"
+end
 
 require "webmock/rspec"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-01-22 00:00:00.000000000 Z
+date: 2026-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -161,21 +161,25 @@ files:
 - ".gitmodules"
 - ".rspec"
 - ARCHITECTURE.md
+- CLAUDE.md
 - CUSTOM_STRATEGIES.md
 - Gemfile
 - LICENSE
 - MIGRATION_GUIDE.md
+- PLUGINS.md
 - README.md
-- README.rdoc
 - 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
 - install_files/.github/dependabot.yml
@@ -224,6 +228,16 @@ files:
 - lib/bard/github.rb
 - lib/bard/github_pages.rb
 - lib/bard/ping.rb
+- lib/bard/plugin.rb
+- lib/bard/plugins/backup.rb
+- lib/bard/plugins/github_pages.rb
+- lib/bard/plugins/hurt.rb
+- lib/bard/plugins/install.rb
+- lib/bard/plugins/jenkins.rb
+- lib/bard/plugins/new.rb
+- lib/bard/plugins/ping.rb
+- lib/bard/plugins/provision.rb
+- lib/bard/plugins/vim.rb
 - lib/bard/provision.rb
 - lib/bard/provision/app.rb
 - lib/bard/provision/apt.rb
@@ -240,6 +254,7 @@ files:
 - lib/bard/provision/ssh.rb
 - lib/bard/provision/swapfile.rb
 - lib/bard/provision/user.rb
+- lib/bard/secrets.rb
 - lib/bard/server.rb
 - lib/bard/ssh_server.rb
 - lib/bard/target.rb
@@ -250,6 +265,8 @@ files:
 - 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/command_spec.rb
@@ -278,6 +295,7 @@ files:
 - spec/bard/github_pages_spec.rb
 - spec/bard/github_spec.rb
 - spec/bard/ping_spec.rb
+- spec/bard/plugin_spec.rb
 - spec/bard/provision/app_spec.rb
 - spec/bard/provision/apt_spec.rb
 - spec/bard/provision/authorizedkeys_spec.rb
@@ -323,10 +341,13 @@ rubygems_version: 3.6.2
 specification_version: 4
 summary: CLI to automate common development tasks.
 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
@@ -335,6 +356,8 @@ test_files:
 - 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/command_spec.rb
@@ -363,6 +386,7 @@ test_files:
 - spec/bard/github_pages_spec.rb
 - spec/bard/github_spec.rb
 - spec/bard/ping_spec.rb
+- spec/bard/plugin_spec.rb
 - spec/bard/provision/app_spec.rb
 - spec/bard/provision/apt_spec.rb
 - spec/bard/provision/authorizedkeys_spec.rb

data/README.rdoc

@@ -1,15 +0,0 @@
-= BARD
-
-This is a collection of tools designed to ease collaboration within Bot and Rose Design.
-It wraps git, capistrano, and rake to make things as simple as:
-
-  bard stage
-  bard deploy
-
-Seed database from staging or production:
-  bard data
-
-== Copyright
-
-Copyright (c) 2018 Micah Geisel. See LICENSE for details.
-