v2.4.1: Pigs might 🪰

.github/workflows/build-docker.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - name: Run tests
         run: |
@@ -62,7 +62,7 @@ jobs:
           status: STARTING
           color: warning
 
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - name: Set up QEMU
         uses: docker/[email protected]
@@ -108,7 +108,7 @@ jobs:
           echo "::set-output name=tag_list::${TAG_LIST}"
 
       - name: Build and push
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
 
       - name: Run tests
         run: |

Dockerfile

@@ -1,11 +1,7 @@
-FROM ruby:3.2-alpine
-LABEL [email protected]
+ARG RUBY_ENV
 
-LABEL com.github.actions.name="robles"
-LABEL com.github.actions.author="Kodeco <[email protected]>"
-LABEL com.github.actions.description="Content publication for kodeco.com"
-LABEL com.github.actions.color="purple"
-LABEL com.github.actions.icon="book"
+FROM ruby:3.2-alpine AS builder
+LABEL [email protected]
 
 ARG APP_ROOT=/app/robles
 ARG BUILD_PACKAGES="build-base git"
@@ -41,3 +37,52 @@ RUN bundle install --jobs 20 --retry 5
 
 # Copy the main application.
 COPY . ./
+
+# Remove extra files
+RUN rm -rf /usr/local/bundle/cache/*
+
+
+##############################
+# PACKAGE STAGE              #
+##############################
+FROM ruby:3.2-alpine
+LABEL [email protected]
+LABEL com.github.actions.name="robles"
+LABEL com.github.actions.author="Kodeco <[email protected]>"
+LABEL com.github.actions.description="Content publication for kodeco.com"
+LABEL com.github.actions.color="purple"
+LABEL com.github.actions.icon="book"
+
+ARG APP_ROOT=/app/robles
+ARG RUBY_ENV=${RUBY_ENV:-production}
+
+ENV RUBY_ENV=${RUBY_ENV}
+
+ARG RUNTIME_PACKAGES="imagemagick git tzdata"
+ARG TEST_AND_DEV_PACKAGES="bash build-base libsodium-dev"
+
+# SYSLOG TO STDOUT
+RUN \
+  touch /var/log/syslog && \
+  ln -sf /proc/1/fd/1 /var/log/syslog
+
+# libsodium
+COPY --from=builder /usr/lib/libsodium.so* /usr/lib/
+# Copy the app from builder
+COPY --from=builder $APP_ROOT $APP_ROOT
+COPY --from=builder /usr/local/bundle /usr/local/bundle
+
+# Set the working directory
+WORKDIR $APP_ROOT
+
+# For runtime
+RUN apk update \
+    && apk upgrade \
+    && apk add --update --no-cache $RUNTIME_PACKAGES \
+    && rm -rf /var/cache/apk/*
+
+# Test and dev packages
+RUN if [ "$RUBY_ENV" == "test" -o "$RUBY_ENV" == "development" ]; then \
+    apk add --update --no-cache $TEST_AND_DEV_PACKAGES \
+      && rm -rf /var/cache/apk/*; \
+  fi

Gemfile

@@ -13,7 +13,9 @@ gem 'cli-ui', '~> 2'
 gem 'thor', '~> 1.0', '>= 1.0.1'
 
 # Markdown processing
-gem 'commonmarker'
+# >= 1 switches out the underlying library to one that does not support musl
+# Currently, there are no plans to support it, so let's lock to < 1
+gem 'commonmarker', '< 1'
 
 # HTTP Client
 gem 'faraday', '~> 2'

Gemfile.lock

@@ -14,9 +14,9 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activesupport (7.1.1)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -26,44 +26,44 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.835.0)
-    aws-sdk-core (3.185.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.877.0)
+    aws-sdk-core (3.190.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.76.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.142.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     backport (1.2.0)
-    base64 (0.1.1)
-    benchmark (0.2.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    benchmark (0.3.0)
+    bigdecimal (3.1.5)
     cli-ui (2.2.3)
     coderay (1.1.3)
     commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     daemons (1.4.1)
     diff-lcs (1.5.0)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     e2mmap (0.1.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    faraday (2.7.11)
+    faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -77,7 +77,7 @@ GEM
       websocket-driver (>= 0.6, < 0.8)
     ffi (1.16.3)
     formatador (1.1.0)
-    git (1.18.0)
+    git (1.19.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     google-protobuf (3.22.0)
@@ -101,7 +101,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -110,17 +110,17 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.9)
+    lumberjack (1.2.10)
     method_source (1.0.0)
     mini_magick (4.12.0)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     nenv (0.3.0)
-    nokogiri (1.15.4)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -129,48 +129,48 @@ GEM
     octokit (7.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.2)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rack (2.2.8)
     rack-livereload (0.5.1)
       rack
-    rack-protection (3.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbnacl (7.1.1)
       ffi
     rbs (2.8.4)
     rchardet (1.8.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
-    rubocop (1.57.1)
-      base64 (~> 0.1.1)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -181,13 +181,13 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    sinatra (3.1.0)
+    sinatra (3.2.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.1.0)
+      rack-protection (= 3.2.0)
       tilt (~> 2.0)
     slack-notifier (2.4.0)
-    solargraph (0.49.0)
+    solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
       bundler (~> 2.0)
@@ -207,7 +207,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -227,7 +227,7 @@ DEPENDENCIES
   activesupport (< 7.2)
   aws-sdk-s3 (~> 1.64)
   cli-ui (~> 2)
-  commonmarker
+  commonmarker (< 1)
   concurrent-ruby (~> 1.1)
   faraday (~> 2)
   faraday-retry
@@ -253,4 +253,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.4.20
+   2.5.4

app/commands/content_module_cli.rb

@@ -55,20 +55,6 @@ def slides
     snapshotter.generate
   end
 
-
-  desc 'serve', 'starts local preview server'
-  option :dev, type: :boolean, desc: 'Run in development mode (watch robles files, not module files)'
-  def serve
-    fork do
-      if options[:dev]
-        Guard.start(no_interactions: true)
-      else
-        Guard.start(guardfile_contents: content_module_guardfile, watchdir: './', no_interactions: true)
-      end
-    end
-    RoblesContentModuleServer.run!
-  end
-
   desc 'secrets [REPO]', 'configures a module repo with the necessary secrets'
   long_desc <<-LONGDESC
     `robles module secrets [REPO]` will upload the secrets requires to run robles on a

app/commands/video_cli.rb

@@ -6,7 +6,7 @@ class VideoCli < Thor
   option :'release-file', type: :string, desc: 'Location of the release.yaml file'
   option :local, type: :boolean
   def render
-    video_course = runner.render_video_course(release_file: options['release_file'], local: options['local'])
+    runner.render_video_course(release_file: options['release_file'], local: options['local'])
   end
 
   desc 'serve', 'starts local preview server'
@@ -39,8 +39,8 @@ def upload
 
   desc 'lint [RELEASE_FILE]', 'runs a selection of linters on the video course'
   option :'release-file', type: :string, desc: 'Location of the release.yaml file'
-  method_option 'without-version': :boolean, aliases: '-e', default: false, desc: 'Run linting without git branch naming check'
-  method_option silent: :boolean, aliases: '-s', default: false, desc: 'Hide all output'
+  method_option :'without-version', type: :boolean, aliases: '-e', default: false, desc: 'Run linting without git branch naming check'
+  method_option :silent, type: :boolean, aliases: '-s', default: false, desc: 'Hide all output'
   def lint
     output = runner.lint_video_course(release_file: options['publish_file'], options:)
     exit 1 unless output.validated || ENVIRONMENT == 'staging'

app/lib/linting/book_linter.rb

@@ -117,7 +117,7 @@ def book
         parser.parse
       end
     rescue Parser::Error => e
-      line_number = (e.message.match(/at line (\d+)/)&.captures&.first&.to_i || 0) + 1
+      line_number = e.message.match(/at line (\d+)/)&.captures&.first.to_i + 1
       annotations.push(
         Annotation.new(
           absolute_path: e.file,