bard 1.8.0.beta → 1.8.0.beta2

data/spec/bard/deprecation_spec.rb

@@ -198,5 +198,84 @@ describe "Deprecation warnings" do
       end
       expect(output).not_to include("[DEPRECATION]")
     end
+
+    it "warns when using separate path method" do
+      output = capture_stderr do
+        Bard::Config.new("test", source: <<~SOURCE)
+          target :production do
+            ssh "user@host:22"
+            path "/app"
+          end
+        SOURCE
+      end
+      expect(output).to include("[DEPRECATION]")
+      expect(output).to include("Separate `path` call is deprecated")
+    end
+
+    it "warns when using separate gateway method" do
+      output = capture_stderr do
+        Bard::Config.new("test", source: <<~SOURCE)
+          target :production do
+            ssh "user@host:22"
+            gateway "bastion@host:22"
+          end
+        SOURCE
+      end
+      expect(output).to include("[DEPRECATION]")
+      expect(output).to include("Separate `gateway` call is deprecated")
+    end
+
+    it "warns when using separate ssh_key method" do
+      output = capture_stderr do
+        Bard::Config.new("test", source: <<~SOURCE)
+          target :production do
+            ssh "user@host:22"
+            ssh_key "~/.ssh/id_rsa"
+          end
+        SOURCE
+      end
+      expect(output).to include("[DEPRECATION]")
+      expect(output).to include("Separate `ssh_key` call is deprecated")
+    end
+
+    it "warns when using separate env method" do
+      output = capture_stderr do
+        Bard::Config.new("test", source: <<~SOURCE)
+          target :production do
+            ssh "user@host:22"
+            env "RAILS_ENV=production"
+          end
+        SOURCE
+      end
+      expect(output).to include("[DEPRECATION]")
+      expect(output).to include("Separate `env` call is deprecated")
+    end
+
+    it "warns when using strategy method" do
+      output = capture_stderr do
+        Bard::Config.new("test", source: <<~SOURCE)
+          target :production do
+            ssh "user@host:22"
+            strategy :ssh
+          end
+        SOURCE
+      end
+      expect(output).to include("[DEPRECATION]")
+      expect(output).to include("`strategy` is deprecated")
+    end
+
+    it "warns when using option method" do
+      output = capture_stderr do
+        Bard::Config.new("test", source: <<~SOURCE)
+          target :production do
+            ssh "user@host:22"
+            strategy :ssh
+            option :verbose, true
+          end
+        SOURCE
+      end
+      expect(output).to include("[DEPRECATION]")
+      expect(output).to include("`option` is deprecated")
+    end
   end
 end

data/spec/bard/target_spec.rb

@@ -72,7 +72,7 @@ describe Bard::Target do
       end
 
       it "auto-configures ping URL from hostname" do
-        expect(target.ping_urls).to include("example.com")
+        expect(target.ping_urls).to include("https://example.com")
       end
     end
 
@@ -137,7 +137,7 @@ describe Bard::Target do
 
       it "executes command on remote server" do
         expect(Bard::Command).to receive(:run!)
-          .with("ls", on: target.server, home: false, verbose: false, quiet: false)
+          .with("ls", on: target, home: false, verbose: false, quiet: false)
         target.run!("ls")
       end
     end
@@ -151,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.server, home: false, verbose: false, quiet: false)
+          .with("ls", on: target, home: false, verbose: false, quiet: false)
         target.run("ls")
       end
     end
@@ -165,7 +165,7 @@ describe Bard::Target do
 
       it "replaces process with remote command" do
         expect(Bard::Command).to receive(:exec!)
-          .with("ls", on: target.server, home: false)
+          .with("ls", on: target, 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.beta
+  version: 1.8.0.beta2
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2025-12-23 00:00:00.000000000 Z
+date: 2025-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -171,21 +171,13 @@ files:
 - bard.gemspec
 - bin/bard
 - bin/setup
-- 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
+- cucumber.yml
+- features/data.feature
+- features/deploy.feature
+- features/run.feature
+- features/step_definitions/bard_steps.rb
 - features/support/env.rb
-- features/support/grit_ext.rb
-- features/support/io.rb
-- features/support/podman.rb
+- features/support/test_server.rb
 - install_files/.github/dependabot.yml
 - install_files/.github/workflows/cache-ci.yml
 - install_files/.github/workflows/ci.yml
@@ -331,21 +323,12 @@ rubygems_version: 3.6.2
 specification_version: 4
 summary: CLI to automate common development tasks.
 test_files:
-- 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/data.feature
+- features/deploy.feature
+- features/run.feature
+- features/step_definitions/bard_steps.rb
 - features/support/env.rb
-- features/support/grit_ext.rb
-- features/support/io.rb
-- features/support/podman.rb
+- features/support/test_server.rb
 - spec/acceptance/.gitignore
 - spec/acceptance/docker/Dockerfile
 - spec/acceptance/docker/test_key

data/features/bard_check.feature

@@ -1,94 +0,0 @@
-Feature: Bard can check its environment for missing dependencies and potential problems
-
-  Scenario: Bard check returns its version
-    When I type "bard check -v"
-    Then I should see the current version of bard
-    And I should see the current version of git
-    And I should see the current version of rubygems
-    And I should see the current version of ruby
-
-  Scenario: Bard check examines a local project for problems
-    Given a shared rails project
-    When I type "bard check"
-    Then I should see "No problems"
-
-  Scenario: Bard check detects missing database
-    Given a shared rails project
-    And the database is missing
-    When I type "bard check"
-    Then I should see the fatal error "missing database"
-
-  Scenario: Bard check detects pending migrations
-    Given a shared rails project
-    And a commit with a new migration
-    When I type "bard check"
-    Then I should see the fatal error "pending migrations"
-
-  Scenario: Bard check detects missing config/database.yml
-    Given a shared rails project
-    And "config/database.yml" is missing
-    When I type "bard check"
-    Then I should see the fatal error "missing config/database.yml"
-
-  Scenario: Bard check detects missing submodules
-    Given a shared rails project
-    And a submodule
-    And the submodule is missing
-    When I type "bard check"
-    Then I should see the fatal error "missing submodule"
-
-  Scenario: Bard check detects submodules with detached heads
-    Given a shared rails project
-    And a submodule
-    And the submodule has a detached head
-    When I type "bard check"
-    Then I should see the fatal error "submodule has a detached head"
-
-  Scenario: Bard check detects missing gems
-    Given a shared rails project
-    And the test gem is not installed
-    And a commit that adds the test gem as a dependency
-    When I type "bard check"
-    Then I should see the fatal error "missing gems"
-
-  Scenario: Bard check detects master branch checked out
-    Given a shared rails project
-    And I am on the "master" branch
-    When I type "bard check"
-    Then I should see the fatal error "master branch"
-
-  Scenario: Bard check detects missing integration branch
-    Given a shared rails project
-    And there is no integration branch
-    When I type "bard check"
-    Then I should see the fatal error "missing integration branch"
-
-  Scenario: Bard check detects non-tracking integration branch
-    Given a shared rails project
-    And the integration branch isnt tracking origin/integration
-    When I type "bard check"
-    Then I should see the fatal error "tracking"
-
-  Scenario: Bard check detects gitignored Capfile
-    Given a shared rails project
-    And the ".gitignore" file includes "Capfile"
-    When I type "bard check"
-    Then I should see the fatal error "Capfile should not be gitignored"
-
-  Scenario: Bard check detects gitignored config/deploy.rb
-    Given a shared rails project
-    And the ".gitignore" file includes "config/deploy.rb"
-    When I type "bard check"
-    Then I should see the fatal error "config/deploy.rb should not be gitignored"
-
-  Scenario: Bard check detects missing bard rake tasks
-    Given a shared rails project
-    And the "Rakefile" file does not include "bard/rake"
-    When I type "bard check"
-    Then I should see the fatal error "missing bard rake tasks"
-
-  Scenario: Bard check detects missing bard cap tasks
-    Given a shared rails project
-    And the "Capfile" file does not include "bard/capistrano"
-    When I type "bard check"
-    Then I should see the fatal error "missing bard capistrano tasks"

data/features/bard_deploy.feature

@@ -1,18 +0,0 @@
-Feature: Bard deploy should fold the integration branch into master and perform a deploy
-
-  Scenario: Bard deploy detects non-fast-forward merge from integration to master
-    Given a shared rails project
-    And on development_b, a commit on the "master" branch
-    And on development_b, I type "git push origin master"
-    And a commit
-    When I type "bard deploy"
-    Then I should see the fatal error "Rebase"
-
-  Scenario: Bard deploy works
-    Given a shared rails project
-    And a commit
-    When I type "bard deploy"
-    Then the "master" branch should match the "integration" branch
-    And the "integration" branch should match the "origin/integration" branch
-    And the "origin/master" branch should match the "origin/integration" branch
-

data/features/bard_pull.feature

@@ -1,112 +0,0 @@
-Feature: bard pull
-  Background:
-    Given a shared rails project
-
-  Scenario: Pulling down the latest changes from the remote integration branch
-    Given on development_b, a commit
-    And on development_b, I type "bard push"
-    When I type "bard pull"
-    Then the "integration" branch should match the "development_b:integration" branch
-
-  Scenario: Pulling down when the latest changes include a submodule addition
-    Given on development_b, a commit with a new submodule
-    And on development_b, I type "bard push"
-    When I type "bard pull"
-    Then the "integration" branch should match the "development_b:integration" branch
-    And there should be one new submodule
-    And the submodule branch should match the submodule origin branch
-    And the submodule working directory should be clean
-
-  Scenario: Pulling down when the latest changes include a submodule update
-    Given a submodule
-    And on development_b, a commit with a submodule update
-    And on development_b, I type "bard push"
-    When I type "bard pull"
-    Then the "integration" branch should match the "development_b:integration" branch
-    And the submodule branch should match the submodule origin branch
-    And the submodule working directory should be clean
-
-  Scenario: Pulling down when the latest changes include a submodule url change
-    Given a submodule
-    And on development_b, a commit with a submodule url change
-    And on development_b, I type "bard push"
-    When I type "bard pull"
-    Then the "integration" branch should match the "development_b:integration" branch
-    And the submodule url should be changed
-    And the submodule branch should match the submodule origin branch
-    And the submodule working directory should be clean
-
-  # TODO
-  #Scenario: Pulling down when the latest changes include a submodule deletion
-  #  Given a submodule
-  #  And on staging, a commit with a submodule deletion
-  #  When I type "bard pull"
-  #  Then the "integration" branch should match the "origin/integration" branch
-  #  And the submodule should be deleted
-
-  Scenario: Pulling latest changes from the remote integration branch after committing locally
-    Given on development_b, a commit
-    And on development_b, I type "bard push"
-    And a commit
-    When I type "bard pull"
-    Then I should see the warning "Someone has pushed some changes"
-    And the "integration" branch should be a fast-forward from the "development_b:integration" branch
-
-  Scenario: Bard pull from a topic branch
-    Given on development_b, a commit on the "topic" branch
-    And on development_b, I am on the "topic" branch
-    And on development_b, I type "bard push"
-    And I am on the "topic" branch
-    When I type "bard pull"
-    Then the "topic" branch should match the "development_b:topic" branch
-
-  Scenario: Trying to bard pull when not in the project root
-    Given I am in a subdirectory
-    When I type "bard pull"
-    Then I should see the fatal error "root directory"
-
-  Scenario: Trying to bard pull with a dirty working directory
-    Given on development_b, a commit
-    And on development_b, I type "bard push"
-    And a dirty working directory
-    When I type "bard pull"
-    Then I should see the fatal error "You have uncommitted changes!"
-    And the "integration" branch should not match the "development_b:integration" branch
-
-  Scenario: Trying to bard pull when on the "master" branch
-    Given on development_b, a commit on the "master" branch
-    And on development_b, I am on the "master" branch
-    And on development_b, I type "git push origin master"
-    And I am on the "master" branch
-    When I type "bard pull"
-    Then I should see the fatal error "on the master branch"
-    And the "master" branch should not match the "development_b:master" branch
-
-  Scenario: Pulling in a change that includes a migration on a dev machine
-    Given on development_b, a commit with a new migration
-    And on development_b, I type "bard push"
-    And a development database
-    When I type "bard pull"
-    Then the development database should include that migration
-
-  Scenario: Pulling in a change that includes a migration on a dev and testing machine
-    Given on development_b, a commit with a new migration
-    And on development_b, I type "bard push"
-    And a development database
-    And a test database
-    When I type "bard pull"
-    Then the development database should include that migration
-    And the test database should include that migration
-
-  Scenario: Pulling in a change that includes a gem dependency change
-    Given the test gem is not installed
-    And on development_b, a commit that adds the test gem as a dependency
-    And on development_b, I type "bard push"
-    When I type "bard pull"
-    Then the test gem should be installed
-
-  Scenario: Pulling in a change should restart the rails server
-    Given on development_b, a commit
-    And on development_b, I type "bard push"
-    When I type "bard pull"
-    Then passenger should have been restarted

data/features/bard_push.feature

@@ -1,112 +0,0 @@
-Feature: bard push
-  Background:
-    Given a shared rails project
-
-  Scenario: Uploading local changes onto the remote integration branch
-    Given a commit
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    Then the "integration" branch should match the "staging:integration" branch
-
-  Scenario: Uploading local changes onto a remote topic branch
-    Given a commit on the "topic" branch
-    And I am on the "topic" branch
-    When I type "bard push"
-    Then the "topic" branch should match the "origin/topic" branch
-
-  Scenario: Pushing a change that includes a migration
-    Given on staging, a staging database
-    And a commit with a new migration
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    Then on staging, the staging database should include that migration
-
-  Scenario: Pushing a change that includes a gem dependency change
-    Given the test gem is not installed
-    And a commit that adds the test gem as a dependency
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    Then on staging, the test gem should be installed
-
-  Scenario: Pushing a change should advance the staging HEAD and restart the staging rails server
-    Given a commit
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    And the "integration" branch should match the "staging:integration" branch
-    Then on staging, passenger should have been restarted
-
-  Scenario: Pushing a change that includes a submodule addition
-    Given a commit with a new submodule
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    Then on staging, there should be one new submodule
-    And the submodule branch should match the submodule origin branch
-    And on staging, the submodule working directory should be clean
-
-  Scenario: Pushing a change that includes a submodule update
-    Given a submodule
-    And a commit with a submodule update
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    Then the submodule branch should match the submodule origin branch
-    Then on staging, the submodule working directory should be clean
-
-  Scenario: Pushing a change that includes a submodule url change
-    Given a submodule
-    And a commit with a submodule url change
-    When I type "bard push"
-    And on staging, I type "bard stage"
-    Then on staging, the submodule url should be changed
-    And the submodule branch should match the submodule origin branch
-    Then on staging, the submodule working directory should be clean
-
-  # TODO
-  #Scenario: Pushing a change that includes a submodule deletion
-  #  Given a submodule
-  #  Given I have committed a set of changes that includes a submodule deletion
-  #  When I type "bard push"
-  #  And on staging, I type "bard stage"
-  #  Then the remote submodule should be deleted
-
-  Scenario: Trying to bard push when not in the project root
-    Given I am in a subdirectory
-    When I type "bard push"
-    Then I should see the fatal error "root directory"
-
-  Scenario: Trying to bard push when not on the integration branch
-    Given a commit on the "master" branch
-    And I am on the "master" branch
-    When I type "bard push"
-    Then I should see the fatal error "on the master branch"
-    And the "master" branch should not match the "origin/master" branch
-
-  Scenario: Trying to bard push with a dirty working directory
-    Given a commit
-    And a dirty working directory
-    When I type "bard push"
-    Then I should see the fatal error "You have uncommitted changes!"
-    And the "integration" branch should not match the "origin/integration" branch
-
-  Scenario: Trying to bard push with a non-fast-foward changeset
-    Given a commit
-    And on development_b, a commit
-    And on development_b, I type "bard push"
-    When I type "bard push"
-    Then I should see the fatal error "Someone has pushed some changes"
-    And the "integration" branch should not match the "origin/integration" branch
-
-  Scenario: Trying to bard push with an uncommitted change to a submodule
-    Given a submodule
-    And a commit
-    And the submodule working directory is dirty
-    When I type "bard push"
-    Then I should see the fatal error "Micah"
-    And the "integration" branch should not match the "origin/integration" branch
-
-  Scenario: Trying to bard push with a committed but unpushed change to a submodule
-    Given a submodule
-    And a commit to the submodule
-    And a commit
-    When I type "bard push"
-    Then I should see the fatal error "Micah"
-    And the "integration" branch should not match the "origin/integration" branch

data/features/podman_testcontainers.feature

@@ -1,16 +0,0 @@
-@podman
-Feature: bard run against a podman TestContainers host
-  Background:
-    Given a podman testcontainer is ready for bard
-
-  Scenario: Running ls via bard run
-    Given a remote file "test-file.txt" exists in the test container
-    When I run bard "ls" against the test container
-    Then the bard command should succeed
-    And the bard output should include "test-file.txt"
-
-  Scenario: Running commands in isolated containers
-    Given a remote file "another-file.txt" containing "content" exists in the test container
-    When I run bard "cat another-file.txt" against the test container
-    Then the bard command should succeed
-    And the bard output should include "content"

data/features/step_definitions/check_steps.rb

@@ -1,47 +0,0 @@
-Then /^I should see the current version of bard$/ do
-  version = File.read("#{ROOT}/VERSION").chomp
-  @stdout.should =~ /bard\s+\(#{Regexp.escape(version)}\)/
-end
-
-Then /^I should see the current version of git$/ do
-  version = `git --version`[/[0-9]+\.[0-9]+\.[0-9]+/]
-  @stdout.should =~ /git\s+\(#{Regexp.escape(version)}/
-end
-
-Then /^I should see the current version of rubygems$/ do
-  version = `gem --version`.chomp
-  @stdout.should =~ /rubygems\s+\(#{Regexp.escape(version)}\)/
-end
-
-Then /^I should see the current version of ruby$/ do
-  version = `ruby --version`[/[0-9]+\.[0-9]+\.[0-9]+/]
-  @stdout.should =~ /ruby\s+\(#{Regexp.escape(version)}\)/
-end
-
-Given /^"([^\"]*)" is missing$/ do |file|
-  type "rm #{file}"
-end
-
-Given /^the database is missing$/ do
-  File.open "config/database.yml", "w" do |f|
-    f.puts <<-DB
-development:
-  adapter: mysql
-  username: root
-  password:
-  database: bad_bad_bad
-  socket: /var/run/mysqld/mysqld.sock
-DB
-  end
-end
-
-Given /^the submodule is missing$/ do
-  type "rm -rf submodule"
-  type "mkdir submodule"
-end
-
-Given /^the submodule has a detached head$/ do
-  Dir.chdir "submodule" do
-    type "git checkout `git rev-parse HEAD`"
-  end
-end

data/features/step_definitions/git_steps.rb

@@ -1,73 +0,0 @@
-Given /^I am on the "([^\"]+)" branch$/ do |branch|
-  if `git branch` =~ / #{branch}$/
-    type "git checkout #{branch}"
-  else
-    type "git checkout -b #{branch}"
-  end
-end
-
-Given /^there is no integration branch$/ do
-  type "git checkout master"
-  type "git branch -d integration"
-end
-
-Given /^the integration branch isnt tracking origin\/integration$/ do
-  type "git checkout master"
-  type "git branch -d integration"
-  type "git checkout -b integration"
-end
-
-Given /^a dirty working directory$/ do
-  File.open("dirty_file", "w") { |f| f.puts "dirty dirty" }
-end
-
-Given /^a commit$/ do
-  text = (rand * 100000000).round
-  type "echo '#{text}' > foobar_#{text}_file"
-  type "git add ."
-  type "git commit -am'test commit'"
-end
-
-Given /^a commit on the "([^\"]+)" branch$/ do |branch|
-  Given %(I am on the "#{branch}" branch)
-  text = (rand * 100000000).round
-  type "echo '#{text}' > #{branch}_#{text}_file"
-  type "git add ."
-  type "git commit -am 'testing #{branch} change'"
-  type "git checkout integration"
-end
-
-Then /^the directory should not be dirty$/ do
-  type("git status").should include "working directory clean"
-end
-
-Then /^I should be on the "([^\"]*)" branch$/ do |branch|
-  @repo.head.name.should == branch
-end
-
-Then /^there should not be a "([^\"]*)" branch$/ do |branch_name|
-  @repo.branches.any? { |branch| branch.name == branch_name }
-end
-
-Then /^the "([^\"]*)" branch (should|should not) match the "([^\"]*)" branch$/ do |local_branch, which, remote_branch|
-  type "git fetch origin"
-  local_env, local_branch = local_branch.split(':') if local_branch.include? ':'
-  local_env ||= "development_a"
-  remote_env, remote_branch = remote_branch.split(':') if remote_branch.include? ':'
-  remote_env ||= "development_a"
-  local_sha = @repos[local_env].commits(local_branch).first.id
-  remote_sha = @repos[remote_env].commits(remote_branch).first.id
-  which = which.gsub(/ /, '_').to_sym
-  local_sha.send(which) == remote_sha
-end
-
-Then /^the "([^\"]*)" branch should be a fast\-forward from the "([^\"]*)" branch$/ do |local_branch, remote_branch|
-  local_env, local_branch = local_branch.split(':') if local_branch.include? ':'
-  local_env ||= "development_a"
-  remote_env, remote_branch = remote_branch.split(':') if remote_branch.include? ':'
-  remote_env ||= "development_a"
-  local_sha = @repos[local_env].commits(local_branch).first.id
-  remote_sha = @repos[remote_env].commits(remote_branch).first.id
-  common_ancestor = @repos[local_env].find_common_ancestor local_sha, remote_sha
-  common_ancestor.should  == remote_sha
-end