bard 1.8.0.beta3 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4723f9821cfeae7ef2a4e0e2aaacf1aff1940f2ce2d0a01fd924661eddf75fbb
-  data.tar.gz: 0a6268ae7024340e0bb764ff43acfa518f492b9d2b4cf0a0f4807312b72819bd
+  metadata.gz: 315f02fbb865e24647f358979a3f135d6a9b5fa58d27d447cc92cc9462ba80b6
+  data.tar.gz: 3fd528b19bbfb0edfeb3b05aff689a4c4bc52ef9c2ac218566b1c0be8e071ade
 SHA512:
-  metadata.gz: ac9c56474359bc212ab0844c3d517bdd92c8963db65397fb4d537d93f039d07636619e1260409e45a8e92bfbda546290698cb84f9d91aa0165b187dd8f767a97
-  data.tar.gz: b85045b73743600cce448b3adc67b134be3b15c3cda7ac0573aaedda0bffdc26a0057c85c664cf7912c08b9a322b72b283b5ba0fd7359e941a0cbc267a081a25
+  metadata.gz: 464041788694b06f9ef754a01a5de77e198140ad738cc60a7596110f32044b0e8b73ebb405aa210b488ad269b64d3829d51b368cc297617b9c0c8bfc479126c6
+  data.tar.gz: c48d80a55fc37dd081cb6220919c9f3cef0f0356f75b8befcd8fd1dbf89e11619075f3db9b8ec7cdf387da9e80ee120b39a93b500c839ba816c627cea3dff6ae

data/.github/workflows/ci.yml

@@ -34,10 +34,5 @@ jobs:
           done
           echo "DOCKER_HOST=tcp://127.0.0.1:8080" >> $GITHUB_ENV
 
-      - name: Build test container image
-        run: |
-          sudo podman pull ubuntu:22.04
-          sudo podman build -t bard-test-server -f spec/acceptance/docker/Dockerfile spec/acceptance/docker
-
       - name: Run tests
         run: bundle exec rake

data/MIGRATION_GUIDE.md

@@ -2,8 +2,6 @@
 
 This guide will help you migrate your Bard configuration from v1.x to v2.0.
 
-> **Note:** Bard v1.8.0 is a transitional release that supports both v1.x and v2.0 APIs. When using deprecated v1.x patterns, you'll see deprecation warnings indicating what to change. This gives you time to migrate at your own pace while keeping your deployments working.
-
 ## Overview of Changes
 
 Bard v2.0 introduces a cleaner, more modular architecture:
@@ -479,35 +477,22 @@ mv bard.rb.backup bard.rb
 - Check [CUSTOM_STRATEGIES.md](CUSTOM_STRATEGIES.md) for strategy creation
 - Open an issue at https://github.com/botandrose/bard/issues
 
-## Transitional Release (v1.8.0)
+## Transitional Release (v1.9.x)
 
-Bard v1.8.0 is a transitional release that supports both v1.x and v2.0 APIs simultaneously with deprecation warnings. This allows gradual migration.
+A transitional release (v1.9.x) will support both v1 and v2 APIs simultaneously with deprecation warnings. This allows gradual migration.
 
-**Using v1.8.0:**
+**Using v1.9.x:**
 ```bash
 # Gemfile
-gem 'bard', '~> 1.8'
+gem 'bard', '~> 1.9'
 
 bundle update bard
 ```
 
-v1.8.0 will:
-- Accept both `server` and `target` (with deprecation warning for `server`)
-- Accept both old and new SSH configuration styles (with deprecation warnings for separate options)
-- Accept both old `strategy`/`option` calls and new direct strategy methods (with deprecation warnings)
-- Show deprecation warnings for all deprecated v1.x API usage
-- Support full v2.0 API
+v1.9.x will:
+- Accept both `server` and `target` (with deprecation warning)
+- Accept both old and new SSH configuration styles
+- Show deprecation warnings for old API usage
+- Support full v2 API
 
 This gives you time to migrate at your own pace while keeping your deployments working.
-
-### Deprecation Warnings
-
-When using deprecated patterns, you'll see warnings like:
-
-```
-[DEPRECATION] `server` is deprecated; use `target` instead (will be removed in v2.0) (called from bard.rb:3)
-[DEPRECATION] Separate SSH options are deprecated; pass as keyword arguments to `ssh` instead (will be removed in v2.0) (called from bard.rb:5)
-[DEPRECATION] `strategy` is deprecated; use the strategy method directly (will be removed in v2.0) (called from bard.rb:10)
-```
-
-These warnings help you identify what needs to change before upgrading to v2.0.

data/Rakefile

@@ -1,9 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "cucumber/rake/task"
 
 RSpec::Core::RakeTask.new(:spec)
-Cucumber::Rake::Task.new(:cucumber)
 
-task :default => [:spec, :cucumber]
+task :default => :spec
 

data/features/bard_check.feature

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,112 @@
+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

@@ -0,0 +1,112 @@
+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

@@ -0,0 +1,16 @@
+@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

@@ -0,0 +1,47 @@
+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

@@ -0,0 +1,73 @@
+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

data/features/step_definitions/global_steps.rb

@@ -0,0 +1,56 @@
+Given /^a shared rails project$/ do
+  # TEARDOWN
+  Dir.foreach "#{ROOT}/tmp" do |file|
+    FileUtils.rm_rf("#{ROOT}/tmp/#{file}") unless %w(fixtures . ..).include? file
+  end
+
+  # SETUP
+  Dir.chdir ROOT
+  `cp -r tmp/fixtures/* tmp/`
+
+  Dir.chdir 'tmp'
+  @repos = {}
+  %w(development_a development_b staging production).each do |env|
+    @repos[env] = Grit::Repo.new env
+  end
+  Dir.chdir 'development_a'
+  @repo = @repos['development_a']
+  @env = { 'RAILS_ENV' => 'development', 'TESTING' => true }
+end
+
+Given /^I am in a subdirectory$/ do
+  FileUtils.mkdir "test_subdirectory"
+  Dir.chdir "test_subdirectory"
+end
+
+When /^I type "([^\"]*)"$/ do |command|
+  type command.sub /\b(bard)\b/, "#{ROOT}/bin/bard"
+end
+
+When /^on (\w+), (.*$)/ do |env, step|
+  old_env = @env['RAILS_ENV']
+  @env['RAILS_ENV'] = env if %w(staging production).include? env
+  Dir.chdir "#{ROOT}/tmp/#{env}" do
+    old_repo = @repo
+    @repo = @repos[env]
+    When step
+    @repo = old_repo
+  end
+  @env['RAILS_ENV'] = old_env
+end
+
+Then /^I should see the fatal error "([^\"]*)"$/ do |error_message|
+  @stderr.should include(error_message)
+end
+
+Then /^I should see the warning "([^\"]*)"$/ do |warning_message|
+  @stderr.should include(warning_message)
+end
+
+Then /^I should see "([^\"]*)"$/ do |message|
+  @stdout.should include(message)
+end
+
+Then /^debug$/ do
+  debugger
+end

data/features/step_definitions/podman_steps.rb

@@ -0,0 +1,23 @@
+Given /^a podman testcontainer is ready for bard$/ do
+  raise "Podman testcontainer failed to start" unless @podman_container && @podman_ssh_port
+end
+
+Given /^a remote file "([^\"]+)" exists in the test container$/ do |filename|
+  run_ssh("touch testproject/#{filename}").should be_true
+end
+
+Given /^a remote file "([^\"]+)" containing "([^\"]+)" exists in the test container$/ do |filename, content|
+  run_ssh("echo #{Shellwords.escape(content)} > testproject/#{filename}").should be_true
+end
+
+When /^I run bard "([^\"]+)" against the test container$/ do |command|
+  run_bard_against_container(command)
+end
+
+Then /^the bard command should succeed$/ do
+  @status.success?.should be_true
+end
+
+Then /^the bard output should include "([^\"]+)"$/ do |expected|
+  @stdout.should include(expected)
+end