fly.io support + ruby 3.1.2 (#130)

- ruby 3.1.2
- fly.io
- codespaces support for ruby 3.1.2

Author: pcai

.devcontainer/Dockerfile

@@ -0,0 +1,3 @@
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
+ARG VARIANT=3.1-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-${VARIANT}

.ruby-version

@@ -1 +1 @@
-2.5.3
+3.1.2

Gemfile

@@ -6,11 +6,11 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-ruby "2.5.3"
+ruby "3.1.2"
 
 gem "activesupport"
 gem "erector", "~> 0.10.0"
-gem "sinatra", "~> 1.4.0"
+gem "sinatra", "~> 1.4.7"
 gem "nokogiri"
 gem "thin"
 gem "eventmachine", "~> 1.0.3"

Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.11)
+    activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -39,7 +39,7 @@ GEM
     erector (0.10.0)
       treetop (>= 1.2.3)
     eventmachine (1.0.4)
-    ffi (1.9.6)
+    ffi (1.15.5)
     files (0.3.1)
     font-awesome-sass (4.2.2)
       sass (~> 3.2)
@@ -53,16 +53,16 @@ GEM
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mini_portile2 (2.5.1)
-    minitest (5.13.0)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
     multi_json (1.14.1)
-    nokogiri (1.11.4)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     polyglot (0.3.5)
     predicated (0.2.6)
-    racc (1.5.2)
-    rack (1.6.12)
+    racc (1.6.0)
+    rack (1.6.13)
     rack-codehighlighter (0.5.0)
       nokogiri (>= 1.4.1)
       rack (>= 1.0.0)
@@ -97,10 +97,10 @@ GEM
     rubyzip (1.3.0)
     sass (3.4.8)
     sexp_processor (4.10.1)
-    sinatra (1.4.5)
-      rack (~> 1.4)
+    sinatra (1.4.8)
+      rack (~> 1.5)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     sprockets (2.12.5)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -117,7 +117,7 @@ GEM
     treetop (1.5.3)
       polyglot (~> 0.3)
     trollop (2.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -144,13 +144,13 @@ DEPENDENCIES
   rspec
   rubyzip
   sass
-  sinatra (~> 1.4.0)
+  sinatra (~> 1.4.7)
   sprockets
   thin
   wrong!
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 3.1.2p20
 
 BUNDLED WITH
-   1.17.1
+   2.3.7

fly.toml

@@ -0,0 +1,42 @@
+# fly.toml file generated for rbb-docs on 2022-09-11T14:07:43Z
+
+app = "rbb-docs"
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[build]
+  builder = "heroku/buildpacks:20"
+
+[env]
+  PORT = "8080"
+
+[experimental]
+  allowed_public_ports = []
+  auto_rollback = true
+
+[[services]]
+  http_checks = []
+  internal_port = 8080
+  processes = ["app"]
+  protocol = "tcp"
+  script_checks = []
+  [services.concurrency]
+    hard_limit = 25
+    soft_limit = 20
+    type = "connections"
+
+  [[services.ports]]
+    force_https = true
+    handlers = ["http"]
+    port = 80
+
+  [[services.ports]]
+    handlers = ["tls", "http"]
+    port = 443
+
+  [[services.tcp_checks]]
+    grace_period = "1s"
+    interval = "15s"
+    restart_limit = 0
+    timeout = "2s"

lib/step.rb

@@ -79,7 +79,7 @@ def insert file
     end
   end
 
-  def step name = nil, options = {}
+  def step name = nil, options = {}, &block
     num = next_step_number
     a(:name => "step#{current_anchor_num}")
     a(:name => options[:anchor_name]) if options[:anchor_name]
@@ -90,7 +90,7 @@ def step name = nil, options = {}
               (!name.nil? ? I18n.t("general.step_title_suffix") : '')
         text name
       end
-      _render_inner_content &Proc.new if block_given?
+      _render_inner_content(&block) if block_given?
     end
   end
 
@@ -137,19 +137,19 @@ def next_step name
     end
   end
 
-  def situation name
+  def situation name, &block
     h1 name
-    _render_inner_content &Proc.new if block_given?
+    _render_inner_content(&block) if block_given?
   end
 
-  def option name
+  def option name, &block
     num = next_step_number
     a(:name => "step#{current_anchor_num}")
     h1 :class => "option" do
       span I18n.t("general.option", :num => num)
       text name
     end
-    _render_inner_content &Proc.new if block_given?
+    _render_inner_content(&block) if block_given?
   end
 
   def option_half title
@@ -395,10 +395,10 @@ def js_expected_results(lesson)
 
   private
 
-  def _render_inner_content
+  def _render_inner_content(&block)
     blockquote do
       @step_stack.push 0
-      yield
+      yield(block)
       @step_stack.pop
     end
   end