bard 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24a9ee78c591a6446ac1bb749225497c75470e12e4fe822d96e975870ac88152
-  data.tar.gz: 2b8ae0acbf1237b3312957128130f399a516a3a19d52d45f63c7b0677952e4f2
+  metadata.gz: a1541cf273c6f77dc3fe0910f17aff570de984eb1858ffb97267c5fc6be80709
+  data.tar.gz: a02d6f359c62fa2bddd91dcd5052069d9901414011107fa0c98dbfcf674f7323
 SHA512:
-  metadata.gz: 55a1a4f6fcf3bf12201105974a619be5178c3c9c6367d8dccf2eef1e7e504880a869a6291dfb5024930e025f63d8cf2f22c8925cf5fc24f9e83d2aa85ed047ed
-  data.tar.gz: 5da5d707ceed5ca663e4a68cd4a2ba2afbb232052e4a0542a4e41a1badc0161ba4eda410195b717d21f8fdaea299af771afa6a19310d93b66915996e8579b5fa
+  metadata.gz: 788e7863ff3543dc464dbe7f84ae70e8931017a99feed5bfcb00492204afeec60ead608cbaec06be2a4521055021d27577ef75abfa17ee688c6790d4a51b6d0f
+  data.tar.gz: e726331d4aec855d5ee6727a2ce09435f92ae42d083ee38afe4d08685da23c6f45a173e1d4b58f10a2803d7bbe92f2927ec1fc632e9d1ef2507299d62fe107f0

data/lib/bard/plugins/github_pages/strategy.rb

@@ -1,6 +1,7 @@
 require "bard/plugins/deploy/strategy"
 require "bard/plugins/git"
 require "fileutils"
+require "socket"
 require "uri"
 
 module Bard
@@ -19,6 +20,7 @@ module Bard
         @build_dir = "tmp/github-build-#{@sha}"
         @branch = "gh-pages"
         @domain = extract_domain
+        @port = pick_free_port
 
         puts "Starting deployment to GitHub Pages..."
 
@@ -37,27 +39,46 @@ module Bard
         domain
       end
 
+      def pick_free_port
+        server = TCPServer.new("127.0.0.1", 0)
+        port = server.addr[1]
+        server.close
+        port
+      end
+
       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
+          PORT=#{@port}
+
           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
+          # Start rails in the foreground, backgrounded — NOT as a daemon —
+          # so a port-bind failure surfaces instead of being swallowed by fork.
+          rm -f tmp/pids/server.pid
+          RAILS_ENV=production bundle exec rails s -p $PORT -P tmp/pids/server.pid >tmp/pids/server.log 2>&1 &
+          RAILS_PID=$!
+
           echo waiting...
-          curl -s --retry 5 --retry-delay 2 http://localhost:3000 >/dev/null 2>&1
+          for i in $(seq 1 30); do
+            if ! kill -0 $RAILS_PID 2>/dev/null; then
+              echo "Rails server failed to start on port $PORT:"
+              cat tmp/pids/server.log
+              exit 1
+            fi
+            curl -sf http://localhost:$PORT >/dev/null 2>&1 && break
+            sleep 1
+          done
 
+          cd $BUILD
           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
+          wget -nv -r -l inf --no-remove-listing -FEnH --reject-regex "(\\.*)\\?(.*)" http://localhost:$PORT/ 2>&1
 
           echo #{@domain} > CNAME
         SH

data/lib/bard/plugins/setup.rb

@@ -5,35 +5,7 @@ class Bard::CLI
   desc "setup", "installs app in nginx"
   def setup
     path = "/etc/nginx/sites-available/#{project_name}"
-    system "sudo tee #{path} >/dev/null <<-'EOF'
-upstream puma {
-    server 127.0.0.1:3000 fail_timeout=5;
-}
-
-server {
-    listen 80;
-    server_name #{nginx_server_name};
-    root #{Dir.pwd}/public;
-
-    try_files $uri @app;
-
-    location @app {
-        proxy_pass http://puma;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location ~* \\-[0-9a-f]\\{64\\}\\.(ico|css|js|gif|jpe?g|png|webp)$ {
-        access_log off;
-        expires max;
-        add_header Cache-Control public;
-    }
-
-    gzip_static on;
-}
-EOF"
+    system "sudo tee #{path} >/dev/null <<-'EOF'\n#{nginx_config}EOF"
 
     dest_path = path.sub("sites-available", "sites-enabled")
     system "sudo ln -sf #{path} #{dest_path}" if !File.exist?(dest_path)
@@ -42,6 +14,55 @@ EOF"
   end
 
   no_commands do
+    def nginx_config
+      case ENV["RAILS_ENV"]
+      when "production", "staging" then nginx_production_config
+      else nginx_development_config
+      end
+    end
+
+    def nginx_development_config
+      <<~EOF
+        server {
+            include /etc/nginx/snippets/common.conf;
+            server_name #{nginx_server_name};
+            root #{Dir.pwd}/public;
+        }
+      EOF
+    end
+
+    def nginx_production_config
+      <<~EOF
+        upstream puma {
+            server 127.0.0.1:3000 fail_timeout=5;
+        }
+
+        server {
+            listen 80;
+            server_name #{nginx_server_name};
+            root #{Dir.pwd}/public;
+
+            try_files $uri @app;
+
+            location @app {
+                proxy_pass http://puma;
+                proxy_set_header Host $host;
+                proxy_set_header X-Real-IP $remote_addr;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+                proxy_set_header X-Forwarded-Proto $scheme;
+            }
+
+            location ~* \\-[0-9a-f]\\{64\\}\\.(ico|css|js|gif|jpe?g|png|webp)$ {
+                access_log off;
+                expires max;
+                add_header Cache-Control public;
+            }
+
+            gzip_static on;
+        }
+      EOF
+    end
+
     def nginx_server_name
       case ENV["RAILS_ENV"]
       when "production"

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end
 

data/spec/bard/cli/setup_spec.rb

@@ -12,16 +12,40 @@ describe "bard setup" do
   end
 
   describe "#setup" do
+    before { allow(cli).to receive(:nginx_server_name).and_return("test_project.localhost") }
+
     it "should have a setup command" do
       expect(cli).to respond_to(:setup)
     end
 
-    it "should create nginx reverse proxy config" do
-      expect(cli).to receive(:system).with(/sudo tee \/etc\/nginx\/sites-available\/test_project.*proxy_pass http:\/\/puma/m)
-      expect(cli).to receive(:system).with(/sudo ln -sf/)
-      expect(cli).to receive(:system).with("sudo service nginx restart")
+    context "in production" do
+      before do
+        allow(ENV).to receive(:[]).and_call_original
+        allow(ENV).to receive(:[]).with("RAILS_ENV").and_return("production")
+      end
+
+      it "creates an nginx reverse proxy config" do
+        expect(cli).to receive(:system).with(/sudo tee \/etc\/nginx\/sites-available\/test_project.*proxy_pass http:\/\/puma/m)
+        expect(cli).to receive(:system).with(/sudo ln -sf/)
+        expect(cli).to receive(:system).with("sudo service nginx restart")
+
+        cli.setup
+      end
+    end
+
+    context "in development" do
+      before do
+        allow(ENV).to receive(:[]).and_call_original
+        allow(ENV).to receive(:[]).with("RAILS_ENV").and_return("development")
+      end
 
-      cli.setup
+      it "creates an nginx config that includes the shared dev snippet" do
+        expect(cli).to receive(:system).with(/sudo tee \/etc\/nginx\/sites-available\/test_project.*include \/etc\/nginx\/snippets\/common\.conf/m)
+        expect(cli).to receive(:system).with(/sudo ln -sf/)
+        expect(cli).to receive(:system).with("sudo service nginx restart")
+
+        cli.setup
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Micah Geisel
 bindir: bin
 cert_chain: []
-date: 2026-05-17 00:00:00.000000000 Z
+date: 2026-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor