bard 1.9.6 → 2.0.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-03-07 00:00:00.000000000 Z
+date: 2026-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,21 +38,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,13 +66,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: base64
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -80,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debug
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: testcontainers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,7 +136,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: testcontainers
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,81 +182,51 @@ files:
 - features/support/bard-coverage
 - features/support/env.rb
 - features/support/test_server.rb
-- install_files/.github/dependabot.yml
-- install_files/.github/workflows/cache-ci.yml
-- install_files/.github/workflows/ci.yml
-- install_files/apt_dependencies.rb
-- install_files/ci
-- install_files/setup
-- install_files/specified_bundler.rb
-- install_files/specified_ruby.rb
 - lib/bard.rb
-- lib/bard/ci.rb
-- lib/bard/ci/github_actions.rb
-- lib/bard/ci/jenkins.rb
-- lib/bard/ci/local.rb
-- lib/bard/ci/retryable.rb
-- lib/bard/ci/runner.rb
-- lib/bard/ci/state.rb
 - lib/bard/cli.rb
-- lib/bard/cli/ci.rb
-- lib/bard/cli/command.rb
-- lib/bard/cli/data.rb
-- lib/bard/cli/deploy.rb
-- lib/bard/cli/hurt.rb
-- lib/bard/cli/install.rb
-- lib/bard/cli/master_key.rb
-- lib/bard/cli/new.rb
-- lib/bard/cli/new_rails_template.rb
-- lib/bard/cli/open.rb
-- lib/bard/cli/ping.rb
-- lib/bard/cli/provision.rb
-- lib/bard/cli/run.rb
-- lib/bard/cli/setup.rb
-- lib/bard/cli/ssh.rb
-- lib/bard/cli/stage.rb
-- lib/bard/cli/vim.rb
 - lib/bard/command.rb
 - lib/bard/config.rb
 - lib/bard/copy.rb
-- lib/bard/default_config.rb
-- lib/bard/deploy_strategy.rb
-- lib/bard/deploy_strategy/github_pages.rb
-- lib/bard/deploy_strategy/ssh.rb
-- lib/bard/deprecation.rb
-- lib/bard/git.rb
-- 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/data.rb
+- lib/bard/plugins/deploy.rb
+- lib/bard/plugins/deploy/ci.rb
+- lib/bard/plugins/deploy/ci/github_actions.rb
+- lib/bard/plugins/deploy/ci/jenkins.rb
+- lib/bard/plugins/deploy/ci/local.rb
+- lib/bard/plugins/deploy/ci/runner.rb
+- lib/bard/plugins/deploy/ci/state.rb
+- lib/bard/plugins/deploy/ssh_strategy.rb
+- lib/bard/plugins/deploy/strategy.rb
+- lib/bard/plugins/git.rb
+- lib/bard/plugins/github.rb
 - lib/bard/plugins/github_pages.rb
+- lib/bard/plugins/github_pages/strategy.rb
 - lib/bard/plugins/hurt.rb
 - lib/bard/plugins/install.rb
-- lib/bard/plugins/jenkins.rb
-- lib/bard/plugins/new.rb
+- lib/bard/plugins/install/.github/dependabot.yml
+- lib/bard/plugins/install/.github/workflows/cache-ci.yml
+- lib/bard/plugins/install/.github/workflows/ci.yml
+- lib/bard/plugins/install/apt_dependencies.rb
+- lib/bard/plugins/install/ci
+- lib/bard/plugins/install/setup
+- lib/bard/plugins/install/specified_bundler.rb
+- lib/bard/plugins/install/specified_ruby.rb
+- lib/bard/plugins/open.rb
 - lib/bard/plugins/ping.rb
-- lib/bard/plugins/provision.rb
+- lib/bard/plugins/ping/check.rb
+- lib/bard/plugins/ping/target_methods.rb
+- lib/bard/plugins/run.rb
+- lib/bard/plugins/setup.rb
+- lib/bard/plugins/ssh.rb
+- lib/bard/plugins/ssh/connection.rb
+- lib/bard/plugins/ssh/copy.rb
+- lib/bard/plugins/ssh/server.rb
+- lib/bard/plugins/ssh/target_methods.rb
+- lib/bard/plugins/url.rb
+- lib/bard/plugins/url/target_methods.rb
 - lib/bard/plugins/vim.rb
-- lib/bard/provision.rb
-- lib/bard/provision/app.rb
-- lib/bard/provision/apt.rb
-- lib/bard/provision/authorizedkeys.rb
-- lib/bard/provision/data.rb
-- lib/bard/provision/deploy.rb
-- lib/bard/provision/http.rb
-- lib/bard/provision/logrotation.rb
-- lib/bard/provision/masterkey.rb
-- lib/bard/provision/mysql.rb
-- lib/bard/provision/passenger.rb
-- lib/bard/provision/repo.rb
-- lib/bard/provision/rvm.rb
-- lib/bard/provision/ssh.rb
-- lib/bard/provision/swapfile.rb
-- lib/bard/provision/user.rb
+- lib/bard/retryable.rb
 - lib/bard/secrets.rb
-- lib/bard/server.rb
-- lib/bard/ssh_server.rb
 - lib/bard/target.rb
 - lib/bard/version.rb
 - spec/acceptance/.gitignore
@@ -269,16 +239,13 @@ files:
 - spec/bard/ci/runner_spec.rb
 - spec/bard/ci_spec.rb
 - spec/bard/cli/ci_spec.rb
-- spec/bard/cli/command_spec.rb
 - spec/bard/cli/data_spec.rb
 - spec/bard/cli/deploy_spec.rb
 - spec/bard/cli/hurt_spec.rb
 - spec/bard/cli/install_spec.rb
 - spec/bard/cli/master_key_spec.rb
-- spec/bard/cli/new_spec.rb
 - spec/bard/cli/open_spec.rb
 - spec/bard/cli/ping_spec.rb
-- spec/bard/cli/provision_spec.rb
 - spec/bard/cli/run_spec.rb
 - spec/bard/cli/setup_spec.rb
 - spec/bard/cli/ssh_spec.rb
@@ -289,30 +256,11 @@ files:
 - spec/bard/copy_spec.rb
 - spec/bard/deploy_strategy/ssh_spec.rb
 - spec/bard/deploy_strategy_spec.rb
-- spec/bard/deprecation_spec.rb
 - spec/bard/dynamic_dsl_spec.rb
 - spec/bard/git_spec.rb
-- 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
-- spec/bard/provision/data_spec.rb
-- spec/bard/provision/deploy_spec.rb
-- spec/bard/provision/http_spec.rb
-- spec/bard/provision/logrotation_spec.rb
-- spec/bard/provision/masterkey_spec.rb
-- spec/bard/provision/mysql_spec.rb
-- spec/bard/provision/passenger_spec.rb
-- spec/bard/provision/repo_spec.rb
-- spec/bard/provision/rvm_spec.rb
-- spec/bard/provision/ssh_spec.rb
-- spec/bard/provision/swapfile_spec.rb
-- spec/bard/provision/user_spec.rb
-- spec/bard/provision_spec.rb
-- spec/bard/server_spec.rb
+- spec/bard/ssh_copy_spec.rb
 - spec/bard/ssh_server_spec.rb
 - spec/bard/target_spec.rb
 - spec/bard_spec.rb
@@ -330,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -360,16 +308,13 @@ test_files:
 - spec/bard/ci/runner_spec.rb
 - spec/bard/ci_spec.rb
 - spec/bard/cli/ci_spec.rb
-- spec/bard/cli/command_spec.rb
 - spec/bard/cli/data_spec.rb
 - spec/bard/cli/deploy_spec.rb
 - spec/bard/cli/hurt_spec.rb
 - spec/bard/cli/install_spec.rb
 - spec/bard/cli/master_key_spec.rb
-- spec/bard/cli/new_spec.rb
 - spec/bard/cli/open_spec.rb
 - spec/bard/cli/ping_spec.rb
-- spec/bard/cli/provision_spec.rb
 - spec/bard/cli/run_spec.rb
 - spec/bard/cli/setup_spec.rb
 - spec/bard/cli/ssh_spec.rb
@@ -380,30 +325,11 @@ test_files:
 - spec/bard/copy_spec.rb
 - spec/bard/deploy_strategy/ssh_spec.rb
 - spec/bard/deploy_strategy_spec.rb
-- spec/bard/deprecation_spec.rb
 - spec/bard/dynamic_dsl_spec.rb
 - spec/bard/git_spec.rb
-- 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
-- spec/bard/provision/data_spec.rb
-- spec/bard/provision/deploy_spec.rb
-- spec/bard/provision/http_spec.rb
-- spec/bard/provision/logrotation_spec.rb
-- spec/bard/provision/masterkey_spec.rb
-- spec/bard/provision/mysql_spec.rb
-- spec/bard/provision/passenger_spec.rb
-- spec/bard/provision/repo_spec.rb
-- spec/bard/provision/rvm_spec.rb
-- spec/bard/provision/ssh_spec.rb
-- spec/bard/provision/swapfile_spec.rb
-- spec/bard/provision/user_spec.rb
-- spec/bard/provision_spec.rb
-- spec/bard/server_spec.rb
+- spec/bard/ssh_copy_spec.rb
 - spec/bard/ssh_server_spec.rb
 - spec/bard/target_spec.rb
 - spec/bard_spec.rb

data/lib/bard/ci/retryable.rb

@@ -1,27 +0,0 @@
-module Bard
-  class CI
-    module Retryable
-      MAX_RETRIES = 5
-      INITIAL_DELAY = 1
-
-      def retry_with_backoff(max_retries: MAX_RETRIES)
-        retries = 0
-        delay = INITIAL_DELAY
-
-        begin
-          yield
-        rescue => e
-          if retries < max_retries
-            retries += 1
-            puts "  Network error (attempt #{retries}/#{max_retries}): #{e.message}. Retrying in #{delay}s..."
-            sleep(delay)
-            delay *= 2
-            retry
-          else
-            raise "Network error after #{max_retries} attempts: #{e.message}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/bard/cli/ci.rb

@@ -1,73 +0,0 @@
-require "bard/ci"
-require "bard/git"
-
-module Bard::CLI::CI
-  def self.included mod
-    mod.class_eval do
-
-      option :"local-ci", type: :boolean
-      option :ci, type: :string
-      option :status, type: :boolean
-      option :resume, type: :boolean
-      desc "ci [branch=HEAD]", "runs ci against BRANCH"
-      def ci branch=Bard::Git.current_branch
-        runner_name = if options["local-ci"]
-          :local
-        elsif options["ci"]
-          options["ci"].to_sym
-        else
-          config.ci
-        end
-        ci = Bard::CI.new(project_name, branch, runner_name: runner_name)
-        unless ci.exists?
-          puts red("No CI found for #{project_name}!")
-          puts "Re-run with --skip-ci to bypass CI, if you absolutely must, and know what you're doing."
-          exit 1
-        end
-
-        return puts ci.status if options["status"]
-
-        if options["resume"]
-          puts "Continuous integration: resuming build..."
-          success = ci.resume do |elapsed_time, last_time|
-            if last_time
-              percentage = (elapsed_time.to_f / last_time.to_f * 100).to_i
-              output = "  Estimated completion: #{percentage}%"
-            else
-              output = "  No estimated completion time. Elapsed time: #{elapsed_time} sec"
-            end
-            print "\x08" * output.length
-            print output
-            $stdout.flush
-          end
-        else
-          puts "Continuous integration: starting build on #{branch}..."
-
-          success = ci.run do |elapsed_time, last_time|
-            if last_time
-              percentage = (elapsed_time.to_f / last_time.to_f * 100).to_i
-              output = "  Estimated completion: #{percentage}%"
-            else
-              output = "  No estimated completion time. Elapsed time: #{elapsed_time} sec"
-            end
-            print "\x08" * output.length
-            print output
-            $stdout.flush
-          end
-        end
-
-        if success
-          puts
-          puts "Continuous integration: success!"
-        else
-          puts
-          puts ci.console
-          puts red("Automated tests failed!")
-          exit 1
-        end
-      end
-
-    end
-  end
-end
-

data/lib/bard/cli/command.rb

@@ -1,26 +0,0 @@
-require "delegate"
-
-class Bard::CLI::Command < SimpleDelegator
-  def self.desc command, description
-    @command = command
-    @method = command.split(" ").first.to_sym
-    @description = description
-  end
-
-  def self.option *args, **kwargs
-    @option_args = args
-    @option_kwargs = kwargs
-  end
-
-  def self.setup cli
-    cli.desc @command, @description
-    cli.option *@option_args, **@option_kwargs if @option_args || @option_kwargs
-    # put in local variables so next block can capture it
-    command_class = self
-    method = @method
-    cli.define_method method do |*args|
-      command = command_class.new(self)
-      command.send method, *args
-    end
-  end
-end

data/lib/bard/cli/data.rb

@@ -1,45 +0,0 @@
-require "bard/command"
-
-module Bard::CLI::Data
-  def self.included mod
-    mod.class_eval do
-
-      desc "data --from=production --to=local", "copy database and assets from from to to"
-      option :from, default: "production"
-      option :to, default: "local"
-      def data
-        from = config[options[:from]]
-        to = config[options[:to]]
-
-        if to.key == :production
-          url = to.ping.first
-          puts yellow "WARNING: You are about to push data to production, overwriting everything that is there!"
-          answer = ask("If you really want to do this, please type in the full HTTPS url of the production server:")
-          if answer != url
-            puts red("!!! ") + "Failed! We expected #{url}. Is this really where you want to overwrite all the data?"
-            exit 1
-          end
-        end
-
-        puts "Dumping #{from.key} database to file..."
-        from.run! "bin/rake db:dump"
-
-        puts "Transfering file from #{from.key} to #{to.key}..."
-        from.copy_file "db/data.sql.gz", to: to, verbose: true
-
-        puts "Loading file into #{to.key} database..."
-        to.run! "bin/rake db:load"
-
-        config.data.each do |path|
-          puts "Synchronizing files in #{path}..."
-          from.copy_dir path, to: to, verbose: true
-        end
-      rescue Bard::Command::Error => e
-        puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
-        exit 1
-      end
-
-    end
-  end
-end
-

data/lib/bard/cli/deploy.rb

@@ -1,116 +0,0 @@
-require "bard/git"
-require "bard/command"
-require "bard/github_pages"
-require "tmpdir"
-
-module Bard::CLI::Deploy
-  def self.included mod
-    mod.class_eval do
-
-      option :"skip-ci", type: :boolean
-      option :"local-ci", type: :boolean
-      option :ci, type: :string
-      option :clone, type: :boolean
-      option :target, type: :string, default: "production"
-      desc "deploy [BRANCH]", "deploys branch to target (default: current branch to production)"
-      def deploy branch=nil
-        branch ||= Bard::Git.current_branch
-
-        if branch == "master"
-          if !Bard::Git.up_to_date_with_remote?(branch)
-            run! "git push origin #{branch}:#{branch}"
-          end
-          invoke :ci, [branch], options.slice("local-ci", "ci") unless options["skip-ci"] || config.ci == false
-
-        else
-          run! "git fetch origin"
-          if Bard::Git.current_branch != "master"
-            run! "git fetch origin master:master"
-          end
-
-          unless Bard::Git.fast_forward_merge?("origin/master", branch)
-            puts "The master branch has advanced. Attempting rebase..."
-            if branch == Bard::Git.current_branch
-              run! "git rebase origin/master"
-            else
-              tmpdir = Dir.mktmpdir("bard-rebase")
-              begin
-                run! "git worktree add --detach #{tmpdir} #{branch}"
-                success = Dir.chdir(tmpdir) { system("git rebase origin/master") }
-                rebased_sha = Dir.chdir(tmpdir) { `git rev-parse HEAD`.strip } if success
-                run! "git worktree remove #{tmpdir} --force"
-                unless success
-                  puts red("!!! ") + "Rebase failed due to conflicts."
-                  puts "Please rebase #{branch} manually:"
-                  puts "  git checkout #{branch}"
-                  puts "  git rebase origin/master"
-                  exit 1
-                end
-                run! "git branch -f #{branch} #{rebased_sha}"
-              ensure
-                FileUtils.rm_rf(tmpdir) if Dir.exist?(tmpdir)
-              end
-            end
-          end
-
-          run! "git push -f origin #{branch}:#{branch}"
-
-          invoke :ci, [branch], options.slice("local-ci", "ci") unless options["skip-ci"] || config.ci == false
-
-          run! "git push origin #{branch}:master"
-          if Bard::Git.current_branch != "master"
-            run! "git fetch origin master:master"
-          else
-            run! "git pull origin master"
-          end
-        end
-
-        if `git remote` =~ /\bgithub\b/
-          run! "git push github"
-        end
-
-        to = options[:target].to_sym
-
-        if options[:clone]
-          config[to].run! "git clone git@github.com:botandrosedesign/#{project_name} #{config[to].path}", home: true
-          invoke :master_key, [], from: "local", to: to
-          config[to].run! "bin/setup && bard setup"
-        else
-          # Use deployment strategy for v2.0 Targets, or fallback for v1.x Servers
-          target = config[to]
-          if target.respond_to?(:deploy_strategy) && target.deploy_strategy
-            strategy = target.deploy_strategy_instance
-            strategy.deploy
-          elsif target.respond_to?(:github_pages) && target.github_pages
-            # Old v1.x github_pages support
-            require "bard/github_pages"
-            Bard::GithubPages.new(self).deploy(target)
-          else
-            # Default SSH deployment
-            target.run! "git pull origin master && bin/setup"
-          end
-        end
-
-        puts green("Deploy Succeeded")
-
-        if branch != "master"
-          puts "Deleting branch: #{branch}"
-          run! "git push --delete origin #{branch}"
-
-          if branch == Bard::Git.current_branch
-            run! "git checkout master"
-          end
-
-          run! "git branch -D #{branch}"
-        end
-
-        ping to
-      rescue Bard::Command::Error => e
-        puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
-        exit 1
-      end
-
-    end
-  end
-end
-

data/lib/bard/cli/hurt.rb

@@ -1,15 +0,0 @@
-require "bard/cli/command"
-
-class Bard::CLI::Hurt < Bard::CLI::Command
-  desc "hurt <command>", "reruns a command until it fails"
-  def hurt *args
-    (1..).each do |count|
-      puts "Running attempt #{count}"
-      system *args
-      unless $?.success?
-        puts "Ran #{count-1} times before failing"
-        break
-      end
-    end
-  end
-end

data/lib/bard/cli/install.rb

@@ -1,11 +0,0 @@
-require "bard/cli/command"
-
-class Bard::CLI::Install < Bard::CLI::Command
-  desc "install", "copies bin/setup and bin/ci scripts into current project."
-  def install
-    install_files_path = File.expand_path(File.join(__dir__, "../../../install_files"))
-
-    system "cp -R #{install_files_path}/* bin/"
-    system "cp -R #{install_files_path}/.github ./"
-  end
-end

data/lib/bard/cli/master_key.rb

@@ -1,17 +0,0 @@
-module Bard::CLI::MasterKey
-  def self.included mod
-    mod.class_eval do
-
-      desc "master_key --from=production --to=local", "copy master key from from to to"
-      option :from, default: "production"
-      option :to, default: "local"
-      def master_key
-        from = config[options[:from]]
-        to = config[options[:to]]
-        from.copy_file "config/master.key", to:
-      end
-
-    end
-  end
-end
-