bard 1.4.10 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318e587da8f359d8637e0bc1ad4c2c8cdb40fae0a8abd450e7d294a6d0428c82
-  data.tar.gz: b35fb1f00685c2549c5be7795be76c6036ac233f93ed0e2db0ea1e358167143f
+  metadata.gz: d0f636850eb0b2f55f75b125dfef31c7bea2bfc0d9927fbb9714431c32694369
+  data.tar.gz: 66c491d452f1eda598647bfced569674d367d79289d8203b1fefc145e524c6df
 SHA512:
-  metadata.gz: 77dd9f076659596e8472012758b2fe8c14ed2345ecfdc66b1d6ce726bc698c427c8c76adac35204f09e31d357755579c2a3d7644fdd79ece28175bbcf7e52e07
-  data.tar.gz: a1d4e0abd8bb223b7987d8961ea3b3de3a68e4113f42c56cd48024c8ecc57dc37104f8340b78168608e53dfa44589fc17305b46f7668db4af7b1058a678e2a16
+  metadata.gz: c87fd3c0723f0be35ca017d74348e7c3e711aa36a7b0ad1042ca9b1f09c0a7f675499eabc963a96d7d474693dc96adc8e887e0e2e1067efd291f379d801c9b87
+  data.tar.gz: 2c0a7de1674bc3db706ea4990549393c0a4fe8cc289f1a78e8171650e2343b9140158bb2c07796787e1206df40af1c0ac679118436edcaf0c7cb8e9a03f9256b

data/lib/bard/ci/github_actions.rb

@@ -1,23 +1,10 @@
 require "time"
 require "bard/github"
+require "bard/ci/runner"
 
 module Bard
   class CI
-    class GithubActions < Struct.new(:project_name, :branch, :sha)
-      def run
-        last_time_elapsed = api.last_successful_run&.time_elapsed
-        @run = api.create_run!(branch)
-
-        start_time = Time.new.to_i
-        while @run.building?
-          elapsed_time = Time.new.to_i - start_time
-          yield elapsed_time, last_time_elapsed
-          sleep(2)
-          @run = api.find_run(@run.id)
-        end
-
-        @run.success?
-      end
+    class GithubActions < Runner
 
       def exists?
         true
@@ -40,6 +27,50 @@ module Bard
         end
       end
 
+      protected
+
+      def start
+        @run = api.create_run!(branch)
+      end
+
+      def get_last_time_elapsed
+        api.last_successful_run&.time_elapsed
+      end
+
+      def building?
+        @run.building?
+      end
+
+      def success?
+        @run.success?
+      end
+
+      def get_state_data
+        {
+          "project_name" => project_name,
+          "branch" => branch,
+          "run_id" => @run.id,
+          "start_time" => @start_time,
+          "last_time_elapsed" => @last_time_elapsed
+        }
+      end
+
+      def restore_state(data)
+        @run = api.find_run(data["run_id"])
+        @start_time = data["start_time"]
+        @last_time_elapsed = data["last_time_elapsed"]
+      end
+
+      def poll_until_complete
+        while @run.building?
+          elapsed_time = Time.new.to_i - @start_time
+          yield elapsed_time, @last_time_elapsed
+          save_state
+          sleep(2)
+          @run = api.find_run(@run.id)
+        end
+      end
+
       private
 
       def api

data/lib/bard/ci/jenkins.rb

@@ -1,22 +1,9 @@
 require "json"
+require "bard/ci/runner"
 
 module Bard
   class CI
-    class Jenkins < Struct.new(:project_name, :branch, :sha)
-      def run
-        last_time_elapsed = get_last_time_elapsed
-        start
-        sleep(2) until started?
-
-        start_time = Time.new.to_i
-        while building?
-          elapsed_time = Time.new.to_i - start_time
-          yield elapsed_time, last_time_elapsed
-          sleep(2)
-        end
-
-        success?
-      end
+    class Jenkins < Runner
 
       def exists?
         `curl -s -I #{ci_host}/` =~ /\b200 OK\b/
@@ -29,12 +16,61 @@ module Bard
 
       attr_accessor :last_response
 
+      protected
+
+      def wait_until_started
+        sleep(2) until started?
+      end
+
+      def start
+        command = "curl -s -I -X POST -L '#{ci_host}/buildWithParameters?GIT_REF=#{sha}'"
+        output = `#{command}`
+        @queueId = output[%r{Location: .+/queue/item/(\d+)/}, 1].to_i
+      end
+
+      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?
+        end
+        last_response.include? '"building":true'
+      end
+
+      def success?
+        last_response.include? '"result":"SUCCESS"'
+      end
+
+      def get_state_data
+        {
+          "project_name" => project_name,
+          "branch" => branch,
+          "queue_id" => @queueId,
+          "job_id" => @job_id,
+          "start_time" => @start_time,
+          "last_time_elapsed" => @last_time_elapsed
+        }
+      end
+
+      def restore_state(data)
+        @queueId = data["queue_id"]
+        @job_id = data["job_id"]
+        @start_time = data["start_time"]
+        @last_time_elapsed = data["last_time_elapsed"]
+      end
+
       private
 
       def get_last_time_elapsed
-        response = `curl -s #{ci_host}/lastStableBuild/api/xml`
+        retry_with_backoff do
+          response = `curl -s #{ci_host}/lastStableBuild/api/xml`
+          raise "Blank response from CI" if response.blank?
+          response
+        end
         response.match(/<duration>(\d+)<\/duration>/)
         $1 ? $1.to_i / 1000 : nil
+      rescue => e
+        puts "  Warning: Could not get last build duration: #{e.message}"
+        nil
       end
 
       def auth
@@ -45,39 +81,23 @@ module Bard
         "http://#{auth}@ci.botandrose.com/job/#{project_name}"
       end
 
-      def start
-        command = "curl -s -I -X POST -L '#{ci_host}/buildWithParameters?GIT_REF=#{sha}'"
-        output = `#{command}`
-        @queueId = output[%r{Location: .+/queue/item/(\d+)/}, 1].to_i
-      end
-
       def started?
-        command = "curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'"
-        output = `#{command}`
-        JSON.parse(output)["builds"][0]["queueId"] == @queueId
+        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
+        end
       end
 
       def job_id
         @job_id ||= begin
-          output = `curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'`
-          output[/"number":(\d+),"queueId":#{@queueId}\b/, 1].to_i
-        end
-      end
-
-      def building?
-        self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
-        if last_response.blank?
-          sleep(2) # retry
-          self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
-          if last_response.blank?
-            raise "Blank response from CI twice in a row. Aborting!"
+          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
           end
         end
-        last_response.include? '"building":true'
-      end
-
-      def success?
-        last_response.include? '"result":"SUCCESS"'
       end
     end
   end

data/lib/bard/ci/local.rb

@@ -1,24 +1,9 @@
 require "open3"
+require "bard/ci/runner"
 
 module Bard
   class CI
-    class Local < Struct.new(:project_name, :branch, :sha)
-      def run
-        start
-
-        start_time = Time.new.to_i
-        while building?
-          elapsed_time = Time.new.to_i - start_time
-          yield elapsed_time, nil
-          sleep(2)
-        end
-
-        @stdin.close
-        @console = @stdout_and_stderr.read
-        @stdout_and_stderr.close
-
-        success?
-      end
+    class Local < Runner
 
       def exists?
         true
@@ -28,7 +13,7 @@ module Bard
         @console
       end
 
-      private
+      protected
 
       def start
         @stdin, @stdout_and_stderr, @wait_thread = Open3.popen2e("CLEAN=true bin/rake ci")
@@ -41,6 +26,31 @@ module Bard
       def success?
         @wait_thread.value.success?
       end
+
+      def get_state_data
+        {
+          "project_name" => project_name,
+          "branch" => branch,
+          "start_time" => @start_time
+        }
+      end
+
+      def restore_state(data)
+        raise "Cannot resume local CI: process is no longer running. Start a new build with 'bard ci'."
+      end
+
+      def poll_until_complete
+        while building?
+          elapsed_time = Time.new.to_i - @start_time
+          yield elapsed_time, nil
+          save_state
+          sleep(2)
+        end
+
+        @stdin.close
+        @console = @stdout_and_stderr.read
+        @stdout_and_stderr.close
+      end
     end
   end
 end

data/lib/bard/ci/retryable.rb

@@ -0,0 +1,27 @@
+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/ci/runner.rb

@@ -0,0 +1,78 @@
+require "bard/ci/state"
+require "bard/ci/retryable"
+
+module Bard
+  class CI
+    class Runner < Struct.new(:project_name, :branch, :sha)
+      include Retryable
+
+      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)
+
+        poll_until_complete { |elapsed, last_time| yield elapsed, last_time }
+
+        state.delete
+        success?
+      end
+
+      def resume
+        saved_state = state.load
+        raise "No saved CI state found for #{project_name}. Start a new build with 'bard ci'." if saved_state.nil?
+
+        restore_state(saved_state)
+        poll_until_complete { |elapsed, last_time| yield elapsed, last_time }
+
+        state.delete
+        success?
+      end
+
+      protected
+
+      def poll_until_complete
+        while building?
+          elapsed_time = Time.new.to_i - @start_time
+          yield elapsed_time, @last_time_elapsed
+          save_state
+          sleep(2)
+        end
+      end
+
+      def save_state
+        state.save(get_state_data)
+      end
+
+      def state
+        @state ||= State.new(project_name)
+      end
+
+      # Abstract methods - override in subclasses
+      def start
+        raise NotImplementedError, "#{self.class}#start not implemented"
+      end
+
+      def building?
+        raise NotImplementedError, "#{self.class}#building? not implemented"
+      end
+
+      def success?
+        raise NotImplementedError, "#{self.class}#success? not implemented"
+      end
+
+      def get_last_time_elapsed
+        nil
+      end
+
+      def get_state_data
+        raise NotImplementedError, "#{self.class}#get_state_data not implemented"
+      end
+
+      def restore_state(data)
+        raise NotImplementedError, "#{self.class}#restore_state not implemented"
+      end
+    end
+  end
+end

data/lib/bard/ci/state.rb

@@ -0,0 +1,40 @@
+require "json"
+require "fileutils"
+
+module Bard
+  class CI
+    class State
+      def initialize project_name
+        @project_name = project_name
+      end
+
+      def save data
+        FileUtils.mkdir_p(state_dir)
+        File.write(state_file, JSON.generate(data))
+      end
+
+      def load
+        return nil unless File.exist?(state_file)
+        JSON.parse(File.read(state_file))
+      end
+
+      def delete
+        File.delete(state_file) if File.exist?(state_file)
+      end
+
+      def exists?
+        File.exist?(state_file)
+      end
+
+      private
+
+      def state_dir
+        File.join(Dir.pwd, "tmp", "bard", "ci")
+      end
+
+      def state_file
+        File.join(state_dir, "#{@project_name}.json")
+      end
+    end
+  end
+end

data/lib/bard/ci.rb

@@ -9,7 +9,7 @@ module Bard
     end
 
     extend Forwardable
-    delegate [:run, :exists?, :console, :status] => :runner
+    delegate [:run, :resume, :exists?, :console, :status] => :runner
 
     private
 

data/lib/bard/cli/ci.rb

@@ -7,30 +7,45 @@ module Bard::CLI::CI
 
       option :"local-ci", type: :boolean
       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"]
 
-          puts "Continuous integration: starting build on #{branch}..."
+          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"
+            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
-            print "\x08" * output.length
-            print output
-            $stdout.flush
           end
 
           if success
             puts
             puts "Continuous integration: success!"
-            puts "Deploying..."
           else
             puts
             puts ci.console

data/lib/bard/github.rb

@@ -2,9 +2,11 @@ require "net/http"
 require "json"
 require "base64"
 require "rbnacl"
+require "bard/ci/retryable"
 
 module Bard
   class Github < Struct.new(:project_name)
+    include CI::Retryable
     def get path, params={}
       request(path) do |uri|
         uri.query = URI.encode_www_form(params)
@@ -117,26 +119,28 @@ module Bard
         end
       end
 
-      req = nil
-      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-        req = block.call(uri)
-        req["Accept"] = "application/vnd.github+json"
-        req["Authorization"] = "Bearer #{github_apikey}"
-        req["X-GitHub-Api-Version"] = "2022-11-28"
-        http.request(req)
-      end
+      retry_with_backoff do
+        req = nil
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+          req = block.call(uri)
+          req["Accept"] = "application/vnd.github+json"
+          req["Authorization"] = "Bearer #{github_apikey}"
+          req["X-GitHub-Api-Version"] = "2022-11-28"
+          http.request(req)
+        end
 
-      case response
-      when Net::HTTPRedirection then
-        Net::HTTP.get(URI(response["Location"]))
-      when Net::HTTPSuccess then
-        if response["Content-Type"].to_s.include?("/json")
-          JSON.load(response.body)
+        case response
+        when Net::HTTPRedirection then
+          Net::HTTP.get(URI(response["Location"]))
+        when Net::HTTPSuccess then
+          if response["Content-Type"].to_s.include?("/json")
+            JSON.load(response.body)
+          else
+            response.body
+          end
         else
-          response.body
+          raise [req.method, req.uri, req.to_hash, response, response.body].inspect
         end
-      else
-        raise [req.method, req.uri, req.to_hash, response, response.body].inspect
       end
     end
   end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.4.10"
+  VERSION = "1.5.0"
 end
 

data/spec/bard/cli/ci_spec.rb

@@ -61,7 +61,6 @@ describe Bard::CLI::CI do
 
         expect(cli).to receive(:puts).with("Continuous integration: starting build on feature-branch...")
         expect(cli).to receive(:puts).with("Continuous integration: success!")
-        expect(cli).to receive(:puts).with("Deploying...")
 
         cli.ci
       end
@@ -135,5 +134,30 @@ describe Bard::CLI::CI do
         cli.ci
       end
     end
+
+    context "with resume option" do
+      it "calls resume instead of run" do
+        allow(cli).to receive(:options).and_return({ "resume" => true })
+        allow(ci_runner).to receive(:exists?).and_return(true)
+        allow(ci_runner).to receive(:resume).and_yield(30, 60).and_return(true)
+
+        expect(cli).to receive(:puts).with("Continuous integration: resuming build...")
+        expect(cli).to receive(:puts).with("Continuous integration: success!")
+        expect(ci_runner).not_to receive(:run)
+
+        cli.ci
+      end
+
+      it "displays progress when resuming" do
+        allow(cli).to receive(:options).and_return({ "resume" => true })
+        allow(ci_runner).to receive(:exists?).and_return(true)
+        allow(ci_runner).to receive(:resume).and_yield(30, 60).and_return(true)
+
+        expect(cli).to receive(:print).with("\x08" * "  Estimated completion: 50%".length)
+        expect(cli).to receive(:print).with("  Estimated completion: 50%")
+
+        cli.ci
+      end
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.5.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -164,6 +164,9 @@ files:
 - 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