Skip to content

Commit bf91206

Browse files
committed
refactor: test/ディレクトリをscripts/utils/に移動してプロジェクト構造を整理
- test/ディレクトリには実際のテストではなく開発ユーティリティが含まれていた - scripts/utils/により適切な場所に移動 - smart_wait_helper.rbの重複を解消(scripts/に統一) - 全てのrequire_relative パスを更新 - ドキュメント内のパス参照を修正 これにより: - spec/: RSpecテスト用 - scripts/: 本番スクリプト - scripts/utils/: 開発・デバッグ用ユーティリティ という明確な構造になった
1 parent 19ac4df commit bf91206

13 files changed

+16
-131
lines changed

docs/plan_github_action_initialize.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ permissions:
609609
### 1. Ruby IPAddr検証テスト
610610
611611
```ruby
612-
# test/test_ip_validation.rb
612+
# scripts/utils/test_ip_validation.rb
613613
require 'minitest/autorun'
614614
require 'ipaddr'
615615

docs/plan_initialize_server.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ SACLOUD_ACCESS_TOKEN_SECRET=xxxxx
204204
### 実証済みテスト結果
205205

206206
```ruby
207-
# test/test_regex_patterns.rb
207+
# scripts/utils/test_regex_patterns.rb
208208
# 20件の実際のIssueでテスト
209209
# 結果: 95%成功率(19/20件)
210210
```
@@ -213,10 +213,10 @@ SACLOUD_ACCESS_TOKEN_SECRET=xxxxx
213213

214214
```bash
215215
# 正規表現パターンのテスト
216-
ruby test/test_regex_patterns.rb
216+
ruby scripts/utils/test_regex_patterns.rb
217217

218218
# 実際のIssueでテスト(GitHub CLI必要)
219-
ruby test/test_regex_patterns.rb --real
219+
ruby scripts/utils/test_regex_patterns.rb --real
220220

221221
# ドライランで動作確認
222222
ruby scripts/initialize_server.rb --dry-run https://github.com/coderdojo-japan/dojopaas/issues/249

docs/plan_rakefile_migration.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ ls scripts/
1515
deploy.rb initialize_server.rb sakura_server_user_agent.rb smart_wait_helper.rb
1616
# 「これ何?実行していいの?引数は?」
1717

18-
$ ls test/
18+
$ ls scripts/utils/
1919
check_server_status.rb find_resources.rb test_regex_patterns.rb ...
2020
# 「テスト?ツール?どっち?」
2121
```
@@ -172,7 +172,7 @@ namespace :server do
172172

173173
desc "Check server status"
174174
task :status, [:name] do |t, args|
175-
sh "ruby test/check_server_status.rb #{args[:name]}"
175+
sh "ruby scripts/utils/check_server_status.rb #{args[:name]}"
176176
end
177177
end
178178

@@ -191,12 +191,12 @@ namespace :test do
191191
desc "Find test resources by pattern"
192192
task :find_resources, [:pattern] do |t, args|
193193
pattern = args[:pattern] || ""
194-
sh "ruby test/find_resources.rb #{pattern}"
194+
sh "ruby scripts/utils/find_resources.rb #{pattern}"
195195
end
196196

197197
desc "Verify server setup and connectivity"
198198
task :verify, [:ip] => [:validate_ip] do |t, args|
199-
sh "ruby test/verify_server_setup.rb #{args[:ip]}"
199+
sh "ruby scripts/utils/verify_server_setup.rb #{args[:ip]}"
200200
end
201201
end
202202
```

test/check_server_status.rb renamed to scripts/utils/check_server_status.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ruby
22

33
require 'dotenv/load'
4-
require_relative '../scripts/sakura_server_user_agent.rb'
4+
require_relative '../sakura_server_user_agent.rb'
55

66
if ARGV.empty?
77
puts "使い方: ruby #{$0} <サーバー名の一部>"

test/check_startup_scripts.rb renamed to scripts/utils/check_startup_scripts.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# 利用可能なスタートアップスクリプト(Noteリソース)を調査
44

55
require 'dotenv/load'
6-
require_relative '../scripts/sakura_server_user_agent.rb'
6+
require_relative '../sakura_server_user_agent.rb'
77

88
params = {
99
zone: "31002",
File renamed without changes.

test/find_resources.rb renamed to scripts/utils/find_resources.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# bundle exec ruby find_resources.rb (全て表示)
88

99
require 'dotenv/load'
10-
require_relative '../scripts/sakura_server_user_agent.rb'
10+
require_relative '../sakura_server_user_agent.rb'
1111
require 'time'
1212

1313
# 環境変数のチェック

test/start_server.rb renamed to scripts/utils/start_server.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# サーバーを起動するスクリプト
44

55
require 'dotenv/load'
6-
require_relative '../scripts/sakura_server_user_agent.rb'
7-
require_relative 'smart_wait_helper'
6+
require_relative '../sakura_server_user_agent.rb'
7+
require_relative '../smart_wait_helper'
88

99
include SmartWaitHelper
1010

File renamed without changes.

test/test_with_packet_filter.rb renamed to scripts/utils/test_with_packet_filter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# 通常版Ubuntu 24.04 + disk/config API + @notes + パケットフィルター
55

66
require 'dotenv/load'
7-
require_relative '../scripts/sakura_server_user_agent.rb'
7+
require_relative '../sakura_server_user_agent.rb'
88

99
# SSH公開鍵を読み込み
1010
ssh_public_key_path = ENV['SSH_PUBLIC_KEY_PATH'] || File.expand_path('~/.ssh/id_rsa.pub')

0 commit comments

Comments
 (0)