kamal-skiff 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9407b6b7b474c0e915653a9245fdffbd0c93291d2cf6e8bf5565571e022fee
-  data.tar.gz: 79a21f180fb0df9a4da6b0b1663d308a2c894b663e3f76dae6079ff3ec7f9a0f
+  metadata.gz: 0a1287b96fd40b8d21d31b1d47eae5594b05b2991d748e653041597c467cd7fe
+  data.tar.gz: 49285266f0940bc9e0835372ac0f4ec90903a165631d666829317b2bc2030246
 SHA512:
-  metadata.gz: 6b34450245099af8702174c4ea5f470895229ca3aa89a78f747192006839730d0c5566b3025d8e6350360770b276876930e5c95beaeaac0b69459601478b4157
-  data.tar.gz: 803a3bf11e89fca1f5ed4de0ab3cde49671e9a9c7ef1a2d40479b49f46bd2621709269cb4b7889a76b24ffafb9cf1e0f9fbd22631ebff9a12b3dec9437da0d17
+  metadata.gz: 74f54adac46c27c8be8c85a336bae02f63cfc5cf206df30379906b58ef16c5e7f00bdf639b0be4cf469ec6f4408c043bade655cce7ccbfedac7d0c61254214ad
+  data.tar.gz: 59d95d2eb3e23d1ca83d71aab91ae0a9ad6138223472adfb841d50e8392cf183c961e56059d0410014f6beb9aec2a2595a5ad174b4d84b3c46c5b972f586edd0

data/README.md

@@ -10,13 +10,16 @@ If you have a Ruby environment available, you can install Skiff globally with:
 gem install kamal-skiff
 ```
 
+Then run `skiff dev` to start the development server.
+
 ...otherwise, you can run a dockerized version via an alias (add this to your .bashrc or similar to simplify re-use). On macOS, use:
 
 ```sh
-alias skiff="docker run -it --rm -v '${PWD}:/workdir' -v '/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock' -e SSH_AUTH_SOCK='/run/host-services/ssh-auth.sock' -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/basecamp/kamal-skiff:latest"
+alias skiff-dev="docker build -t skiff-site . && docker run -it --rm -p 4000:80 -v ./public:/site/public --name skiff-site skiff-site nginx '-g daemon off;'"
+alias skiff="docker run -it --rm -v '${PWD}:/workdir' -v /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock -e SSH_AUTH_SOCK='/run/host-services/ssh-auth.sock' -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/basecamp/kamal-skiff:latest"
 ```
 
-Then run `skiff dev` to start the development server.
+Then run `skiff-dev` to start the development server, and use `skiff [command]` for everything else.
 
 ## Deploying the site for the first time
 

data/lib/skiff/cli.rb

@@ -20,10 +20,10 @@ class Skiff::Cli < Thor
   desc "dev", "Start development server"
   def dev
     if File.exist?("Dockerfile")
-      puts "Starting #{site_name} on http://localhost:8080..."
+      puts "Starting #{site_name} on http://localhost:4000..."
 
       docker "build -t #{site_name} ."
-      docker "run -it --rm -p 8080:80 -v ./public:/site/public --name #{site_name} #{site_name} nginx '-g daemon off;'"
+      docker "run -it --rm -p 4000:80 -v ./public:/site/public --name #{site_name} #{site_name} nginx '-g daemon off;'"
     else
       say "No Dockerfile found in current directory", :red
     end

data/lib/skiff/templates/Dockerfile

@@ -8,10 +8,10 @@ RUN apt-get update -qq && \
 # Site lives here
 WORKDIR /site
 
-# Copy site
-COPY . .
-
 # Configure nginx
 RUN echo 'include /site/config/server.conf;' > /etc/nginx/conf.d/default.conf
 
+# Copy site
+COPY --link . .
+
 CMD ["/site/serve"]

data/lib/skiff/templates/config/server.conf

@@ -7,9 +7,10 @@ server {
   # Only needed if there's no CDN in front
   gzip on;
 
-  # Turn on SSI with etags
+  # Turn on SSI with etags and long values
   ssi on;
   ssi_last_modified on;
+  ssi_value_length 1024;
 
   # All web accessible files live here
   root /site/public;
@@ -18,17 +19,12 @@ server {
   error_page 404 /_errors/404.html;
 
   # Folders starting with _ are not publicly accessible
-  location ~ ^/_.*$ {
+  location ~ ^/_$ {
     internal;
   }
 
-  # Make /up look for /site/public/up.html
-  location ~ ^/([^\.]+)$ {
-    try_files /$1.html =404;
-  }
-
-  # Make /pricing/ look for /site/public/pricing/index.html
+  # Make /up look first for /up.html then /up/index.html
   location / {
-    index index.html;
+    try_files $uri $uri.html $uri/index.html =404;
   }
 }

data/lib/skiff/templates/serve

@@ -4,6 +4,7 @@ set -e
 polling_pull() {
   while true; do
     echo "Pulling latest..."
+    git checkout -f || true
     git pull $GIT_URL $GIT_BRANCH || true
     sleep 10
   done

data/lib/skiff/version.rb

@@ -1,3 +1,3 @@
 module Skiff
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal-skiff
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kamal
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement