bard 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 175897a8e48c72c6af96276c46f3f2507f2f4cc1d31e0de2de9b8d16048a051c
-  data.tar.gz: 4e315cf487080f1b819b4d25d23bfb5671785926b13dadc89202c12d30e4ba1f
+  metadata.gz: 68411db6b0d930d06cc7708835eaa23d10cbedc42eb905bec4065c47834f488a
+  data.tar.gz: e2488bd0f625e3aa7a87aa6f3334178dbdff49a19a7c020d2424b073dea3f999
 SHA512:
-  metadata.gz: 1af07ec394121b0f6e283708d372243fd43cda458f014dacf6e97f3f67a27ad618b99e4fad5e8c74e279873bdee68e5af16705b0018016858ca75b2626e97106
-  data.tar.gz: 72e2df39e321de356e01046e4b66e0ce378ad116643c777023a5b6a80a65af2d46544a36ab9831dd8df27a0be236841bc393e76cf5cb6073c83a3a887177de2e
+  metadata.gz: 1cc1f667c31694e70f54621b13d3871e74c011f4fd25ab80b66b6caa325fc89d878f4f4199d4adec314b599c4c9e8162ee12dd3e5830b255e9cfcde1c9504e06
+  data.tar.gz: 9f9be575ee8baa54d8f175c6a4c9227daa22b360343a1143736168d68b5f91697840819f9ed1f165b07e2cea2660c92bce2e466b72e87bf236f459cff304fed5

data/lib/bard/github.rb

@@ -7,6 +7,12 @@ require "bard/ci/retryable"
 module Bard
   class Github < Struct.new(:project_name)
     include CI::Retryable
+
+    def initialize(project_name, api_key: nil)
+      super(project_name)
+      @api_key = api_key
+    end
+
     def get path, params={}
       request(path) do |uri|
         uri.query = URI.encode_www_form(params)
@@ -100,8 +106,8 @@ module Bard
 
     private
 
-    def github_apikey
-      @github_apikey ||= begin
+    def api_key
+      @api_key ||= begin
         raw = `git ls-remote -t git@github.com:botandrosedesign/secrets`
         raw[/github-apikey\|(.+)$/, 1]
       end
@@ -124,7 +130,7 @@ module Bard
         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["Authorization"] = "Bearer #{api_key}"
           req["X-GitHub-Api-Version"] = "2022-11-28"
           http.request(req)
         end

data/lib/bard/ping.rb

@@ -8,16 +8,26 @@ module Bard
     end
 
     def call
-      server.ping.reject do |url|
-        response = get_response_with_redirect(url) rescue nil
-        response.is_a?(Net::HTTPSuccess)
-      end
+      server.ping.reject { |url| reachable?(url) }
     end
 
     private
 
+    def reachable?(url)
+      attempts = 0
+      begin
+        attempts += 1
+        response = get_response_with_redirect(url)
+        response.is_a?(Net::HTTPSuccess)
+      rescue StandardError
+        retry if attempts < 2
+        false
+      end
+    end
+
     def get_response_with_redirect uri_str, limit=5
-      response = Net::HTTP.get_response(URI(uri_str))
+      uri = URI(uri_str)
+      response = http_get(uri)
 
       case response
       when Net::HTTPRedirection
@@ -25,11 +35,32 @@ module Bard
           puts "too many HTTP redirects"
           response
         else
-          get_response_with_redirect(response["location"], limit - 1)
+          location = response["location"]
+          return response unless location
+
+          next_uri = begin
+            uri + location
+          rescue URI::InvalidURIError
+            URI(location)
+          end
+
+          get_response_with_redirect(next_uri, limit - 1)
         end
       else
         response
       end
     end
+
+    def http_get(uri)
+      Net::HTTP.start(
+        uri.host,
+        uri.port,
+        use_ssl: uri.scheme == "https",
+        open_timeout: 5,
+        read_timeout: 5,
+      ) do |http|
+        http.get(uri.request_uri)
+      end
+    end
   end
 end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "1.7.1"
+  VERSION = "1.7.3"
 end
 

data/spec/bard/ping_spec.rb

@@ -3,29 +3,58 @@ require "bard/ping"
 
 describe Bard::Ping do
   let(:server) { double("server", ping: ["http://example.com"]) }
+  let(:ping) { described_class.new(server) }
+
+  def success_response
+    Net::HTTPSuccess.new(1.0, "200", "OK")
+  end
+
+  def not_found_response
+    Net::HTTPNotFound.new(1.0, "404", "Not Found")
+  end
 
   context "when the server is reachable" do
-    it "should return an empty array" do
-      allow(Net::HTTP).to receive(:get_response).and_return(Net::HTTPSuccess.new(1.0, "200", "OK"))
-      expect(Bard::Ping.call(server)).to be_empty
+    it "returns an empty array" do
+      allow(ping).to receive(:http_get).and_return(success_response)
+      expect(ping.call).to be_empty
     end
   end
 
   context "when the server is not reachable" do
-    it "should return the url" do
-      allow(Net::HTTP).to receive(:get_response).and_return(Net::HTTPNotFound.new(1.0, "404", "Not Found"))
-      expect(Bard::Ping.call(server)).to eq(["http://example.com"])
+    it "returns the url" do
+      allow(ping).to receive(:http_get).and_return(not_found_response)
+      expect(ping.call).to eq(["http://example.com"])
     end
   end
 
   context "when there is a redirect" do
-    it "should follow the redirect and return an empty array" do
+    it "follows the redirect and returns an empty array" do
       redirect_response = Net::HTTPRedirection.new(1.0, "301", "Moved Permanently")
-      redirect_response["location"] = "http://example.com/new"
-      success_response = Net::HTTPSuccess.new(1.0, "200", "OK")
-      allow(Net::HTTP).to receive(:get_response).with(URI("http://example.com")).and_return(redirect_response)
-      allow(Net::HTTP).to receive(:get_response).with(URI("http://example.com/new")).and_return(success_response)
-      expect(Bard::Ping.call(server)).to be_empty
+      redirect_response["location"] = "/new"
+      allow(ping).to receive(:http_get).with(URI("http://example.com")).and_return(redirect_response)
+      allow(ping).to receive(:http_get).with(URI("http://example.com/new")).and_return(success_response)
+      expect(ping.call).to be_empty
+    end
+  end
+
+  context "when a transient error occurs" do
+    it "retries once before marking down" do
+      calls = 0
+      allow(ping).to receive(:http_get) do
+        calls += 1
+        raise Errno::ECONNRESET if calls == 1
+
+        success_response
+      end
+
+      expect(ping.call).to be_empty
+    end
+  end
+
+  context "when errors persist across retries" do
+    it "returns the url" do
+      allow(ping).to receive(:http_get).and_raise(Errno::ECONNREFUSED)
+      expect(ping.call).to eq(["http://example.com"])
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2025-12-11 00:00:00.000000000 Z
+date: 2025-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor