bard 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68411db6b0d930d06cc7708835eaa23d10cbedc42eb905bec4065c47834f488a
-  data.tar.gz: e2488bd0f625e3aa7a87aa6f3334178dbdff49a19a7c020d2424b073dea3f999
+  metadata.gz: d1e8b7a7dc083d479b5322405ddbfc58ecab56967433c5f2a543c7637a86ce28
+  data.tar.gz: 3c09e62579e85fa615e2005ed6f5cc2d0068576eba46255791523a211b7c0387
 SHA512:
-  metadata.gz: 1cc1f667c31694e70f54621b13d3871e74c011f4fd25ab80b66b6caa325fc89d878f4f4199d4adec314b599c4c9e8162ee12dd3e5830b255e9cfcde1c9504e06
-  data.tar.gz: 9f9be575ee8baa54d8f175c6a4c9227daa22b360343a1143736168d68b5f91697840819f9ed1f165b07e2cea2660c92bce2e466b72e87bf236f459cff304fed5
+  metadata.gz: 2ab06301b535cfe5eb37bb3da892fc6e8a66cb46c6c346bfb0d8279bfd37bba9c495f3c9fc9ffda8663881b7fe333186820cc4c57d36f086c524191dc953da14
+  data.tar.gz: 0f55ad3b8d94900354005227d73b86ba3ab25847eb7d88242f89e28fafbd281256755a802a7ca10092bd1571040335a3a4d8de845406af94b4d5a10edd1e9e16

data/lib/bard/github_pages.rb

@@ -22,34 +22,55 @@ module Bard
     private
 
     def build_site
-      system "rm -rf #{@build_dir.sub(@sha, "*")}"
-      run! <<~SH
-        set -e
-        RAILS_ENV=production bundle exec rails s -p 3000 -d --pid tmp/pids/server.pid
-        OUTPUT=$(bundle exec rake assets:clean assets:precompile 2>&1) || echo "$OUTPUT"
-
-        # Create the output directory and enter it
-        BUILD=#{@build_dir}
-        rm -rf $BUILD
-        mkdir -p $BUILD
-        cp -R public/assets $BUILD/
-        cd $BUILD
-
-        # wait until server responds
-        echo waiting...
-        curl -s --retry 5 --retry-delay 2 http://localhost:3000 >/dev/null 2>&1
-
-        echo copying...
-        # Mirror the site to the build folder, ignoring links with query params
-        wget -nv -r -l inf --no-remove-listing -FEnH --reject-regex "(\\.*)\\?(.*)" http://localhost:3000/ 2>&1
-
-        echo #{@domain} > CNAME
-      SH
-    ensure # cleanup
-      run! <<~SH
-        cat tmp/pids/server.pid | xargs -I {} kill {}
-        rm -rf public/assets
-      SH
+      with_locked_port do |port|
+        system "rm -rf #{@build_dir.sub(@sha, "*")}"
+        run! <<~SH
+          set -e
+          RAILS_ENV=production bundle exec rails s -p #{port} -d --pid tmp/pids/server.pid
+          OUTPUT=$(bundle exec rake assets:clean assets:precompile 2>&1) || echo "$OUTPUT"
+
+          # Create the output directory and enter it
+          BUILD=#{@build_dir}
+          rm -rf $BUILD
+          mkdir -p $BUILD
+          cp -R public/assets $BUILD/
+          cd $BUILD
+
+          # wait until server responds
+          echo waiting...
+          curl -s --retry 5 --retry-delay 2 http://localhost:#{port} >/dev/null 2>&1
+
+          echo copying...
+          # Mirror the site to the build folder, ignoring links with query params
+          wget -nv -r -l inf --no-remove-listing -FEnH --reject-regex "(\\.*)\\?(.*)" http://localhost:#{port}/ 2>&1
+
+          echo #{@domain} > CNAME
+        SH
+      ensure # cleanup
+        run! <<~SH
+          cat tmp/pids/server.pid | xargs -I {} kill {}
+          rm -rf public/assets
+        SH
+      end
+    end
+
+    def with_locked_port
+      (3000..3020).each do |port|
+        lock_file = "/tmp/bard_github_pages_#{port}.lock"
+        file = File.open(lock_file, File::RDWR | File::CREAT, 0644)
+        if file.flock(File::LOCK_EX | File::LOCK_NB)
+          begin
+            yield port
+            return
+          ensure
+            file.flock(File::LOCK_UN)
+            file.close
+          end
+        else
+          file.close
+        end
+      end
+      raise "Could not find an available port for GitHub Pages deployment (checked 3000-3020)."
     end
 
     def create_tree_from_build

data/lib/bard/version.rb

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

data/spec/bard/github_pages_spec.rb

@@ -38,6 +38,69 @@ describe Bard::GithubPages do
     end
   end
 
+  describe "#build_site" do
+    it "uses the locked port" do
+      github_pages.instance_variable_set(:@sha, "abc123")
+      github_pages.instance_variable_set(:@build_dir, "tmp/github-build-abc123")
+      github_pages.instance_variable_set(:@domain, "example.com")
+
+      allow(github_pages).to receive(:with_locked_port).and_yield(3005)
+
+      expect(github_pages).to receive(:run!).with(satisfy { |cmd|
+        cmd.include?("rails s -p 3005") && cmd.include?("http://localhost:3005")
+      }).ordered
+
+      expect(github_pages).to receive(:run!).with(include("kill")).ordered
+
+      github_pages.send(:build_site)
+    end
+  end
+
+  describe "#with_locked_port" do
+    let(:file_mock) { double("file", close: true) }
+
+    before do
+      allow(File).to receive(:open).and_return(file_mock)
+    end
+
+    it "yields the first available port" do
+      allow(file_mock).to receive(:flock).and_return(true)
+      
+      expect(File).to receive(:open).with("/tmp/bard_github_pages_3000.lock", anything, anything)
+      
+      yielded_port = nil
+      github_pages.send(:with_locked_port) { |p| yielded_port = p }
+      expect(yielded_port).to eq(3000)
+    end
+
+    it "retries if the first port is locked" do
+      # 1. Try port 3000
+      expect(File).to receive(:open).with("/tmp/bard_github_pages_3000.lock", anything, anything).ordered
+      expect(file_mock).to receive(:flock).with(File::LOCK_EX | File::LOCK_NB).and_return(false).ordered
+      expect(file_mock).to receive(:close).ordered
+
+      # 2. Try port 3001
+      expect(File).to receive(:open).with("/tmp/bard_github_pages_3001.lock", anything, anything).ordered
+      expect(file_mock).to receive(:flock).with(File::LOCK_EX | File::LOCK_NB).and_return(true).ordered
+      
+      # 3. Cleanup after yielding
+      expect(file_mock).to receive(:flock).with(File::LOCK_UN).ordered
+      expect(file_mock).to receive(:close).ordered
+
+      yielded_port = nil
+      github_pages.send(:with_locked_port) { |p| yielded_port = p }
+      expect(yielded_port).to eq(3001)
+    end
+
+    it "raises an error if no ports are available" do
+      allow(file_mock).to receive(:flock).and_return(false)
+      
+      expect {
+        github_pages.send(:with_locked_port) {}
+      }.to raise_error(/Could not find an available port/)
+    end
+  end
+
   describe "#get_parent_commit" do
     it "returns the sha of the gh-pages branch" do
       github_pages.instance_variable_set(:@branch, "gh-pages")
@@ -77,4 +140,4 @@ describe Bard::GithubPages do
       end
     end
   end
-end
+end

metadata

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