bard 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6fc9147c8bb2b63efad9e658b6756ee0b69e6c317ca25084700dfeaddf29dbd
-  data.tar.gz: 948578a41a02a1a54fa29313013838e6bf3f93b35e2c635d75d4ece58e6ff6b6
+  metadata.gz: 1dd77cf990608d404bbcc5cca1dd5ee5bfbb2310a08dd723495c237f66221bdd
+  data.tar.gz: 1d5e3e825ffeea97b828f7719e116a9ab506599c7f298282af7e2d4e20d5f257
 SHA512:
-  metadata.gz: 3cd2e967bf7a6f5d3a7b89e60c9fc957f75c7b9f1db06b80e36d20be041c3420a667bb93c702c2f4704e07a9ce847b6bb114df3d0e5196aeaca28afe8015f4eb
-  data.tar.gz: 2cc75c7bfb471373fd2cfebefa7ab3c115d68b9540591cb48053820b32fa0eb0e99f1a57d3024b65b3e801063b7569e30cd031cc1d39d4788712fdb746e144ad
+  metadata.gz: 2bd4f528655c8b6e9a8d675a3a2ead6201f5b11c8c12a6abfcc011ca47fb998a80a73487e9273bfecb0ba670b2aaea8efcd1e74f2f0d6cbb7273c475169a881e
+  data.tar.gz: 812897863cd76a56f76af06cf9eaec0fa43fda334dcd5f5a43487309b823b97100dd199a57dede44a94439c6b67e0235364870e5bd623c24f68e2f3df8823726

data/lib/bard/plugins/deploy/ssh_strategy.rb

@@ -5,17 +5,16 @@ require "bard/plugins/ssh"
 module Bard
   class DeployStrategy
     class SSH < DeployStrategy
-      def deploy(clone: nil, branch: nil, force: false)
+      def deploy(clone: nil, branch: "master", force: false)
         target.require_capability!(:ssh)
 
         if clone
-          target.run! "git clone git@github.com:botandrosedesign/#{clone} #{target.path}", home: true
+          target.run! "git clone --branch #{branch} git@github.com:botandrosedesign/#{clone} #{target.path}", home: true
           Bard::Copy.file "config/master.key", from: target.config[:local], to: target
         elsif force
           target.run! "git fetch origin #{branch}"
           target.run! "git checkout -f origin/#{branch}"
         else
-          branch ||= target.instance_variable_get(:@branch) || "master"
           target.run! "git pull --ff-only origin #{branch}"
         end
 

data/lib/bard/plugins/deploy/strategy.rb

@@ -39,7 +39,7 @@ module Bard
       @target = target
     end
 
-    def deploy(clone: nil, branch: nil, force: false)
+    def deploy(clone: nil, branch: "master", force: false)
       raise NotImplementedError, "Subclasses must implement #deploy"
     end
 

data/lib/bard/plugins/deploy.rb

@@ -121,9 +121,23 @@ class Bard::CLI
 
     target = config[:staging]
     strategy = target.deploy_strategy_instance
-    strategy.deploy(branch: branch, force: true)
 
-    puts green("Stage Succeeded")
+    if staging_provisioned?(target)
+      strategy.deploy(branch: branch, force: true)
+      puts green("Stage Succeeded")
+
+    else # clone from scratch
+      puts yellow("Staging site for #{project_name} not found — provisioning it from scratch…")
+      strategy.deploy(clone: project_name, branch: branch)
+      puts green("Stage Succeeded")
+
+      puts "#{project_name} was rebuilt from scratch; its database and files are empty."
+      if $stdin.tty? && !no?("Restore #{project_name}'s data from production now? (bard data --from production --to staging) [Y/n]")
+        invoke :data, [], from: "production", to: "staging"
+      else
+        puts "Run #{yellow("bard data --from production --to staging")} to restore its data."
+      end
+    end
 
     ping :staging
   rescue Bard::Command::Error => e
@@ -131,6 +145,12 @@ class Bard::CLI
     exit 1
   end
 
+  no_commands do
+    def staging_provisioned?(target)
+      !!target.run("test -e #{target.path}/.git", home: true)
+    end
+  end
+
   option :"local-ci", type: :boolean
   option :ci, type: :string
   option :status, type: :boolean

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end
 

data/spec/bard/cli/stage_spec.rb

@@ -17,10 +17,12 @@ describe "bard stage" do
     allow(cli).to receive(:ping)
     allow(cli).to receive(:green).and_return("")
     allow(cli).to receive(:red).and_return("")
-    allow(cli).to receive(:yellow).and_return("")
+    allow(cli).to receive(:yellow) { |s| s }
     allow(Bard::Git).to receive(:current_branch).and_return("main")
     allow(config).to receive(:[]).with(:staging).and_return(staging_server)
     allow(config).to receive(:[]).with(:production).and_return(production_server)
+    allow(cli).to receive(:project_name).and_return("acme")
+    allow(cli).to receive(:staging_provisioned?).and_return(true)
   end
 
   describe "#stage" do
@@ -28,6 +30,49 @@ describe "bard stage" do
       expect(cli).to respond_to(:stage)
     end
 
+    context "when the staging site has been reaped" do
+      before do
+        allow(cli).to receive(:staging_provisioned?).and_return(false)
+        allow(cli).to receive(:invoke)
+        allow($stdin).to receive(:tty?).and_return(false)
+      end
+
+      it "provisions from scratch by cloning and checking out the branch" do
+        expect(staging_strategy).to receive(:deploy).with(clone: "acme", branch: "main")
+        cli.stage
+      end
+
+      it "restores data from production by default (Enter/no decline)" do
+        allow(staging_strategy).to receive(:deploy)
+        allow($stdin).to receive(:tty?).and_return(true)
+        allow(cli).to receive(:no?).and_return(false)
+        expect(cli).to receive(:invoke).with(:data, [], from: "production", to: "staging")
+        cli.stage
+      end
+
+      it "skips the restore when the user declines" do
+        allow(staging_strategy).to receive(:deploy)
+        allow($stdin).to receive(:tty?).and_return(true)
+        allow(cli).to receive(:no?).and_return(true)
+        expect(cli).not_to receive(:invoke)
+        cli.stage
+      end
+
+      it "prints restore instructions when non-interactive" do
+        allow(staging_strategy).to receive(:deploy)
+        expect(cli).to receive(:puts).with(/bard data --from production --to staging/)
+        cli.stage
+      end
+    end
+
+    context "when the staging site already exists" do
+      it "does not prompt to restore data" do
+        allow($stdin).to receive(:tty?).and_return(true)
+        expect(cli).not_to receive(:invoke)
+        cli.stage
+      end
+    end
+
     context "when production server is defined" do
       it "pushes branch and stages it" do
         expect(cli).to receive(:run!).with("git push -u origin main", verbose: true)

data/spec/bard/deploy_strategy/ssh_spec.rb

@@ -38,15 +38,13 @@ describe Bard::DeployStrategy::SSH do
       strategy.deploy
     end
 
-    it "uses configured branch if specified" do
-      target.instance_variable_set(:@branch, "main")
-
+    it "pulls the given branch when one is specified" do
       expect(target).to receive(:run!)
         .with("git pull --ff-only origin main")
 
       allow(target).to receive(:run!).with(/bin\/setup/)
 
-      strategy.deploy
+      strategy.deploy(branch: "main")
     end
 
     context "with force: true" do
@@ -68,9 +66,9 @@ describe Bard::DeployStrategy::SSH do
         allow(Bard::Copy).to receive(:file)
       end
 
-      it "clones the repository" do
+      it "clones the repository, defaulting to master" do
         expect(target).to receive(:run!)
-          .with("git clone git@github.com:botandrosedesign/testapp /app", home: true)
+          .with("git clone --branch master git@github.com:botandrosedesign/testapp /app", home: true)
         allow(target).to receive(:run!).with("bin/setup")
         allow(target).to receive(:run!).with("bard setup")
 
@@ -104,6 +102,18 @@ describe Bard::DeployStrategy::SSH do
 
         strategy.deploy(clone: "testapp")
       end
+
+      it "clones the requested branch directly when provisioning from scratch" do
+        allow(target).to receive(:run!).with("bin/setup")
+        allow(target).to receive(:run!).with("bard setup")
+
+        expect(target).to receive(:run!)
+          .with("git clone --branch feature-x git@github.com:botandrosedesign/testapp /app", home: true)
+        expect(target).not_to receive(:run!).with(/git fetch/)
+        expect(target).not_to receive(:run!).with(/git checkout/)
+
+        strategy.deploy(clone: "testapp", branch: "feature-x")
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-07-01 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor