r2-oas 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8548f2c821fe7b76548b748dbe733ce0f11386d76ae046cc047b0fe0eb017b
-  data.tar.gz: ee6ebb9740a854142b929195a57206cf8cedfeb1f965e4217e048152effc03a0
+  metadata.gz: 2e9fd7edc6de218fe86bcde7dfa51d219d541b52cb8a6ee75f9bb37ed85761d9
+  data.tar.gz: af082eb9c7a450aa13414046eb1a7be19ebd2140a03b499368019d6a5ef17c3a
 SHA512:
-  metadata.gz: fcdf6903f652e7109c137b05123d6d244aaec02e9bb2a1fd657bc710ae549c6d84bd887c281a2f881e070d757299f17334200273bb2b3f9e6b988d16578a246b
-  data.tar.gz: 129cfd622a8bd4c5b55bd5415cb24f24d0b918ea7cd9781aec7127b41640c3fe116b5f7e4dfe20add9ec68993d075471d172bd4919fda957893dc8b747c48ce2
+  metadata.gz: 6599b3911308383a080da4b8ef78ffc046ebfc621a78c878afaa96d32241c60163c9a4c305cf9b23bac06d1e681dbc18a418e881b2264454b7a0de9dac40d2e2
+  data.tar.gz: 22f6aa0517f3315acfa779305884382e5291873696066ae7d81868fdcc9d2610fca2483a405616bfdf99ff14f2edaf637d23c1645127cab8eba57780c090742b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v0.6.0
+
+2025-11-01
+
+- [`EOL`] EOL Ruby `2.x` and Support over Ruby `3.x` ([#184](https://github.com/yukihirop/r2-oas/pull/184))
+- [`EOL`] EOL Rails `6.x ↓` and Support over Rails `7.2.2.2` and Rails `8.x` ([#186](https://github.com/yukihirop/r2-oas/pull/186))
+- [`Feature`] add `rbs` and configure `steep` ([#187](https://github.com/yukihirop/r2-oas/pull/187))
+
+Please see mileston [v0.6.0](https://github.com/yukihirop/r2-oas/milestone/8)
+
 ## v0.5.0
 
 2020-01-29

data/README.ja.md

@@ -1,22 +1,32 @@
-# R2-OAS
-
 [![Gem Version](https://badge.fury.io/rb/r2-oas.svg)](https://badge.fury.io/rb/r2-oas)
 [![Build Status](https://travis-ci.org/yukihirop/r2-oas.svg?branch=master)](https://travis-ci.org/yukihirop/r2-oas)
 [![Coverage Status](https://coveralls.io/repos/github/yukihirop/r2-oas/badge.svg)](https://coveralls.io/github/yukihirop/r2-oas)
 [![Maintainability](https://api.codeclimate.com/v1/badges/f8c3846f350bb412fd63/maintainability)](https://codeclimate.com/github/yukihirop/r2-oas/maintainability)
 
+
+<p align="center">
+	<img alt="logo" width="196" src="https://raw.githubusercontent.com/yukihirop/r2-oas/master/docs/assets/logo.png">
+</p>
+
+<h1 align="center" style="font-family: sans-serif; font-size: 50px; font-weight: 700; background: -webkit-linear-gradient(90deg, #CC342D 20%, #E63D36 60%, #FF5C55 100%); -webkit-background-clip: text; background-clip: text; -webkit-text-fill-color: transparent; color: transparent;">R2-OAS</h1>
+
+<p align="center">
+	<a href="https://yukihirop.github.io/r2-oas/" target="_blank">📚 Documentation</a>
+</p>
+
+
 Railsのルーティング情報からOpenAPI形式のドキュメントを生成し、閲覧・編集・管理するためのrakeタスクの提供をします。
 
 ```bash
-bundle exec rake routes:oas:init    # 初期化
-bundle exec rake routes:oas:docs    # ドキュメント生成
-bundle exec rake routes:oas:ui      # ドキュメント閲覧
-bundle exec rake routes:oas:editor  # ドキュメント編集
-bundle exec rake routes:oas:monitor # ドキュメント監視
-bundle exec rake routes:oas:build   # ドキュメントビルド
-bundle exec rake routes:oas:clean   # ドキュメント清掃
-bundle exec rake routes:oas:analyze # ドキュメント分解・分析
-bundle exec rake routes:oas:deploy  # ドキュメントデプロイ
+bundle exec rake routes:oas:init    # r2-oasを初期化
+bundle exec rake routes:oas:docs    # oas_docsを生成
+bundle exec rake routes:oas:ui      # swagger uiで閲覧
+bundle exec rake routes:oas:editor  # swagger editorで編集
+bundle exec rake routes:oas:monitor # oas_docsを監視・分析
+bundle exec rake routes:oas:build   # srcからoas_docsをビルド
+bundle exec rake routes:oas:clean   # 未使用コンポーネントを削除
+bundle exec rake routes:oas:analyze # oas_docsを分析・srcを生成
+bundle exec rake routes:oas:deploy  # oas_docsをdeploy_docsにデプロイ
 ```
 
 ## 💎 Installation
@@ -42,7 +52,7 @@ end
 ```
 $ docker pull swaggerapi/swagger-editor:latest
 $ docker pull swaggerapi/swagger-ui:latest
-$ brew cask install chromedriver
+$ brew install chromedriver
 ```
 
 ## 🚀 Tutorial
@@ -65,12 +75,15 @@ $ bundle exec rake routes:oas:editor
 
 #### Generate docs
 
-![oas_docs](https://user-images.githubusercontent.com/11146767/80856236-0b839a80-8c83-11ea-888f-d0e659e0c251.gif)
-
+<p align="center">
+	<img alt="r2-oas docs demo" width="800" src="https://raw.githubusercontent.com/yukihirop/r2-oas/master/demo/oas_docs.mp4">
+</p>
 
 #### Edit docs
 
-![oas_editor](https://user-images.githubusercontent.com/11146767/80856240-15a59900-8c83-11ea-9dbd-4382528944f2.gif)
+<p align="center">
+	<img alt="r2-oas editor demo" width="800" src="https://raw.githubusercontent.com/yukihirop/r2-oas/master/demo/oas_editor.mp4">
+</p>
 
 ## 📚 Documents
 
@@ -154,11 +167,14 @@ $ OAS_FILE="~/Desktop/swagger.yml" bundle exec rake routes:oas:analyze
 
 ## ❤️ Support Rails Version
 
-- Rails (>= 4.2.5.1)
+- Rails 7.2.2.2
+- Rails (>= 8.x)
 
 ## ❤️ Support Ruby Version
 
-- Ruby (>= 2.5.0)
+- Ruby 3.2.6
+- Ruby 3.3.6
+- Ruby (>= 3.4.x)
 
 ## ❤️ Support Rouging
 
@@ -192,6 +208,55 @@ OpenAPIの3.0.0をサポートしてます。
 
 公式ドキュメントはこちら => https://yukihirop.github.io/r2-oas/#/setting/configure
 
+## RBS, Steep
+
+```bash
+# エラーが出ていたら、エディタでhoverしても型の表示がされない原因になる
+bundle exec steep stats
+# エラーの内容は、こちらのコマンドで知ることができる
+bundle exec steep check
+```
+
+#### steep rake task
+
+```bash
+bundle exec rake steep:ignore:dig | pbcopy
+# =>
+#
+# ignore 'RBS::DuplicatedMethodDefinition'
+# ignore 'Ruby::ArgumentTypeMismatch'
+```
+
+```bash
+bundle exec rake steep:ignore:file | pbcopy
+# =>
+#
+# ignore 'lib/r2-oas.rb'
+# ignore 'lib/r2-oas/app_configuration.rb'
+# ignore 'lib/r2-oas/app_configuration/deprecation.rb'
+```
+
+```bash
+bundle exec rake steep:ignore:preview
+# =>
+# 📄 lib/r2-oas/schema/monitor.rb
+#   Line 50: if current_time - last_check_time >= interval_to_save_edited_tmp_schema
+#               →           if current_time - last_check_time >= interval_to_save_edited_tmp_schema # steep:ignore Ruby::NoMethod
+#   Line 62: analyzer.analyze_docs
+#               →         analyzer.analyze_docs # steep:ignore Ruby::NoMethod
+#   Line 66: YAML.load_file(doc_save_file_path) || @after_schema_data
+#               →         YAML.load_file(doc_save_file_path) || @after_schema_data # steep:ignore Ruby::UnknownConstant
+```
+
+```bash
+bundle exec rake steep:ignore:auto
+# =>
+# Analyzing steep check errors...
+# ✅ Modified: lib/r2-oas/app_configuration/deprecation.rb (2 lines)
+# ✅ Modified: lib/r2-oas/plugin/base.rb (3 lines)
+# ✅ Modified: lib/r2-oas/schema/squeezer.rb (2 lines)
+```
+
 ## Bundle and Rspec with multiple ruby ​​versions
 
 #### Bundle
@@ -202,22 +267,22 @@ OpenAPIの3.0.0をサポートしてます。
 .
 .
 ===== Bundle install for All Support Ruby Result =====
-ruby-2.5.8: 0
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
+ruby-3.4.7: 0
 ======================================================
 ```
 
-rubyのバージョンを `2.6.6` と `2.7.1`　に指定する場合
+rubyのバージョンを `3.2.6` と `3.3.6`　に指定する場合
 
 ```bash
-/bin/bash devscript/all_support_ruby.sh bundle 2.6.6 2.7.1
+/bin/bash devscript/all_support_ruby.sh bundle 3.2.6 3.3.6
 .
 .
 .
 ===== Bundle install for All Support Ruby Result =====
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
 ======================================================
 ```
 
@@ -229,22 +294,22 @@ ruby-2.7.1: 0
 .
 .
 ===== Rspec for All Support Ruby Result =====
-ruby-2.5.8: 0
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
+ruby-3.4.7: 0
 =============================================
 ```
 
-rubyのバージョンを `2.6.6` と `2.7.1`　に指定する場合
+rubyのバージョンを `3.2.6` と `3.3.6`　に指定する場合
 
 ```bash
-/bin/bash devscript/all_support_ruby.sh rspec 2.6.6 2.7.1
+/bin/bash devscript/all_support_ruby.sh rspec 3.2.6 3.3.6
 .
 .
 .
 ===== Rspec for All Support Ruby Result =====
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
 =============================================
 ```
 

data/README.md

@@ -1,24 +1,32 @@
-# R2-OAS
-
 [![Gem Version](https://badge.fury.io/rb/r2-oas.svg)](https://badge.fury.io/rb/r2-oas)
 [![Build Status](https://travis-ci.org/yukihirop/r2-oas.svg?branch=master)](https://travis-ci.org/yukihirop/r2-oas)
 [![Coverage Status](https://coveralls.io/repos/github/yukihirop/r2-oas/badge.svg)](https://coveralls.io/github/yukihirop/r2-oas)
 [![Maintainability](https://api.codeclimate.com/v1/badges/f8c3846f350bb412fd63/maintainability)](https://codeclimate.com/github/yukihirop/r2-oas/maintainability)
 
-Generate api docment(OpenAPI) side only from `Rails` routing.
+<p align="center">
+	<img alt="logo" width="196" src="https://raw.githubusercontent.com/yukihirop/r2-oas/master/docs/assets/logo.png">
+</p>
+
+<h1 align="center" style="font-family: sans-serif; font-size: 50px; font-weight: 700; background: -webkit-linear-gradient(90deg, #CC342D 20%, #E63D36 60%, #FF5C55 100%); -webkit-background-clip: text; background-clip: text; -webkit-text-fill-color: transparent; color: transparent;">R2-OAS</h1>
+
+<p align="center">
+	<a href="https://yukihirop.github.io/r2-oas/" target="_blank">📚 Documentation</a>
+</p>
 
-Provides a rake command to help `generate` , `view` , and `edit` OpenAPI documents.
+Generate api document (OpenAPI) side only from `Rails` routing.
+
+Provides a rake command to help `generate`, `view`, and `edit` OpenAPI documents.
 
 ```bash
-bunlde exec rake routes:oas:init    # initialize
-bundle exec rake routes:oas:docs    # generate
-bundle exec rake routes:oas:ui      # view
-bundle exec rake routes:oas:editor  # edit
-bundle exec rake routes:oas:monitor # monitor
-bundle exec rake routes:oas:build   # build
-bundle exec rake routes:oas:clean   # clean
-bundle exec rake routes:oas:analyze # analyze
-bundle exec rake routes:oas:deploy  # deploy
+bundle exec rake routes:oas:init    # r2-oas initialize
+bundle exec rake routes:oas:docs    # generate oas_docs
+bundle exec rake routes:oas:ui      # view at swagger ui
+bundle exec rake routes:oas:editor  # edit at swagger editor
+bundle exec rake routes:oas:monitor # monitor oas_docs and analyze
+bundle exec rake routes:oas:build   # build oas_docs from src
+bundle exec rake routes:oas:clean   # clean unused components
+bundle exec rake routes:oas:analyze # analyze oas_docs and generae src
+bundle exec rake routes:oas:deploy  # deploy oas_docs to deploy_docs
 ```
 
 ## 💎 Installation
@@ -52,7 +60,7 @@ If you do not have it download as below.
 ```
 $ docker pull swaggerapi/swagger-editor:latest
 $ docker pull swaggerapi/swagger-ui:latest
-$ brew cask install chromedriver
+$ brew install chromedriver
 ```
 
 ## 🚀 Tutorial
@@ -79,12 +87,15 @@ $ bundle exec rake routes:oas:editor
 
 #### Generate docs
 
-![oas_docs](https://user-images.githubusercontent.com/11146767/80856236-0b839a80-8c83-11ea-888f-d0e659e0c251.gif)
-
+<p align="center">
+	<img alt="r2-oas docs demo" width="800" src="https://raw.githubusercontent.com/yukihirop/r2-oas/master/demo/oas_docs.mp4">
+</p>
 
 #### Edit docs
 
-![oas_editor](https://user-images.githubusercontent.com/11146767/80856240-15a59900-8c83-11ea-9dbd-4382528944f2.gif)
+<p align="center">
+	<img alt="r2-oas editor demo" width="800" src="https://raw.githubusercontent.com/yukihirop/r2-oas/master/demo/oas_editor.mp4">
+</p>
 
 ## Usage
 
@@ -120,7 +131,7 @@ $ PATHS_FILE="oas_docs/schema/paths/api/v1/task.yml" bundle exec rake routes:oas
 
 ### Editor
 
-Start swagger editor.
+Start Swagger editor.
 
 ```bash
 $ bundle exec rake routes:oas:editor                                                     # Start swagger editor
@@ -160,11 +171,14 @@ Full docs are available at https://yukihirop.github.io/r2-oas
 
 ## ❤️ Support Rails Version
 
-- Rails (>= 4.2.5.1)
+- Rails 7.2.2.2
+- Rails (>= 8.x)
 
 ## ❤️ Support Ruby Version
 
-- Ruby (>= 2.5.0)
+- Ruby 3.2.6
+- Ruby 3.3.6
+- Ruby (>= 3.4.x)
 
 ## ❤️ Support Rouging
 
@@ -177,15 +191,15 @@ Full docs are available at https://yukihirop.github.io/r2-oas/#/schema/3.0.0
 
 ## ❗️ Convention over Configuration (CoC)
 
-- `tag name` represents `controller name` and determine `paths file name`.
-  - For example, If `controller name` is `Api::V1::UsersController`, `tag_name` is `api/v1/user`. and `paths file name` is `api/v1/user.yml`
+- `tag name` represents `controller name` and determines `paths file name`.
+  - For example, If `controller name` is `Api::V1::UsersController`, `tag_name` is `api/v1/user`, then `paths file name` is `api/v1/user.yml`
 
 - `_` of `components/{schemas,requestBodies, ...} name` convert `/` when save file.
   - For example, If `components/schemas name` is `Api_V1_User`, `components/schemas file name` is `api/v1/user.yml`.
   - `_` is supposed to be used to express `namespace`.
   - format is `Namespace1_Namespace2_Model`.
 
-- `.` of `components/{schemas,requestBodies, ...} name` convert `/` when save file.
+- `.` of `components/{schemas,requestBodies, ...} name` convert `/` when saving the file.
   - For example, If `components/schemas name` is `api.v1.User`, `components/schemas file name` is `api/v1/user.yml`.
   - `.` is supposed to be used to express `namespace`.
   - format is `namespace1.namespace2.Model`.
@@ -196,6 +210,55 @@ All settings are `optional`
 
 Full docs are available at https://yukihirop.github.io/r2-oas/#/setting/configure
 
+## RBS, Steep
+
+```bash
+# Errors here can prevent type information from showing when hovering in the editor
+bundle exec steep stats
+# You can check the error details with this command
+bundle exec steep check
+```
+
+#### steep rake task
+
+```bash
+bundle exec rake steep:ignore:dig | pbcopy
+# =>
+#
+# ignore 'RBS::DuplicatedMethodDefinition'
+# ignore 'Ruby::ArgumentTypeMismatch'
+```
+
+```bash
+bundle exec rake steep:ignore:file | pbcopy
+# =>
+#
+# ignore 'lib/r2-oas.rb'
+# ignore 'lib/r2-oas/app_configuration.rb'
+# ignore 'lib/r2-oas/app_configuration/deprecation.rb'
+```
+
+```bash
+bundle exec rake steep:ignore:preview
+# =>
+# 📄 lib/r2-oas/schema/monitor.rb
+#   Line 50: if current_time - last_check_time >= interval_to_save_edited_tmp_schema
+#               →           if current_time - last_check_time >= interval_to_save_edited_tmp_schema # steep:ignore Ruby::NoMethod
+#   Line 62: analyzer.analyze_docs
+#               →         analyzer.analyze_docs # steep:ignore Ruby::NoMethod
+#   Line 66: YAML.load_file(doc_save_file_path) || @after_schema_data
+#               →         YAML.load_file(doc_save_file_path) || @after_schema_data # steep:ignore Ruby::UnknownConstant
+```
+
+```bash
+bundle exec rake steep:ignore:auto
+# =>
+# Analyzing steep check errors...
+# ✅ Modified: lib/r2-oas/app_configuration/deprecation.rb (2 lines)
+# ✅ Modified: lib/r2-oas/plugin/base.rb (3 lines)
+# ✅ Modified: lib/r2-oas/schema/squeezer.rb (2 lines)
+```
+
 ## Bundle and Rspec with multiple ruby ​​versions
 
 #### Bundle
@@ -206,22 +269,22 @@ Full docs are available at https://yukihirop.github.io/r2-oas/#/setting/configur
 .
 .
 ===== Bundle install for All Support Ruby Result =====
-ruby-2.5.8: 0
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
+ruby-3.4.7: 0
 ======================================================
 ```
 
-If specify ruby version `2.6.6` and `2.7.1`
+If specify ruby version `3.2.6` and `3.3.6`
 
 ```bash
-/bin/bash devscript/all_support_ruby.sh bundle 2.6.6 2.7.1
+/bin/bash devscript/all_support_ruby.sh bundle 3.2.6 3.3.6
 .
 .
 .
 ===== Bundle install for All Support Ruby Result =====
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
 ======================================================
 ```
 
@@ -233,22 +296,22 @@ ruby-2.7.1: 0
 .
 .
 ===== Rspec for All Support Ruby Result =====
-ruby-2.5.8: 0
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
+ruby-3.4.7: 0
 =============================================
 ```
 
-If specify ruby version `2.6.6` and `2.7.1`
+If specify ruby version `3.2.6` and `3.3.6`
 
 ```bash
-/bin/bash devscript/all_support_ruby.sh rspec 2.6.6 2.7.1
+/bin/bash devscript/all_support_ruby.sh rspec 3.2.6 3.3.6
 .
 .
 .
 ===== Rspec for All Support Ruby Result =====
-ruby-2.6.6: 0
-ruby-2.7.1: 0
+ruby-3.2.6: 0
+ruby-3.3.6: 0
 =============================================
 ```
 
@@ -266,7 +329,7 @@ use Rack::Cors do
 end
 ```
 
-Alternatively you can set CORS headers in a `before` block.
+Alternatively, you can set CORS headers in a `before` block.
 
 ```ruby
 before do

data/lib/r2-oas/app_configuration.rb

@@ -14,7 +14,7 @@ module R2OAS
     DEFAULT_USE_TAG_NAMESPACE = true
     DEFAULT_USE_SCHEMA_NAMESPACE = true
     DEFAULT_SERVER = Server.new
-    DEFAULT_INTERVAL_TO_SAVE_EDITED_TMP_SCHEMA = 15
+    DEFAULT_INTERVAL_TO_SAVE_EDITED_TMP_SCHEMA = 0.5
     DEFAULT_SWAGGER = Swagger.new
     # rubocop:disable Style/MutableConstant
     DEFAULT_HTTP_STATUSES_WHEN_HTTP_METHOD = {

data/lib/r2-oas/configuration/paths_config.rb

@@ -24,7 +24,7 @@ module R2OAS
       def many_paths_file_paths
         @many_paths_file_paths ||= File.read(abs_paths_path).split("\n").each_with_object([]) do |relative_path, result|
           abs_path = File.expand_path("#{@schema_save_dir_path}/paths/#{relative_path}")
-          result.push(abs_path) if FileTest.exists?(abs_path) && FileTest.file?(abs_path)
+          result.push(abs_path) if FileTest.exist?(abs_path) && FileTest.file?(abs_path)
         end.uniq.compact.reject(&:empty?)
       end
 

data/lib/r2-oas/configuration.rb

@@ -80,9 +80,9 @@ module R2OAS
       write_file_or_skip(gitkeep_tasks_helpers_path, '')
 
       if $stdout.string.present?
-        STDOUT.puts $stdout.string
+        $stdout.puts $stdout.string
       else
-        STDOUT.puts "Already Initialized existing oas_docs in #{root_dir_path}"
+        $stdout.puts "Already Initialized existing oas_docs in #{root_dir_path}"
       end
 
       $stdout = old_stdout
@@ -96,15 +96,15 @@ module R2OAS
 
     def load_local_tasks
       tasks_path = File.expand_path("#{root_dir_path}/#{local_tasks_dir_name}")
-      Dir.glob("#{tasks_path}/**/*.rake").sort.each do |file|
-        load file if FileTest.exists?(file)
+      Dir.glob("#{tasks_path}/**/*.rake").each do |file|
+        load file if FileTest.exist?(file)
       end
     end
 
     def load_local_plugins
       plugins_path = File.expand_path("#{root_dir_path}/#{local_plugins_dir_name}")
-      Dir.glob("#{plugins_path}/**/*.rb").sort.each do |file|
-        require file if FileTest.exists?(file)
+      Dir.glob("#{plugins_path}/**/*.rb").each do |file|
+        require file if FileTest.exist?(file)
       end
     end
 

data/lib/r2-oas/deploy/client.rb

@@ -6,33 +6,94 @@ require 'fileutils'
 module R2OAS
   module Deploy
     class Client < Schema::Base
-      SWAGGER_UI_DIST_URL = 'https://github.com/swagger-api/swagger-ui/trunk/dist'
+      # Get master branch tarball from GitHub API
+      SWAGGER_UI_TARBALL_URL = 'https://api.github.com/repos/swagger-api/swagger-ui/tarball/master'
+      FALLBACK_DIST_PATH = File.expand_path('swagger-ui/dist', __dir__).freeze
 
       def initialize(options = {})
-        super(options)
-        @download_dir = "#{SecureRandom.uuid[0..7]}/dist"
-        @dist_path = File.expand_path(Rails.root.join(@download_dir), __FILE__)
+        super
+        @download_dir = SecureRandom.uuid[0..7]
+        @base_dir = File.expand_path(Rails.root.join(@download_dir), __FILE__)
+        @tar_path = File.expand_path(Rails.root.join(@download_dir, 'swagger-ui-master.tar.gz'), __FILE__)
+        @dist_path = nil
+        logger.info("[deploy] initialize: download_dir=#{@download_dir} base_dir=#{@base_dir} tar_path=#{@tar_path}")
       end
 
       def download_swagger_ui_dist
-        system("svn export #{SWAGGER_UI_DIST_URL} #{@dist_path}")
+        logger.info("[deploy] download_swagger_ui_dist: base_dir=#{@base_dir}")
+        FileUtils.mkdir_p(@base_dir)
+
+        curl_ok = system("curl -fsSL -o #{@tar_path} #{SWAGGER_UI_TARBALL_URL}")
+        logger.info("[deploy] curl result: ok=#{curl_ok} url=#{SWAGGER_UI_TARBALL_URL} -> #{@tar_path}")
+        unless curl_ok
+          logger.warn("[deploy] failed to download swagger-ui. using fallback dist: #{FALLBACK_DIST_PATH}")
+          @dist_path = FALLBACK_DIST_PATH if Dir.exist?(FALLBACK_DIST_PATH)
+          return @dist_path && Dir.exist?(@dist_path)
+        end
+
+        tar_ok = system("tar -xzf #{@tar_path} -C #{@base_dir}")
+        logger.info("[deploy] tar extract result: ok=#{tar_ok} tar=#{@tar_path} dest=#{@base_dir}")
+        unless tar_ok
+          logger.warn("[deploy] failed to extract swagger-ui tarball. using fallback dist: #{FALLBACK_DIST_PATH}")
+          @dist_path = FALLBACK_DIST_PATH if Dir.exist?(FALLBACK_DIST_PATH)
+          return @dist_path && Dir.exist?(@dist_path)
+        end
+
+        # Find the actual dist directory after extraction
+        # GitHub tarball extracts to swagger-api-swagger-ui-<sha>/dist/
+        extracted_dirs = Dir.glob(File.join(@base_dir, 'swagger-api-swagger-ui-*'))
+        logger.info("[deploy] extracted_dirs: #{extracted_dirs}")
+
+        if extracted_dirs.empty?
+          # Fallback: check if dist exists directly
+          dist_path = File.join(@base_dir, 'dist')
+          logger.info("[deploy] check direct dist: #{dist_path} exists=#{Dir.exist?(dist_path)}")
+        else
+          dist_path = File.join(extracted_dirs.first, 'dist')
+          logger.info("[deploy] check versioned dist: #{dist_path} exists=#{Dir.exist?(dist_path)}")
+        end
+        @dist_path = File.expand_path(dist_path) if Dir.exist?(dist_path)
+
+        unless @dist_path && Dir.exist?(@dist_path)
+          logger.warn("[deploy] failed to find dist directory in extracted archive. using fallback dist: #{FALLBACK_DIST_PATH}")
+          @dist_path = FALLBACK_DIST_PATH if Dir.exist?(FALLBACK_DIST_PATH)
+          return @dist_path && Dir.exist?(@dist_path)
+        end
+
+        logger.info("[deploy] dist_path detected: #{@dist_path}")
+
+        true
       end
 
       def deploy
+        logger.info('[deploy] start deploy')
         copy_swagger_ui_dist
         copy_swagger_ui_index
         copy_oas_doc_file
       ensure
+        logger.info('[deploy] cleanup download artifacts')
         remove_download_dist
       end
 
       private
 
       def copy_swagger_ui_dist
+        # Use fallback dist if @dist_path is not set
+        unless @dist_path
+          if Dir.exist?(FALLBACK_DIST_PATH)
+            logger.warn("[deploy] @dist_path not set. using fallback dist: #{FALLBACK_DIST_PATH}")
+            @dist_path = FALLBACK_DIST_PATH
+          else
+            raise 'dist directory not found and fallback dist does not exist. Please call download_swagger_ui_dist first.'
+          end
+        end
+
         docs_path = File.expand_path(Rails.root.join(deploy_dir_path), __FILE__)
-        FileUtils.mkdir_p(docs_path) unless FileTest.exists?(docs_path)
-        FileUtils.mkdir_p(@dist_path) unless FileTest.exists?(@dist_path)
-        FileUtils.cp_r(@dist_path, docs_path)
+        dist_dest_path = File.join(docs_path, 'dist')
+        logger.info("[deploy] copy dist: src=#{@dist_path} dest=#{dist_dest_path}")
+        FileUtils.mkdir_p(File.dirname(dist_dest_path))
+        FileUtils.rm_rf(dist_dest_path)
+        FileUtils.cp_r(@dist_path, dist_dest_path)
       end
 
       def copy_swagger_ui_index
@@ -41,29 +102,24 @@ module R2OAS
         template_path = File.expand_path('swagger-ui/index.html.erb', __dir__)
         template = File.read(template_path)
         index = make_index(template)
+        logger.info("[deploy] write index.html: path=#{index_path} schema_file=#{@schema_file_path}")
         File.write(index_path, index)
       end
 
       def copy_oas_doc_file
         swagger_file_path = File.expand_path(Rails.root.join(deploy_dir_path, doc_save_file_name), __FILE__)
         oas_doc_file_path = File.expand_path(output_path)
+        logger.info("[deploy] copy oas doc: src=#{oas_doc_file_path} dest=#{swagger_file_path}")
         FileUtils.cp_r(oas_doc_file_path, swagger_file_path)
       end
 
       def remove_download_dist
-        FileUtils.rm_rf(File.expand_path('..', @dist_path))
+        logger.info("[deploy] remove temp: base_dir=#{@base_dir}")
+        FileUtils.rm_rf(@base_dir) if @base_dir && Dir.exist?(@base_dir)
       end
 
-      # [ref]
-      # https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Lint/ErbNewArguments
       def make_index(template)
-        if RUBY_VERSION >= '2.6'
-          ERB.new(template, trim_mode: '%').result(binding)
-        else
-          # rubocop:disable Lint/ErbNewArguments
-          ERB.new(template, nil, trim_mode: '%').result(binding)
-          # rubocop:enable Lint/ErbNewArguments
-        end
+        ERB.new(template, trim_mode: '%').result(binding)
       end
     end
   end