Merge pull request #240 from cre-ne-jp/ruby3

Ruby 3に対応させる

Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
 # IRC framework
 gem 'mcinch'
 gem 'lumberjack'
@@ -61,7 +63,7 @@ gem 'redcarpet'
 
 # 自動リンク
 # スキーム付きのURLのみ有効にするために独自ブランチを使用する
-gem 'rinku', git: 'https://github.com/cre-ne-jp/rinku.git', branch: 'without-www'
+gem 'rinku', github: 'cre-ne-jp/rinku', branch: 'without-www'
 
 # ページネーション
 gem 'kaminari'
@@ -73,7 +75,8 @@ gem 'friendly_id'
 gem 'simple_enum'
 
 # 認証
-gem 'sorcery'
+# @todo https://github.com/Sorcery/sorcery/pull/241 が取り込まれたらmasterを指定しない
+gem 'sorcery', github: 'Sorcery/sorcery', branch: 'master'
 
 # 並び替え
 gem 'ranked-model'

Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/Sorcery/sorcery.git
+  revision: 443e614e3d2dfc9d7dd805c4a69f8e1c820c7e76
+  branch: master
+  specs:
+    sorcery (0.15.0)
+      bcrypt (~> 3.1)
+      oauth (~> 0.4, >= 0.4.4)
+      oauth2 (~> 1.0, >= 0.8.0)
+
 GIT
   remote: https://github.com/cre-ne-jp/rinku.git
   revision: 5da355a50ec64537a28f75b9cd76e9a0ad78616a
@@ -296,10 +306,6 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sorcery (0.15.0)
-      bcrypt (~> 3.1)
-      oauth (~> 0.4, >= 0.4.4)
-      oauth2 (~> 1.0, >= 0.8.0)
     spring (2.1.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -375,7 +381,7 @@ DEPENDENCIES
   simple_calendar (~> 2.0)
   simple_enum
   simplecov (~> 0.10, < 0.18)
-  sorcery
+  sorcery!
   spring
   sysexits
   uglifier (>= 1.3)

lib/log_archiver/app_status.rb

@@ -69,8 +69,12 @@ def initialize(version, start_time, commit_id = '')
       @start_time = start_time.dup.freeze
       @commit_id = commit_id.dup.freeze
 
-      @version_and_commit_id = commit_id.empty? ?
-        version : "#{version} (#{commit_id})"
+      @version_and_commit_id =
+        if commit_id.empty?
+          version
+        else
+          "#{version} (#{commit_id})".freeze
+        end
     end
 
     # アプリケーションの状態を表すHashを返す