suiren 24.04.04 → 24.04.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e1c34467b9eba28fb90e1b2f3fa60073451aee64cbca79eca0c2141211a6ab3
-  data.tar.gz: 1cbb52b6fad8385d65f8085b3241b4ef85a284951567ae89f0442763dedde7e7
+  metadata.gz: 32116deb0430edc9dc55077ec2dcf2b38252d90059086de70b802079c4505e26
+  data.tar.gz: 667d73a2f4f00fc2312c2e1a82d674326f651eb9a8bef3839dbde0de43572228
 SHA512:
-  metadata.gz: 14026c13c6760ab4e56470b7e48870ec363e7caa05662f26ad6c6f65058fd9841bf00c5164c1cce7484c6e329d2dd745760a3586427693bdab450957d28ba4f3
-  data.tar.gz: 138a553254a7a0a3ba1a8cdca10e6ff201843a7f9a1fcbd6c05731318860d71a94170acac0772b63418d37b6f9298af295b50c68d81b185c54f3065c86b747cc
+  metadata.gz: ec9ec5fe1df6bd20b5f58c8e91f5c3afad7006a4e91acfa48298b2dbf5c9755775e8242876378d212645975474b18a141d5a0692e84257c03c76e52eda05079a
+  data.tar.gz: 8ff2761781314d54cfc0d0ba55783e9169b495ab87dca7981c691526ea923566db14d5d7dee6808c8efaa77f8c1e050766fafacfc84a4a50b40bb27ccc708be7

data/README.en_US.md

@@ -0,0 +1,60 @@
+
+
+
+# suiren
+suiren is a command-line tool for displaying HTTP requests.
+
+## Installation
+### Install the gem
+
+```bash
+gem install suiren
+```
+
+### Add to your package
+```bash
+bundle add suiren
+```
+
+## Usage
+suiren supports both Japanese and English.
+
+To run it in Japanese, use:
+
+```bash
+LANG=ja_JP.UTF-8 suiren
+```
+
+To run it in English, use:
+
+```bash
+LANG= suiren
+```
+
+To run it in Taiwanese, use:
+
+```bash
+LANG=zh_TW.UTF-8 suiren
+```
+
+System Language Override.
+
+### See how to use
+```bash
+$ suiren -h
+Usage: suiren [options]
+    -V, --version                    Display Version Information
+        --license                    Display License Information
+        --bind-address [Bind Address]
+                                     Set Bind Address
+    -p, --port [Port]                Port Number
+    -c, --content [Content]          Set Content to Reply
+```
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/Himeyama/suiren.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/README.md

@@ -1,35 +1,59 @@
-# Suiren
+# suiren (睡蓮)
+suiren はコマンドを HTTP リクエストを表示するコマンドです。
 
-TODO: Delete this and the text below, and describe your gem
+![image](https://github.com/Himeyama/suiren/assets/39254183/7d373c5a-8bc9-4f15-ae79-c49333f5e649)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/suiren`. To experiment with that code, run `bin/console` for an interactive prompt.
+## インストールについて
+### gem のインストール
 
-## Installation
+```bash
+gem install suiren
+```
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+### パッケージに追加
+```bash
+bundle add suiren
+```
 
-Install the gem and add to the application's Gemfile by executing:
+## 使用法
+suiren は日本語と英語と台湾語に対応しています。
 
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+日本語で使用する場合:
 
-If bundler is not being used to manage dependencies, install the gem by executing:
+```bash
+LANG=ja_JP.UTF-8 suiren
+```
 
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_IMMEDIATELY_AFTER_RELEASE_TO_RUBYGEMS_ORG
+英語で使用する場合:
 
-## Usage
+```bash
+LANG= suiren
+```
 
-TODO: Write usage instructions here
+台湾語で使用する場合:
 
-## Development
+```bash
+LANG=zh_TW.UTF-8 bundle exec suiren
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+システムの言語が優先されます。
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### 使い方を見る
+```bash
+$ suiren -h
+Usage: suiren [options]
+    -V, --version                    バージョン情報を表示します
+        --license                    ライセンス情報を表示します
+        --bind-address [Bind Address]
+                                     Bind アドレスを設定します
+    -p, --port [Port]                ポート番号
+    -c, --content [Content]          返信するコンテンツを設定します
+```
 
-## Contributing
+## 貢献
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/suiren.
+バグレポートとプルリクエストは https://GitHub.com/Himeyama/suiren で行うことができます。
 
-## License
+## ライセンス
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+この gem は、[MIT ライセンス](https://opensource.org/licenses/MIT) の条件の下でオープンソースとして利用できます。

data/README.zh_TW.md

@@ -0,0 +1,56 @@
+# suiren
+suiren 是一個用於顯示 HTTP 請求的命令行工具。
+
+## 安裝
+### 安裝 gem
+
+```bash
+gem install suiren
+```
+
+### 添加到您的專案
+```bash
+bundle add suiren
+```
+
+## 使用方法
+suiren 支援台灣語和日語和英語。
+
+要在台灣語中運行，請使用:
+
+```bash
+LANG=zh_TW.UTF-8 suiren
+```
+
+要在日語中運行，請使用:
+
+```bash
+LANG=ja_JP.UTF-8 suiren
+```
+
+要在英語中運行，請使用:
+
+```bash
+LANG= suiren
+```
+
+系統語言覆蓋。
+
+### 查看如何使用
+```bash
+$ suiren -h
+Usage: suiren [options]
+    -V, --version                    顯示版本資訊
+        --license                    顯示許可證資訊
+        --bind-address [Bind Address]
+                                     設定綁定地址
+    -p, --port [Port]                埠號
+    -c, --content [Content]          設定回覆內容
+```
+
+## 貢獻
+
+歡迎在 GitHub 上報告錯誤和提交拉取請求: https://github.com/Himeyama/suiren
+
+## 許可證
+該 gem 可根據 [MIT 許可證](https://opensource.org/licenses/MIT) 作為開源軟件使用。

data/exe/suiren

@@ -4,60 +4,39 @@
 require "suiren"
 require "optparse"
 
-@i18n = {
-  "en": {
-    "port": "Port number",
-    "version_info": "Displays version information",
-    "license_info": "Displays license information",
-    "bind_addr": "Set the bind address",
-    "content": "Set the content to reply to"
-  },
-  "ja": {
-    "port": "ポート番号",
-    "version_info": "バージョン情報を表示します",
-    "license_info": "ライセンス情報を表示します",
-    "bind_addr": "Bind アドレスを設定します",
-    "content": "返信するコンテンツを設定します"
-  }
-}
-
-def i18n(tag)
-  lang = :en
-  lang = :ja if ENV["LANG"].downcase.include?("ja")
-  @i18n[lang][tag]
-end
+Suiren::Suiren.init_i18n
 
 opt = OptionParser.new
 bind_addr = "localhost"
 port = 8080
 content = String.new
 
-opt.on("-V", "--version", i18n(:version_info)) do |_v|
+opt.on("-V", "--version", I18n.t("version_info")) do |_v|
   puts("#{File.basename($PROGRAM_NAME)} (#{Suiren::VERSION})")
   exit(true)
 end
 
-opt.on("--license", i18n(:license_info)) do |_v|
+opt.on("--license", I18n.t("license_info")) do |_v|
   puts(Suiren::COPYRIGHT)
   exit(true)
 end
 
-opt.on("--bind-address [Bind Address]", i18n(:bind_addr)) do |addr|
+opt.on("--bind-address [Bind Address]", I18n.t("bind_addr")) do |addr|
   bind_addr = addr
 end
 
-opt.on("-p [Port]", "--port", i18n(:port)) do |p|
+opt.on("-p [Port]", "--port", I18n.t("port")) do |p|
   port = p.to_i
 end
 
-opt.on("-c [Content]", "--content", i18n(:content)) do |cont|
+opt.on("-c [Content]", "--content", I18n.t("content")) do |cont|
   content = cont
 end
 
 begin
   opt.parse!(ARGV)
 rescue OptionParser::InvalidOption
-  warn(comment(:option_not_appropriate))
+  warn(I18n.t("option_not_appropriate"))
   exit(false)
 end
 

data/lib/suiren/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Suiren
-  VERSION = "24.04.04"
+  VERSION = "24.04.09"
 
   COPYRIGHT = <<~COPYRIGHT_TEXT
     The MIT License (MIT)

data/lib/suiren.rb

@@ -4,14 +4,31 @@ require_relative "suiren/version"
 require "socket"
 require "json"
 require "stringio"
+require "io/console/size"
+require "i18n"
 
 module Suiren
   class Error < StandardError; end
 
   class Suiren # rubocop:disable Style/Documentation
+    def self.init_i18n
+      I18n.load_path = ["#{__dir__}/translation.yml"]
+      I18n.locale = :en
+      I18n.locale = :ja if ENV["LANG"].downcase =~ /^ja/
+      I18n.locale = :zh_TW if ENV["LANG"].downcase =~ /^zh_tw/
+    end
+
     def initialize(host, port, content: "") # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-      server = TCPServer.new(host, port)
-      puts("サーバーが http://#{host}:#{port} で実行中です\n\n")
+      self.class.init_i18n
+
+      begin
+        server = TCPServer.new(host, port)
+      rescue Errno::EADDRINUSE
+        warn("\e[31;1m#{I18n.t("address_already")}\e[0m")
+        exit(false)
+      end
+
+      puts(format("#{I18n.t("server_running")}\n\n", host, port))
       uplen = 0
 
       loop do # rubocop:disable Metrics/BlockLength
@@ -31,21 +48,26 @@ module Suiren
         headers = {}
         keys = []
 
-        puts("[#{time}]")
+        puts("\e[36m#{I18n.t("teception_time")}: \e[36;1m#{time}\e[0m")
+
         while (line = io.gets)
           break if line.strip.empty?
 
           match = line.match(/^(.+):\s(.+)$/)
           break unless match
 
-          key = match[1]
+          key = match[1].chomp
           keys.append(key)
-          value = match[2]
+          value = match[2].chomp
           max_key_len = key.size if max_key_len < key.size
           max_value_len = value.size if max_value_len < value.size
           headers[key.strip] = value.strip
         end
 
+        _height, width = IO.console_size
+        max_value_len_window = width - max_key_len - 7 # 2 列目の長さ (ウィンドウ制限)
+        max_value_len = max_value_len_window if max_value_len > max_value_len_window
+
         request_line_format = "%-#{max_key_len + max_value_len + 3}s"
         puts "+#{"-" * (max_key_len + max_value_len + 5)}+"
         puts "| #{request_line_format % request_line.chop} |"
@@ -54,10 +76,14 @@ module Suiren
         border = "+#{"-" * (max_key_len + 2)}+#{"-" * (max_value_len + 2)}+"
         puts border
         keys.each do |key| # rubocop:disable Lint/ShadowingOuterLocalVariable
-          puts "| #{key_format % key} | #{value_format % headers[key]} |"
+          keys_line = headers[key].scan(/.{1,#{max_value_len}}/)
+          keys_line.each.with_index do |value_line, i|
+            puts "| #{key_format % (i.eql?(0) ? key : "")} | #{value_format % value_line} |"
+          end
+          # puts "| #{key_format % key} | #{value_format % headers[key]} |"
         end
         puts "#{border}\n"
-        body = "#{io.read}\n"
+        body = "#{io.read}\n\n"
         puts body
         uplen = headers.size + 5 + body.lines.size
 

data/lib/translation.yml

@@ -0,0 +1,27 @@
+ja:
+  teception_time: 受信時刻
+  server_running: サーバーが http://%s:%d で実行中です
+  address_already: アドレスが既に使用されています
+  port: ポート番号
+  version_info: バージョン情報を表示します
+  license_info: ライセンス情報を表示します
+  bind_addr: Bind アドレスを設定します
+  content: 返信するコンテンツを設定します
+en:
+  teception_time: Reception Time
+  server_running: Server is running at http://%s:%d
+  address_already: Address is already in use
+  port: Port Number
+  version_info: Display Version Information
+  license_info: Display License Information
+  bind_addr: Set Bind Address
+  content: Set Content to Reply
+zh_TW:
+  teception_time: 接收時間
+  server_running: 伺服器正在 http://%s:%d 運行
+  address_already: 地址已在使用中
+  port: 埠號
+  version_info: 顯示版本資訊
+  license_info: 顯示許可證資訊
+  bind_addr: 設定綁定地址
+  content: 設定回覆內容

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: suiren
 version: !ruby/object:Gem::Version
-  version: 24.04.04
+  version: 24.04.09
 platform: ruby
 authors:
 - MURATA Mitsuharu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -48,11 +62,14 @@ extra_rdoc_files: []
 files:
 - ".rubocop.yml"
 - LICENSE.txt
+- README.en_US.md
 - README.md
+- README.zh_TW.md
 - Rakefile
 - exe/suiren
 - lib/suiren.rb
 - lib/suiren/version.rb
+- lib/translation.yml
 - sig/botan.rbs
 homepage: https://github.com/Himeyama/suiren
 licenses: