bard 1.8.0 → 1.9.0

data/lib/bard/ci/jenkins.rb

@@ -1,12 +1,28 @@
 require "json"
 require "bard/ci/runner"
+require "bard/secrets"
 
 module Bard
   class CI
     class Jenkins < Runner
-
       def exists?
-        `curl -s -I #{ci_host}/` =~ /\b200 OK\b/
+        `curl -s -I #{ci_host}/` =~ /\b200 OK\b/ or create!
+      end
+
+      private def create!
+        git_url = `git remote get-url origin`.strip
+        config = JOB_CONFIG_XML.sub("GIT_URL", git_url)
+        if File.exist?("config/master.key")
+          master_key = File.read("config/master.key").strip
+          master_key_step = <<~XML.chomp
+            <hudson.tasks.Shell>
+                  <command>echo #{master_key} > config/master.key</command>
+                </hudson.tasks.Shell>
+
+          XML
+          config = config.sub("<builders>\n", "<builders>\n        #{master_key_step}")
+        end
+        `curl -s -X POST "http://#{auth}@ci.botandrose.com/createItem?name=#{project_name}" -H "Content-Type: application/xml" -d '#{config}'`
       end
 
       def console
@@ -23,7 +39,7 @@ module Bard
       end
 
       def start
-        command = "curl -s -I -X POST -L '#{ci_host}/buildWithParameters?GIT_REF=#{sha}'"
+        command = "curl -s -I -X POST -L '#{ci_host}/buildWithParameters?GIT_REF=#{branch}'"
         output = `#{command}`
         @queueId = output[%r{Location: .+/queue/item/(\d+)/}, 1].to_i
       end
@@ -31,7 +47,7 @@ module Bard
       def building?
         retry_with_backoff do
           self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
-          raise "Blank response from CI" if last_response.blank?
+          raise "Blank response from CI" if last_response.empty?
         end
         last_response.include? '"building":true'
       end
@@ -61,9 +77,9 @@ module Bard
       private
 
       def get_last_time_elapsed
-        retry_with_backoff do
+        response = retry_with_backoff do
           response = `curl -s #{ci_host}/lastStableBuild/api/xml`
-          raise "Blank response from CI" if response.blank?
+          raise "Blank response from CI" if response.empty?
           response
         end
         response.match(/<duration>(\d+)<\/duration>/)
@@ -74,7 +90,7 @@ module Bard
       end
 
       def auth
-        "botandrose:11cc2ba6ef2e43fbfbedc1f466724f6290"
+        @auth ||= "#{Bard::Secrets.fetch("jenkins-user")}:#{Bard::Secrets.fetch("jenkins-token")}"
       end
 
       def ci_host
@@ -85,8 +101,10 @@ module Bard
         retry_with_backoff do
           command = "curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'"
           output = `#{command}`
-          raise "Blank response from CI" if output.blank?
-          JSON.parse(output)["builds"][0]["queueId"] == @queueId
+          raise "Blank response from CI" if output.empty?
+          builds = JSON.parse(output)["builds"]
+          raise "Build not found in builds list" if builds.empty?
+          builds.first["queueId"] == @queueId
         end
       end
 
@@ -94,11 +112,64 @@ module Bard
         @job_id ||= begin
           retry_with_backoff do
             output = `curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'`
-            raise "Blank response from CI" if output.blank?
-            output[/"number":(\d+),"queueId":#{@queueId}\b/, 1].to_i
+            raise "Blank response from CI" if output.empty?
+            builds = JSON.parse(output)["builds"]
+            build = builds.find { |b| b["queueId"] == @queueId }
+            build["number"]
           end
         end
       end
+      JOB_CONFIG_XML = <<~XML
+        <?xml version="1.0" encoding="UTF-8"?>
+        <project>
+          <actions/>
+          <description></description>
+          <keepDependencies>false</keepDependencies>
+          <properties>
+            <hudson.model.ParametersDefinitionProperty>
+              <parameterDefinitions>
+                <hudson.model.StringParameterDefinition>
+                  <name>GIT_REF</name>
+                  <description></description>
+                  <defaultValue>master</defaultValue>
+                </hudson.model.StringParameterDefinition>
+              </parameterDefinitions>
+            </hudson.model.ParametersDefinitionProperty>
+          </properties>
+          <scm class="hudson.plugins.git.GitSCM" plugin="git@3.3.0">
+            <configVersion>2</configVersion>
+            <userRemoteConfigs>
+              <hudson.plugins.git.UserRemoteConfig>
+                <url>GIT_URL</url>
+              </hudson.plugins.git.UserRemoteConfig>
+            </userRemoteConfigs>
+            <branches>
+              <hudson.plugins.git.BranchSpec>
+                <name>$GIT_REF</name>
+              </hudson.plugins.git.BranchSpec>
+            </branches>
+            <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+            <submoduleCfg class="list"/>
+            <extensions/>
+          </scm>
+          <canRoam>true</canRoam>
+          <disabled>false</disabled>
+          <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+          <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+          <triggers/>
+          <concurrentBuild>false</concurrentBuild>
+          <builders>
+            <hudson.tasks.Shell>
+              <command>bash -l -c bin/setup</command>
+            </hudson.tasks.Shell>
+            <hudson.tasks.Shell>
+              <command>bash -l -c bin/ci</command>
+            </hudson.tasks.Shell>
+          </builders>
+          <publishers/>
+          <buildWrappers/>
+        </project>
+      XML
     end
   end
 end

data/lib/bard/ci/local.rb

@@ -1,10 +1,9 @@
-require "open3"
+require "tempfile"
 require "bard/ci/runner"
 
 module Bard
   class CI
     class Local < Runner
-
       def exists?
         true
       end
@@ -16,7 +15,8 @@ module Bard
       protected
 
       def start
-        @stdin, @stdout_and_stderr, @wait_thread = Open3.popen2e("CLEAN=true bin/rake ci")
+        @output_file = Tempfile.new("bard-ci")
+        @wait_thread = Process.detach(spawn("CLEAN=true bin/rake ci", [:out, :err] => @output_file))
       end
 
       def building?
@@ -47,9 +47,9 @@ module Bard
           sleep(2)
         end
 
-        @stdin.close
-        @console = @stdout_and_stderr.read
-        @stdout_and_stderr.close
+        @output_file.rewind
+        @console = @output_file.read
+        @output_file.close!
       end
     end
   end

data/lib/bard/ci/runner.rb

@@ -6,12 +6,43 @@ module Bard
     class Runner < Struct.new(:project_name, :branch, :sha)
       include Retryable
 
+      @runners = {}
+
+      class << self
+        attr_reader :runners
+
+        def inherited(subclass)
+          super
+          name = extract_runner_name(subclass)
+          runners[name] = subclass if name
+        end
+
+        def [](name)
+          runners[name.to_sym]
+        end
+
+        # Returns the last registered runner (most recently loaded wins)
+        def default
+          runners.values.last
+        end
+
+        private
+
+        def extract_runner_name(klass)
+          klass.name&.split("::")&.last
+            &.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+            &.gsub(/([a-z\d])([A-Z])/, '\1_\2')
+            &.downcase
+            &.to_sym
+        end
+      end
+
       def run
         start
         @start_time = Time.new.to_i
         @last_time_elapsed = get_last_time_elapsed
         save_state
-        wait_until_started if respond_to?(:wait_until_started)
+        wait_until_started
 
         poll_until_complete { |elapsed, last_time| yield elapsed, last_time }
 
@@ -62,6 +93,9 @@ module Bard
         raise NotImplementedError, "#{self.class}#success? not implemented"
       end
 
+      def wait_until_started
+      end
+
       def get_last_time_elapsed
         nil
       end

data/lib/bard/ci.rb

@@ -1,11 +1,12 @@
 require "forwardable"
+require "bard/ci/runner"
 
 module Bard
   class CI
-    def initialize project_name, branch, local: false
+    def initialize(project_name, branch, runner_name: nil)
       @project_name = project_name
       @branch = branch
-      @local = !!local
+      @runner_name = runner_name
     end
 
     extend Forwardable
@@ -13,18 +14,6 @@ module Bard
 
     private
 
-    def local?
-      @local
-    end
-
-    def github_actions?
-      File.exist?(".github/workflows/ci.yml")
-    end
-
-    def jenkins?
-      !local? && !github_actions?
-    end
-
     def runner
       @runner ||= choose_runner_class.new(@project_name, @branch, sha)
     end
@@ -34,15 +23,14 @@ module Bard
     end
 
     def choose_runner_class
-      if local?
-        require_relative "./ci/local"
-        Local
-      elsif github_actions?
-        require_relative "./ci/github_actions"
-        GithubActions
-      elsif jenkins?
-        require_relative "./ci/jenkins"
-        Jenkins
+      if @runner_name
+        runner_class = Runner[@runner_name]
+        raise "Unknown CI runner: #{@runner_name}" unless runner_class
+        runner_class
+      else
+        runner_class = Runner.default
+        raise "No CI runner available" unless runner_class
+        runner_class
       end
     end
   end

data/lib/bard/cli/ci.rb

@@ -6,56 +6,63 @@ module Bard::CLI::CI
     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
-        ci = Bard::CI.new(project_name, branch, local: options["local-ci"])
-        if ci.exists?
-          return puts ci.status if options["status"]
+        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
 
-          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}..."
+        return puts ci.status if options["status"]
 
-            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
+        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}..."
 
-          if success
-            puts
-            puts "Continuous integration: success!"
-          else
-            puts
-            puts ci.console
-            puts red("Automated tests failed!")
-            exit 1
+          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 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."
+          puts
+          puts ci.console
+          puts red("Automated tests failed!")
           exit 1
         end
       end

data/lib/bard/cli/deploy.rb

@@ -1,6 +1,7 @@
 require "bard/git"
 require "bard/command"
 require "bard/github_pages"
+require "tmpdir"
 
 module Bard::CLI::Deploy
   def self.included mod
@@ -8,37 +9,68 @@ module Bard::CLI::Deploy
 
       option :"skip-ci", type: :boolean
       option :"local-ci", type: :boolean
+      option :ci, type: :string
       option :clone, type: :boolean
-      desc "deploy [TO=production]", "checks that current branch is a ff with master, checks with ci, merges into master, deploys to target, and then deletes branch."
-      def deploy to=:production
-        branch = Bard::Git.current_branch
+      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") unless options["skip-ci"]
+          invoke :ci, [branch], options.slice("local-ci", "ci") unless options["skip-ci"]
 
         else
-          run! "git fetch origin master:master"
+          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..."
-            run! "git rebase origin/master"
+            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") unless options["skip-ci"]
+          invoke :ci, [branch], options.slice("local-ci", "ci") unless options["skip-ci"]
 
           run! "git push origin #{branch}:master"
-          run! "git fetch origin master: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

data/lib/bard/cli/hurt.rb

@@ -1,20 +1,15 @@
-module Bard::CLI::Hurt
-  def self.included mod
-    mod.class_eval do
+require "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
+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,16 +1,11 @@
-module Bard::CLI::Install
-  def self.included mod
-    mod.class_eval do
+require "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"))
+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
+    system "cp -R #{install_files_path}/* bin/"
+    system "cp -R #{install_files_path}/.github ./"
   end
 end
-

data/lib/bard/cli/open.rb

@@ -1,22 +1,18 @@
-module Bard::CLI::Open
-  def self.included mod
-    mod.class_eval do
+require "bard/cli/command"
 
-      desc "open [server=production]", "opens the url in the web browser."
-      def open server=:production
-        exec "xdg-open #{open_url server}"
-      end
+class Bard::CLI::Open < Bard::CLI::Command
+  desc "open [server=production]", "opens the url in the web browser."
+  def open server=:production
+    exec "xdg-open #{open_url server}"
+  end
 
-      private
+  private
 
-      def open_url server
-        if server.to_sym == :ci
-          "https://github.com/botandrosedesign/#{project_name}/actions/workflows/ci.yml"
-        else
-          config[server].ping.first
-        end
-      end
+  def open_url server
+    if server.to_sym == :ci
+      "https://github.com/botandrosedesign/#{project_name}/actions/workflows/ci.yml"
+    else
+      config[server].ping.first
     end
   end
 end
-

data/lib/bard/cli/ping.rb

@@ -1,18 +1,12 @@
+require "bard/cli/command"
 require "bard/ping"
 
-module Bard::CLI::Ping
-  def self.included mod
-    mod.class_eval do
-
-      desc "ping [server=production]", "hits the server over http to verify that its up."
-      def ping server=:production
-        server = config[server]
-        down_urls = Bard::Ping.call(config[server])
-        down_urls.each { |url| puts "#{url} is down!" }
-        exit 1 if down_urls.any?
-      end
-
-    end
+class Bard::CLI::Ping < Bard::CLI::Command
+  desc "ping [server=production]", "hits the server over http to verify that its up."
+  def ping server=:production
+    server = config[server]
+    down_urls = Bard::Ping.call(config[server])
+    down_urls.each { |url| puts "#{url} is down!" }
+    exit 1 if down_urls.any?
   end
 end
-

data/lib/bard/cli/run.rb

@@ -9,10 +9,12 @@ module Bard::CLI::Run
       Thor::THOR_RESERVED_WORDS -= ["run"]
       $VERBOSE = original_verbose
 
-      desc "run <command>", "run the given command on production"
+      option :target, type: :string, default: "production"
+      option :home, type: :boolean
+      desc "run <command>", "run the given command on the specified target"
       def run *args
-        server = config[:production]
-        server.run! *args.join(" "), verbose: true
+        target = config[options[:target].to_sym]
+        target.run! *args.join(" "), verbose: true, home: options[:home]
       rescue Bard::Command::Error => e
         puts red("!!! ") + "Running command failed: #{yellow(e.message)}"
         exit 1

data/lib/bard/cli/vim.rb

@@ -1,13 +1,8 @@
-module Bard::CLI::Vim
-  def self.included mod
-    mod.class_eval do
+require "bard/cli/command"
 
-      desc "vim [branch=master]", "open all files that have changed since master"
-      def vim branch="master"
-        exec "vim -p `(git diff #{branch} --name-only; git ls-files --others --exclude-standard) | grep -v '^app/assets/images/' | grep -v '^app/assets/stylesheets/' | while read f; do [ -f \"$f\" ] && ! file -b \"$f\" | grep -q \"binary\" && echo \"$f\"; done | tac`"
-      end
-
-    end
+class Bard::CLI::Vim < Bard::CLI::Command
+  desc "vim [branch=master]", "open all files that have changed since master"
+  def vim branch="master"
+    exec "vim -p `(git diff #{branch} --name-only; git ls-files --others --exclude-standard) | grep -v '^app/assets/images/' | grep -v '^app/assets/stylesheets/' | while read f; do [ -f \"$f\" ] && ! file -b \"$f\" | grep -q \"binary\" && echo \"$f\"; done | tac`"
   end
 end
-