bard 1.9.6 → 2.0.0

data/spec/bard/cli/deploy_spec.rb

@@ -1,28 +1,11 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/deploy"
-require "thor"
 
-class TestDeployCLI < Thor
-  include Bard::CLI::Deploy
-
-  attr_reader :config, :options
-
-  def initialize
-    super
-    @config = {}
-    @options = {}
-  end
-
-  def project_name
-    "test_project"
-  end
-end
-
-describe Bard::CLI::Deploy do
-  let(:production_server) { double("production", run!: true, github_pages: false, path: "/var/www/test_project") }
+describe "bard deploy" do
+  let(:deploy_strategy) { double("deploy_strategy", deploy: true) }
+  let(:production_server) { double("production", run!: true, path: "/var/www/test_project", deploy_strategy: :ssh, deploy_strategy_instance: deploy_strategy) }
   let(:config) { { production: production_server } }
-  let(:cli) { TestDeployCLI.new }
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(config).to receive(:ci).and_return(nil)
@@ -33,12 +16,14 @@ describe Bard::CLI::Deploy do
     allow(cli).to receive(:run!)
     allow(cli).to receive(:invoke)
     allow(cli).to receive(:ping)
+    allow(cli).to receive(:project_name).and_return("test_project")
     allow(cli).to receive(:green).and_return("")
     allow(cli).to receive(:red).and_return("")
     allow(cli).to receive(:yellow).and_return("")
     allow(Bard::Git).to receive(:current_branch).and_return("feature-branch")
     allow(Bard::Git).to receive(:up_to_date_with_remote?).and_return(true)
     allow(Bard::Git).to receive(:fast_forward_merge?).and_return(true)
+    allow(Bard::Git).to receive(:in_linked_worktree?).and_return(false)
     allow(cli).to receive(:`).and_return("")
   end
 
@@ -59,8 +44,7 @@ describe Bard::CLI::Deploy do
 
           expect(cli).not_to receive(:run!).with(/git push/)
           expect(cli).to receive(:invoke).with(:ci, ["master"], {})
-          expect(production_server).to receive(:run!).with("git pull origin master && bin/setup")
-          expect(cli).to receive(:puts) # "Deploy Succeeded"
+          expect(deploy_strategy).to receive(:deploy)
           expect(cli).to receive(:ping).with(:production)
 
           cli.deploy
@@ -73,7 +57,7 @@ describe Bard::CLI::Deploy do
 
           expect(cli).to receive(:run!).with("git push origin master:master")
           expect(cli).to receive(:invoke).with(:ci, ["master"], {})
-          expect(production_server).to receive(:run!).with("git pull origin master && bin/setup")
+          expect(deploy_strategy).to receive(:deploy)
 
           cli.deploy
         end
@@ -84,7 +68,7 @@ describe Bard::CLI::Deploy do
           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")
+          expect(deploy_strategy).to receive(:deploy)
 
           cli.deploy
         end
@@ -95,7 +79,7 @@ describe Bard::CLI::Deploy do
           allow(config).to receive(:ci).and_return(false)
 
           expect(cli).not_to receive(:invoke).with(:ci, anything, anything)
-          expect(production_server).to receive(:run!).with("git pull origin master && bin/setup")
+          expect(deploy_strategy).to receive(:deploy)
 
           cli.deploy
         end
@@ -114,7 +98,7 @@ describe Bard::CLI::Deploy do
           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(production_server).to receive(:run!).with("git pull origin master && bin/setup")
+          expect(deploy_strategy).to receive(:deploy)
 
           cli.deploy
         end
@@ -129,6 +113,27 @@ describe Bard::CLI::Deploy do
         end
       end
 
+      context "when run from a linked worktree" do
+        before do
+          allow(Bard::Git).to receive(:in_linked_worktree?).and_return(true)
+          allow(cli).to receive(:`).with("git rev-parse --git-common-dir").and_return("/main/checkout/.git\n")
+          allow(Dir).to receive(:pwd).and_return("/main/checkout/tmp/worktrees/feature-branch")
+          allow(Dir).to receive(:chdir).with("/main/checkout")
+        end
+
+        it "skips writes to local master, removes the worktree, and reports where to cd back" do
+          expect(cli).not_to receive(:run!).with("git fetch origin master:master")
+          expect(cli).not_to receive(:run!).with("git checkout master")
+          expect(cli).to receive(:run!).with("git fetch origin master")
+          expect(Dir).to receive(:chdir).with("/main/checkout")
+          expect(cli).to receive(:run!).with("git worktree remove /main/checkout/tmp/worktrees/feature-branch")
+          expect(cli).to receive(:run!).with("git branch -D feature-branch")
+          expect(cli).to receive(:puts).with("Worktree removed. Run: cd /main/checkout")
+
+          cli.deploy
+        end
+      end
+
       context "when rebase is needed" do
         it "attempts rebase before proceeding" do
           allow(Bard::Git).to receive(:fast_forward_merge?).and_return(false)
@@ -150,7 +155,7 @@ describe Bard::CLI::Deploy do
 
       it "skips CI step" do
         expect(cli).not_to receive(:invoke).with(:ci, anything, anything)
-        expect(production_server).to receive(:run!).with("git pull origin master && bin/setup")
+        expect(deploy_strategy).to receive(:deploy)
 
         cli.deploy
       end
@@ -167,31 +172,29 @@ describe Bard::CLI::Deploy do
     end
 
     context "with clone option" do
-      it "clones repository and sets up application" do
+      it "deploys with clone option to strategy" do
         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)
-        expect(production_server).to receive(:run!).with("bin/setup && bard setup")
+        expect(deploy_strategy).to receive(:deploy).with(clone: "test_project")
 
         cli.deploy
       end
     end
 
     context "with github pages" do
-      it "deploys to github pages" do
-        allow(production_server).to receive(:github_pages).and_return(true)
-        github_pages = double("github_pages")
-        allow(Bard::GithubPages).to receive(:new).and_return(github_pages)
+      let(:deploy_strategy) { double("github_pages_strategy") }
+      let(:production_server) { double("production", run!: true, path: "/var/www/test_project", deploy_strategy: :github_pages, deploy_strategy_instance: deploy_strategy) }
 
-        expect(github_pages).to receive(:deploy).with(production_server)
+      it "deploys using deploy strategy" do
+        expect(deploy_strategy).to receive(:deploy)
 
         cli.deploy
       end
     end
 
     context "with custom deployment target" do
-      let(:staging_server) { double("staging", run!: true, github_pages: false) }
+      let(:staging_strategy) { double("staging_strategy", deploy: true) }
+      let(:staging_server) { double("staging", run!: true, deploy_strategy: :ssh, deploy_strategy_instance: staging_strategy) }
 
       before do
         allow(config).to receive(:[]).with(:staging).and_return(staging_server)
@@ -199,7 +202,7 @@ describe Bard::CLI::Deploy do
       end
 
       it "deploys to specified target" do
-        expect(staging_server).to receive(:run!).with("git pull origin master && bin/setup")
+        expect(staging_strategy).to receive(:deploy)
         expect(cli).to receive(:ping).with(:staging)
 
         cli.deploy
@@ -237,4 +240,4 @@ describe Bard::CLI::Deploy do
       end
     end
   end
-end
+end

data/spec/bard/cli/hurt_spec.rb

@@ -1,14 +1,8 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/hurt"
-require "thor"
 
-class TestHurtCLI < Thor
-  Bard::CLI::Hurt.setup(self)
-end
-
-describe Bard::CLI::Hurt do
-  let(:cli) { TestHurtCLI.new }
+describe "bard hurt" do
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(cli).to receive(:puts)

data/spec/bard/cli/install_spec.rb

@@ -1,14 +1,8 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/install"
-require "thor"
 
-class TestInstallCLI < Thor
-  Bard::CLI::Install.setup(self)
-end
-
-describe Bard::CLI::Install do
-  let(:cli) { TestInstallCLI.new }
+describe "bard install" do
+  let(:cli) { Bard::CLI.new }
 
   describe "#install" do
     it "should have an install command" do
@@ -16,8 +10,8 @@ describe Bard::CLI::Install do
     end
 
     it "should copy install files to bin directory" do
-      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 \.\//)
+      expect(cli).to receive(:system).with(/cp -R .*plugins\/install\/\* bin\//)
+      expect(cli).to receive(:system).with(/cp -R .*plugins\/install\/\.github \.\//)
 
       cli.install
     end

data/spec/bard/cli/master_key_spec.rb

@@ -1,25 +1,11 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/master_key"
-require "thor"
 
-class TestMasterKeyCLI < Thor
-  include Bard::CLI::MasterKey
-
-  attr_reader :config, :options
-
-  def initialize
-    super
-    @config = {}
-    @options = {}
-  end
-end
-
-describe Bard::CLI::MasterKey do
+describe "bard master_key" do
   let(:from_server) { double("production") }
   let(:to_server) { double("local") }
   let(:config) { { production: from_server, local: to_server } }
-  let(:cli) { TestMasterKeyCLI.new }
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(cli).to receive(:config).and_return(config)
@@ -34,7 +20,7 @@ describe Bard::CLI::MasterKey do
       allow(config).to receive(:[]).with("production").and_return(from_server)
       allow(config).to receive(:[]).with("local").and_return(to_server)
       allow(cli).to receive(:options).and_return({ from: "production", to: "local" })
-      expect(from_server).to receive(:copy_file).with("config/master.key", to: to_server)
+      expect(Bard::Copy).to receive(:file).with("config/master.key", from: from_server, to: to_server)
 
       cli.master_key
     end
@@ -44,9 +30,9 @@ describe Bard::CLI::MasterKey do
       allow(config).to receive(:[]).with("production").and_return(staging_server)
       allow(config).to receive(:[]).with("local").and_return(to_server)
       allow(cli).to receive(:options).and_return({ from: "production", to: "local" })
-      expect(staging_server).to receive(:copy_file).with("config/master.key", to: to_server)
+      expect(Bard::Copy).to receive(:file).with("config/master.key", from: staging_server, to: to_server)
 
       cli.master_key
     end
   end
-end
+end

data/spec/bard/cli/open_spec.rb

@@ -1,31 +1,15 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/open"
-require "thor"
 
-class TestOpenCLI < Thor
-  Bard::CLI::Open.setup(self)
-
-  attr_reader :config
-
-  def initialize
-    super
-    @config = {}
-  end
-
-  def project_name
-    "test_project"
-  end
-end
-
-describe Bard::CLI::Open do
-  let(:server) { double("server", ping: ["https://example.com"]) }
-  let(:config) { { production: server } }
-  let(:cli) { TestOpenCLI.new }
+describe "bard open" do
+  let(:target) { double("target", url: "https://example.com", require_capability!: nil) }
+  let(:config) { { production: target } }
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(cli).to receive(:config).and_return(config)
-    allow_any_instance_of(Bard::CLI::Open).to receive(:exec)
+    allow(cli).to receive(:project_name).and_return("test_project")
+    allow(cli).to receive(:exec)
   end
 
   describe "#open" do
@@ -33,37 +17,35 @@ describe Bard::CLI::Open do
       expect(cli).to respond_to(:open)
     end
 
-    it "should open production server URL by default" do
-      expect_any_instance_of(Bard::CLI::Open).to receive(:exec).with("xdg-open https://example.com")
+    it "should open production target URL by default" do
+      expect(cli).to receive(:exec).with("xdg-open https://example.com")
 
       cli.open
     end
 
-    it "should open specified server URL" do
-      staging_server = double("staging", ping: ["https://staging.example.com"])
+    it "should open specified target URL" do
+      staging_server = double("staging", url: "https://staging.example.com", require_capability!: nil)
       allow(config).to receive(:[]).with(:staging).and_return(staging_server)
 
-      expect_any_instance_of(Bard::CLI::Open).to receive(:exec).with("xdg-open https://staging.example.com")
+      expect(cli).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_any_instance_of(Bard::CLI::Open).to receive(:exec).with("xdg-open https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
+    it "should open CI URL when target is ci" do
+      expect(cli).to receive(:exec).with("xdg-open https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
 
       cli.open(:ci)
     end
   end
 
   describe "#open_url" do
-    it "returns CI URL for ci server" do
-      command = Bard::CLI::Open.new(cli)
-      expect(command.send(:open_url, :ci)).to eq("https://github.com/botandrosedesign/test_project/actions/workflows/ci.yml")
+    it "returns CI URL for ci target" do
+      expect(cli.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
-      command = Bard::CLI::Open.new(cli)
-      expect(command.send(:open_url, :production)).to eq("https://example.com")
+    it "returns target url for other targets" do
+      expect(cli.open_url(:production)).to eq("https://example.com")
     end
   end
 end

data/spec/bard/cli/ping_spec.rb

@@ -1,37 +1,22 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/ping"
 require "thor"
 
-class TestPingCLI < Thor
-  Bard::CLI::Ping.setup(self)
-
-  attr_reader :config
-
-  def initialize
-    super
-    @config = {}
-  end
-end
-
-describe Bard::CLI::Ping do
-  let(:server) { double("server", ping: ["https://example.com"]) }
-  let(:config) { { production: server } }
-  let(:cli) { TestPingCLI.new }
+describe "bard ping" do
+  let(:target) { double("target", ping: ["https://example.com"]) }
+  let(:config) { double("config", targets: { production: target }) }
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(cli).to receive(:config).and_return(config)
-    allow_any_instance_of(Bard::CLI::Ping).to receive(:puts)
-    allow_any_instance_of(Bard::CLI::Ping).to receive(:exit)
+    allow(config).to receive(:[]).with(:production).and_return(target)
+    allow(cli).to receive(:puts)
+    allow(cli).to receive(:exit)
   end
 
   describe "#ping" do
-    it "should have a ping command" do
-      expect(cli).to respond_to(:ping)
-    end
-
-    it "should call Bard::Ping with the server" do
-      expect(Bard::Ping).to receive(:call).and_return([])
+    it "should call Bard::Ping with the target" do
+      expect(Bard::Ping).to receive(:call).with(target).and_return([])
 
       cli.ping
     end
@@ -39,7 +24,7 @@ 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_any_instance_of(Bard::CLI::Ping).to receive(:puts).with("https://down.example.com is down!")
+      expect(cli).to receive(:puts).with("https://down.example.com is down!")
 
       cli.ping
     end

data/spec/bard/cli/run_spec.rb

@@ -1,23 +1,10 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/run"
-require "thor"
 
-class TestRunCLI < Thor
-  include Bard::CLI::Run
-
-  attr_reader :config
-
-  def initialize
-    super
-    @config = {}
-  end
-end
-
-describe Bard::CLI::Run do
-  let(:server) { double("server") }
-  let(:config) { { production: server } }
-  let(:cli) { TestRunCLI.new }
+describe "bard run" do
+  let(:target) { double("target") }
+  let(:config) { { production: target } }
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(cli).to receive(:config).and_return(config)
@@ -33,14 +20,14 @@ describe Bard::CLI::Run do
       expect(cli).to respond_to(:run)
     end
 
-    it "should run command on production server" do
-      expect(server).to receive(:run!).with("ls -la", verbose: true, home: nil)
+    it "should run command on production target" do
+      expect(target).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")
+      staging_server = double("staging_target")
       allow(cli).to receive(:config).and_return(config.merge(staging: staging_server))
       allow(cli).to receive(:options).and_return({ target: "staging" })
 
@@ -52,14 +39,14 @@ describe Bard::CLI::Run do
     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)
+      expect(target).to receive(:run!).with("ls -la", verbose: true, home: true)
 
       cli.run("ls", "-la")
     end
 
     it "should handle command errors" do
       error = Bard::Command::Error.new("Command failed")
-      allow(server).to receive(:run!).and_raise(error)
+      allow(target).to receive(:run!).and_raise(error)
 
       expect(cli).to receive(:puts).with(/Running command failed/)
       expect(cli).to receive(:exit).with(1)
@@ -67,4 +54,4 @@ describe Bard::CLI::Run do
       cli.run("failing-command")
     end
   end
-end
+end

data/spec/bard/cli/setup_spec.rb

@@ -1,27 +1,11 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/setup"
-require "thor"
 
-class TestSetupCLI < Thor
-  include Bard::CLI::Setup
-
-  attr_reader :config
-
-  def initialize
-    super
-    @config = {}
-  end
-
-  def project_name
-    "test_project"
-  end
-end
-
-describe Bard::CLI::Setup do
-  let(:cli) { TestSetupCLI.new }
+describe "bard setup" do
+  let(:cli) { Bard::CLI.new }
 
   before do
+    allow(cli).to receive(:project_name).and_return("test_project")
     allow(Dir).to receive(:pwd).and_return("/home/user/project")
     allow(File).to receive(:exist?).and_return(false)
     allow(cli).to receive(:system)
@@ -32,9 +16,8 @@ describe Bard::CLI::Setup do
       expect(cli).to respond_to(:setup)
     end
 
-    it "should create nginx common config" do
-      expect(cli).to receive(:system).with(/sudo tee \/etc\/nginx\/snippets\/common\.conf/)
-      expect(cli).to receive(:system).with(/sudo tee \/etc\/nginx\/sites-available\/test_project/)
+    it "should create nginx reverse proxy config" do
+      expect(cli).to receive(:system).with(/sudo tee \/etc\/nginx\/sites-available\/test_project.*proxy_pass http:\/\/puma/m)
       expect(cli).to receive(:system).with(/sudo ln -sf/)
       expect(cli).to receive(:system).with("sudo service nginx restart")
 
@@ -43,7 +26,7 @@ describe Bard::CLI::Setup do
   end
 
   describe "#nginx_server_name" do
-    let(:production_server) { double("production", ping: ["https://example.com"]) }
+    let(:production_server) { double("production", url: "https://example.com") }
 
     before do
       allow(cli).to receive(:config).and_return({ production: production_server })
@@ -53,7 +36,7 @@ describe Bard::CLI::Setup do
       before { allow(ENV).to receive(:[]).with("RAILS_ENV").and_return("production") }
 
       it "returns production server names with wildcard" do
-        expect(cli.send(:nginx_server_name)).to eq("*.example.com _")
+        expect(cli.nginx_server_name).to eq("*.example.com _")
       end
     end
 
@@ -61,7 +44,7 @@ describe Bard::CLI::Setup do
       before { allow(ENV).to receive(:[]).with("RAILS_ENV").and_return("staging") }
 
       it "returns staging server name" do
-        expect(cli.send(:nginx_server_name)).to eq("test_project.botandrose.com")
+        expect(cli.nginx_server_name).to eq("test_project.botandrose.com")
       end
     end
 
@@ -69,8 +52,8 @@ describe Bard::CLI::Setup do
       before { allow(ENV).to receive(:[]).with("RAILS_ENV").and_return("development") }
 
       it "returns localhost server name" do
-        expect(cli.send(:nginx_server_name)).to eq("test_project.localhost")
+        expect(cli.nginx_server_name).to eq("test_project.localhost")
       end
     end
   end
-end
+end

data/spec/bard/cli/ssh_spec.rb

@@ -1,27 +1,14 @@
 require "spec_helper"
 require "bard/cli"
-require "bard/cli/ssh"
-require "thor"
 
-class TestSSHCLI < Thor
-  include Bard::CLI::SSH
-
-  attr_reader :config, :options
-
-  def initialize
-    super
-    @config = {}
-    @options = {}
-  end
-end
-
-describe Bard::CLI::SSH do
-  let(:server) { double("server") }
-  let(:config) { { production: server } }
-  let(:cli) { TestSSHCLI.new }
+describe "bard ssh" do
+  let(:target) { double("target") }
+  let(:config) { { production: target } }
+  let(:cli) { Bard::CLI.new }
 
   before do
     allow(cli).to receive(:config).and_return(config)
+    allow(cli).to receive(:options).and_return({ home: false })
   end
 
   describe "#ssh" do
@@ -29,27 +16,25 @@ describe Bard::CLI::SSH do
       expect(cli).to respond_to(:ssh)
     end
 
-    it "should execute shell on production server by default" do
-      allow(cli).to receive(:options).and_return({ home: false })
-      expect(server).to receive(:exec!).with("exec $SHELL -l", home: false)
+    it "should execute shell on production target by default" do
+      expect(target).to receive(:exec!).with("exec $SHELL -l", home: false)
 
       cli.ssh
     end
 
     it "should execute shell with home option when specified" do
       allow(cli).to receive(:options).and_return({ home: true })
-      expect(server).to receive(:exec!).with("exec $SHELL -l", home: true)
+      expect(target).to receive(:exec!).with("exec $SHELL -l", home: true)
 
       cli.ssh
     end
 
-    it "should connect to specified server" do
+    it "should connect to specified target" do
       staging_server = double("staging")
       allow(config).to receive(:[]).with(:staging).and_return(staging_server)
-      allow(cli).to receive(:options).and_return({ home: false })
       expect(staging_server).to receive(:exec!).with("exec $SHELL -l", home: false)
 
       cli.ssh(:staging)
     end
   end
-end
+end