bard 1.9.6 → 2.0.0

data/lib/bard/copy.rb

@@ -1,99 +1,45 @@
-require "uri"
-require "bard/command"
-
 module Bard
-  class Copy < Struct.new(:path, :from, :to, :verbose)
-    def self.file path, from:, to:, verbose: false
-      new(path, from, to, verbose).scp
-    end
-
-    def self.dir path, from:, to:, verbose: false
-      new(path, from, to, verbose).rsync
-    end
+  class Copy
+    @handlers = []
 
-    def scp
-      if from.key == :local
-        scp_using_local :to, to
-      elsif to.key == :local
-        scp_using_local :from, from
-      else
-        scp_as_mediator
+    class << self
+      def inherited(subclass)
+        super
+        @handlers.unshift(subclass)
       end
-    end
-
-    def scp_using_local direction, target_or_server
-      # Support both new Target (with server attribute) and old Server
-      ssh_server = target_or_server.respond_to?(:server) ? target_or_server.server : target_or_server
 
-      gateway = ssh_server.gateway ? "-oProxyCommand='ssh #{ssh_server.gateway} -W %h:%p'" : ""
-
-      ssh_key = ssh_server.ssh_key ? "-i #{ssh_server.ssh_key}" : ""
-
-      ssh_opts = "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR"
-
-      # scp uses -P for port (uppercase, unlike ssh's -p)
-      port = ssh_server.port
-      port_opt = port && port.to_s != "22" ? "-P #{port}" : ""
-
-      from_and_to = [path, target_or_server.scp_uri(path).to_s]
-      from_and_to.reverse! if direction == :from
-
-      command = ["scp", ssh_opts, gateway, ssh_key, port_opt, *from_and_to].reject(&:empty?).join(" ")
-      Bard::Command.run! command, verbose: verbose
-    end
+      def file(path, from:, to:, verbose: false)
+        handler_for!(from, to).new(path, from, to, verbose).file
+      end
 
-    def scp_as_mediator
-      from_server = from.respond_to?(:server) ? from.server : from
-      to_server = to.respond_to?(:server) ? to.server : to
+      def dir(path, from:, to:, verbose: false)
+        handler_for!(from, to).new(path, from, to, verbose).dir
+      end
 
-      raise NotImplementedError if from_server.gateway || to_server.gateway || from_server.ssh_key || to_server.ssh_key
-      command = "scp -o ForwardAgent=yes #{from.scp_uri(path)} #{to.scp_uri(path)}"
-      Bard::Command.run! command, verbose: verbose
-    end
+      private
 
-    def rsync
-      if from.key == :local
-        rsync_using_local :to, to
-      elsif to.key == :local
-        rsync_using_local :from, from
-      else
-        rsync_as_mediator
+      def handler_for!(from, to)
+        handler = @handlers.find { |h| h.can_handle?(from, to) }
+        raise "No copy handler for #{from.key} -> #{to.key}" unless handler
+        handler
       end
     end
 
-    def rsync_using_local direction, target_or_server
-      # Support both new Target (with server attribute) and old Server
-      ssh_server = target_or_server.respond_to?(:server) ? target_or_server.server : target_or_server
-
-      ssh_uri = ssh_server.ssh_uri
-
-      gateway = ssh_server.gateway ? "-oProxyCommand=\"ssh #{ssh_server.gateway} -W %h:%p\"" : ""
-
-      ssh_key = ssh_server.ssh_key ? "-i #{ssh_server.ssh_key}" : ""
-      ssh = "-e'ssh #{gateway} -p#{ssh_uri.port || 22}'"
+    attr_reader :path, :from, :to, :verbose
 
-      from_and_to = ["./#{path}", target_or_server.rsync_uri(path)]
-      from_and_to.reverse! if direction == :from
-      from_and_to[-1].sub! %r(/[^/]+$), '/'
-
-      command = "rsync #{ssh} --delete --info=progress2 -az #{from_and_to.join(" ")}"
-      Bard::Command.run! command, verbose: verbose
+    def initialize(path, from, to, verbose)
+      @path = path
+      @from = from
+      @to = to
+      @verbose = verbose
     end
 
-    def rsync_as_mediator
-      from_server = from.respond_to?(:server) ? from.server : from
-      to_server = to.respond_to?(:server) ? to.server : to
-
-      raise NotImplementedError if from_server.gateway || to_server.gateway || from_server.ssh_key || to_server.ssh_key
-
-      from_uri = from_server.ssh_uri
-      to_uri = to_server.ssh_uri
-
-      from_str = "-p#{from_uri.port || 22} #{from_uri.user}@#{from_uri.host}"
-      to_str = to.rsync_uri(path).sub(%r(/[^/]+$), '/')
+    def file
+      raise NotImplementedError
+    end
 
-      command = %(ssh -A #{from_str} 'rsync -e \"ssh -A -p#{to_uri.port || 22} -o StrictHostKeyChecking=no -o LogLevel=ERROR\" --delete --info=progress2 -az #{from.path}/#{path} #{to_str}')
-      Bard::Command.run! command, verbose: verbose
+    def dir
+      raise NotImplementedError
     end
   end
 end

data/lib/bard/plugins/data.rb

@@ -0,0 +1,56 @@
+require "bard/command"
+require "bard/copy"
+require "bard/plugins/ssh"
+require "bard/plugins/url"
+
+class Bard::CLI
+  option :from, default: "production"
+  option :to, default: "local"
+  desc "data --from=production --to=local", "copy database and assets from from to to"
+  def data
+    from = config[options[:from]]
+    to = config[options[:to]]
+
+    from.require_capability!(:ssh) unless from.key == :local
+    to.require_capability!(:ssh) unless to.key == :local
+
+    if to.key == :production
+      url = to.url
+      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}..."
+    Bard::Copy.file "db/data.sql.gz", from: from, 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}..."
+      Bard::Copy.dir path, from: from, to: to, verbose: true
+    end
+  rescue Bard::Command::Error => e
+    puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
+    exit 1
+  end
+end
+
+require "bard/config"
+
+class Bard::Config
+  def data(*paths)
+    if paths.empty?
+      @data_paths ||= []
+    else
+      @data_paths = paths
+    end
+  end
+end

data/lib/bard/{ci → plugins/deploy/ci}/github_actions.rb

@@ -1,6 +1,6 @@
 require "time"
-require "bard/github"
-require "bard/ci/runner"
+require "bard/plugins/github"
+require "bard/plugins/deploy/ci/runner"
 
 module Bard
   class CI

data/lib/bard/{ci → plugins/deploy/ci}/jenkins.rb

@@ -1,5 +1,5 @@
 require "json"
-require "bard/ci/runner"
+require "bard/plugins/deploy/ci/runner"
 require "bard/secrets"
 
 module Bard

data/lib/bard/{ci → plugins/deploy/ci}/local.rb

@@ -1,5 +1,5 @@
 require "tempfile"
-require "bard/ci/runner"
+require "bard/plugins/deploy/ci/runner"
 
 module Bard
   class CI

data/lib/bard/{ci → plugins/deploy/ci}/runner.rb

@@ -1,10 +1,10 @@
-require "bard/ci/state"
-require "bard/ci/retryable"
+require "bard/plugins/deploy/ci/state"
+require "bard/retryable"
 
 module Bard
   class CI
     class Runner < Struct.new(:project_name, :branch, :sha)
-      include Retryable
+      include Bard::Retryable
 
       @runners = {}
 

data/lib/bard/{ci.rb → plugins/deploy/ci.rb}

@@ -1,5 +1,5 @@
 require "forwardable"
-require "bard/ci/runner"
+require "bard/plugins/deploy/ci/runner"
 
 module Bard
   class CI

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

@@ -0,0 +1,27 @@
+require "bard/plugins/deploy/strategy"
+require "bard/copy"
+require "bard/plugins/ssh"
+
+module Bard
+  class DeployStrategy
+    class SSH < DeployStrategy
+      def deploy(clone: nil, branch: nil, force: false)
+        target.require_capability!(:ssh)
+
+        if clone
+          target.run! "git clone 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
+
+        target.run! "bin/setup"
+        target.run! "bard setup" if clone
+      end
+    end
+  end
+end

data/lib/bard/{deploy_strategy.rb → plugins/deploy/strategy.rb}

@@ -39,7 +39,7 @@ module Bard
       @target = target
     end
 
-    def deploy
+    def deploy(clone: nil, branch: nil, force: false)
       raise NotImplementedError, "Subclasses must implement #deploy"
     end
 
@@ -58,6 +58,3 @@ module Bard
     end
   end
 end
-
-# Auto-load all strategy files
-Dir[File.join(__dir__, "deploy_strategy", "*.rb")].each { |f| require f }

data/lib/bard/plugins/deploy.rb

@@ -0,0 +1,240 @@
+require "bard/plugins/ping"
+require "bard/plugins/git"
+require "bard/command"
+require "bard/plugins/deploy/strategy"
+require "bard/plugins/deploy/ssh_strategy"
+require "bard/plugins/deploy/ci"
+require "bard/plugins/deploy/ci/jenkins"
+require "bard/plugins/deploy/ci/local"
+require "bard/plugins/deploy/ci/github_actions"
+require "tmpdir"
+
+class Bard::CLI
+  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" && !Bard::Git.in_linked_worktree?
+        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 pull --ff-only origin master"
+      elsif Bard::Git.in_linked_worktree?
+        run! "git fetch origin master"
+      else
+        run! "git fetch origin master:master"
+      end
+    end
+
+    if `git remote` =~ /\bgithub\b/
+      run! "git push github"
+    end
+
+    to = options[:target].to_sym
+
+    target = config[to]
+    strategy = target.deploy_strategy_instance
+    if options[:clone]
+      strategy.deploy(clone: project_name)
+    else
+      strategy.deploy
+    end
+
+    puts green("Deploy Succeeded")
+
+    if branch != "master"
+      puts "Deleting branch: #{branch}"
+      run! "git push --delete origin #{branch}"
+
+      if branch == Bard::Git.current_branch && Bard::Git.in_linked_worktree?
+        worktree_path = Dir.pwd
+        main_checkout = File.dirname(File.expand_path(`git rev-parse --git-common-dir`.chomp))
+        Dir.chdir(main_checkout)
+        run! "git worktree remove #{worktree_path}"
+        run! "git branch -D #{branch}"
+        puts "Worktree removed. Run: cd #{main_checkout}"
+      else
+        if branch == Bard::Git.current_branch
+          run! "git checkout master"
+        end
+        run! "git branch -D #{branch}"
+      end
+    end
+
+    ping to
+  rescue Bard::Command::Error => e
+    puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
+    exit 1
+  end
+
+  desc "stage [branch=HEAD]", "pushes current branch, and stages it"
+  def stage(branch = Bard::Git.current_branch)
+    if config[:production] == config[:staging]
+      raise Thor::Error.new("`bard stage` is disabled until a production target is defined. Until then, please use `bard deploy` to deploy to the staging target.")
+    end
+
+    run! "git push -u origin #{branch}", verbose: true
+
+    target = config[:staging]
+    strategy = target.deploy_strategy_instance
+    strategy.deploy(branch: branch, force: true)
+
+    puts green("Stage Succeeded")
+
+    ping :staging
+  rescue Bard::Command::Error => e
+    puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
+    exit 1
+  end
+
+  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
+
+  option :from, default: "production"
+  option :to, default: "local"
+  desc "master_key --from=production --to=local", "copy master key from from to to"
+  def master_key
+    from = config[options[:from]]
+    to = config[options[:to]]
+    Bard::Copy.file "config/master.key", from: from, to: to
+  end
+end
+
+require "bard/config"
+
+class Bard::Config
+  def ci(system = nil)
+    if system.nil?
+      @ci_system
+    else
+      @ci_system = system
+    end
+  end
+end
+
+require "bard/target"
+
+class Bard::Target
+  def deploy_strategy
+    @deploy_strategy
+  end
+
+  def deploy_strategy_instance
+    strategy = @deploy_strategy
+    strategy ||= :ssh if has_capability?(:ssh)
+    raise "No deployment strategy configured for target #{key}" unless strategy
+
+    strategy_class = Bard::DeployStrategy[strategy]
+    raise "Unknown deployment strategy: #{strategy}" unless strategy_class
+
+    strategy_class.new(self)
+  end
+
+  def strategy_options(strategy_name)
+    @strategy_options_hash ||= {}
+    @strategy_options_hash[strategy_name] || {}
+  end
+end

data/lib/bard/{git.rb → plugins/git.rb}

@@ -21,12 +21,15 @@ module Bard
 
     def sha_of ref
       sha = `git rev-parse #{ref} 2>/dev/null`.chomp
-      return sha if command_succeeded?
+      return sha if $?.success?
       nil # Branch doesn't exist
     end
 
-    def command_succeeded?
-      $?.success?
+    def in_linked_worktree?
+      git_dir = `git rev-parse --git-dir 2>/dev/null`.chomp
+      common_dir = `git rev-parse --git-common-dir 2>/dev/null`.chomp
+      return false if git_dir.empty? || common_dir.empty?
+      File.expand_path(git_dir) != File.expand_path(common_dir)
     end
   end
 end

data/lib/bard/{github.rb → plugins/github.rb}

@@ -2,12 +2,12 @@ require "net/http"
 require "json"
 require "base64"
 require "rbnacl"
-require "bard/ci/retryable"
+require "bard/retryable"
 require "bard/secrets"
 
 module Bard
   class Github < Struct.new(:project_name)
-    include CI::Retryable
+    include Retryable
 
     def initialize(project_name, api_key: nil)
       super(project_name)

data/lib/bard/{deploy_strategy/github_pages.rb → plugins/github_pages/strategy.rb}

@@ -1,5 +1,5 @@
-require "bard/deploy_strategy"
-require "bard/git"
+require "bard/plugins/deploy/strategy"
+require "bard/plugins/git"
 require "fileutils"
 require "uri"
 
@@ -11,8 +11,7 @@ module Bard
         @url = url || target.github_pages
         @options = options
 
-        # Auto-configure ping URL if provided
-        target.ping(url) if url
+        target.url(url) if url
       end
 
       def deploy

data/lib/bard/plugins/github_pages.rb

@@ -1,28 +1,24 @@
-require "bard/plugin"
+require "bard/plugins/github_pages/strategy"
+require "bard/config"
+require "bard/target"
 
-# Load the deploy strategy (auto-registers via inherited hook)
-require "bard/deploy_strategy/github_pages"
-
-Bard::Plugin.register :github_pages do
-  # Config DSL: github_pages "url" sets up a production target
-  config_method :github_pages do |url|
-    urls = []
+class Bard::Config
+  def github_pages(url)
     uri = url.start_with?("http") ? URI.parse(url) : URI.parse("https://#{url}")
     hostname = uri.hostname.sub(/^www\./, "")
-    urls = [hostname]
-    urls << "www.#{hostname}" if hostname.count(".") < 2
 
+    remove_target :production
     target :production do
       github_pages url
-      ssh false
-      ping(*urls) if urls.any?
+      url(hostname) if hostname
     end
 
-    backup false
+    backup(false) if respond_to?(:backup)
   end
+end
 
-  # Target DSL: github_pages sets deploy strategy
-  target_method :github_pages do |url = nil|
+class Bard::Target
+  def github_pages(url = nil)
     if url.nil?
       @github_pages_url
     else

data/lib/bard/plugins/hurt.rb

@@ -1,5 +1,13 @@
-require "bard/plugin"
-
-Bard::Plugin.register :hurt do
-  cli "Bard::CLI::Hurt", require: "bard/cli/hurt"
+class Bard::CLI
+  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/{install_files → lib/bard/plugins/install}/.github/dependabot.yml

@@ -4,6 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    cooldown:
+      default-days: 7
     allow:
       - dependency-type: "all"
     rebase-strategy: "disabled"
@@ -14,4 +16,3 @@ updates:
         update-types:
           - "minor"
           - "patch"
-

data/{install_files → lib/bard/plugins/install}/.github/workflows/cache-ci.yml

@@ -6,7 +6,7 @@ on:
     - cron: '0 0 */3 * *'
 jobs:
   build_ruby_cache:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v3

data/{install_files → lib/bard/plugins/install}/.github/workflows/ci.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04${{ github.actor != 'dependabot[bot]' && '-16core' || '' }}
+    runs-on: ubuntu-24.04${{ github.actor != 'dependabot[bot]' && '-8core' || '' }}
     timeout-minutes: 30
     env:
       RAILS_ENV: test
@@ -47,7 +47,7 @@ jobs:
 
   autodeploy-dependabot-prs:
     needs: test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     if: github.actor == 'dependabot[bot]'
     steps: