sumire 24.03.30 → 24.04.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16de0e198ae8999524f348b21c2795b12fbaadb35d889b4396e8ac7b3741ee9
-  data.tar.gz: fac8e873d7eca4cbbbcb79533befddd719f34708b43ecce6390f28498b361764
+  metadata.gz: 163fa9383b3591e43b8f8d3cb814bd7b44c2037ffce0c92c49be26c1c4dbf238
+  data.tar.gz: 737005aa5b6552b7734294c754f4b68284ae77ddc296194d9f7f20cc2fab2fa9
 SHA512:
-  metadata.gz: e324b6edcef778c876ab4e9575bdca84828cac1fdd8a5c71aebf00cada46b00eca81f4f659430f8d732eda1e1d604da8a0a0bcdbc803daedb6ce309c9da9bacc
-  data.tar.gz: 8fff912fd5b8f2f9bc30533de3db975d4488eadb48b3b27f07af12135a49854df125b272e6b06ff6012982d5b3d1aee157038d496b39ec27fb314d571e08ade2
+  metadata.gz: e3baf3169714078dbbec1955c6daa676c47e62817f860db115ccf31d2333780eea5fac79459eb841af67ebb488c2d22462ca2bdf93dda542a4fa51eb95a9517d
+  data.tar.gz: 5a914c0381618108d77c6c3e575debc97c9d8a09c72a75b372a965032b2ed6eeb0662995872d60b0072d307c50f5de502fa8d4694b1ed238d7dbc529ac71c6f3

data/exe/sumire

@@ -5,6 +5,8 @@ require "sumire"
 require "listen"
 require "optparse"
 require "sys/proctable"
+require "securerandom"
+require "fileutils"
 
 @i18n = {
   "en": {
@@ -17,7 +19,11 @@ require "sys/proctable"
     "EOR": "\e[31;1m■ End of record\e[0m",
     "specify_dir": "Specify the directory",
     "no_directory": "\e[31mDirectory does not exist\e[0m",
-    "save_to": "Save to: "
+    "save_to": "Save to: ",
+    "version_info": "Display version information",
+    "arg_command": "Run the command rather than an interactive shell",
+    "license_info": "Displays license information",
+    "legacy": "Enable legacy mode"
   },
   "ja": {
     "arg_less_one": "引数の個数は 1 個以下でなければなりません",
@@ -29,7 +35,11 @@ require "sys/proctable"
     "EOR": "\e[31;1m■ 記録を終了します\e[0m",
     "specify_dir": "ディレクトリを指定します",
     "no_directory": "\e[31mディレクトリが存在しません\e[0m",
-    "save_to": "保存先: "
+    "save_to": "保存先: ",
+    "version_info": "バージョン情報を表示します",
+    "arg_command": "コマンドではなくシェルを実行します",
+    "license_info": "ソフトウェアのライセンス情報を表示します",
+    "legacy": "レガシーモードを有効にします"
   }
 }
 
@@ -39,57 +49,75 @@ def comment(tag)
   @i18n[lang][tag]
 end
 
-def main(**kwargs) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+# rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity, Lint/MissingCopEnableDirective
+def main(**kwargs)
   dir = kwargs[:directory]
   dir = "." if dir.nil? || dir.empty?
   dir = dir.sub(%r{/\z}, "")
 
-  processes = Sys::ProcTable.ps
-  processes.each do |process|
-    next unless process.cmdline.match(/^script/)
+  command = kwargs[:command]
+  command = command ? " -c \"#{command}\"" : ""
 
-    warn("#{comment(:exist_process)}\n\n")
-    warn("\e[32mkill #{process.pid}\e[0m")
-    exit(false)
-  end
+  verbose = kwargs[:verbose] || false
+  legacy = kwargs[:legacy] || false
 
+  dst = "#{dir}/#{Time.now.strftime("%Y%m%d_%H%M%S")}.log"
+  dst = File.expand_path(dst)
   print(comment(:save_to))
-  puts("#{dir}/#{Time.now.strftime("%Y%m%d_%H%M%S")}.log")
+  puts(dst)
   puts(comment(:start_recording))
-  system("sumire -m #{dir}& script -f")
+
+  tmp = "/tmp/sumire/#{SecureRandom.uuid}/typescript"
+  tmp = Pathname(Dir.pwd).join("typescript").to_path if verbose
+  FileUtils.mkdir_p(Pathname(tmp).dirname.to_path)
+  thread = Thread.new do
+    Sumire::Sumire.exec(destination: dst, target: tmp, verbose: verbose, legacy: legacy)
+  end
+  thread.join if verbose
+
+  script_cmd = "script -q -f #{tmp}#{command}"
+  system(script_cmd) unless verbose
+
   puts(comment(:EOR))
 end
 
 opt = OptionParser.new
+verbose = false
+legacy = false
+dir = "."
+cmd = nil
 
-opt.on("-v", "--verbose", comment(:output_log)) do |_v|
-  Sumire::Sumire.exec(verbose: true)
+opt.on("-V", "--version", comment(:version_info)) do |_v|
+  puts("#{File.basename($PROGRAM_NAME)} (#{Sumire::VERSION})")
   exit(true)
 end
 
-opt.on("-m [Directory]", "--monitor", comment(:save_log)) do |dir|
-  Sumire::Sumire.exec(directory: dir)
+opt.on("--license", comment(:license_info)) do |_v|
+  puts(Sumire::COPYRIGHT)
   exit(true)
 end
 
-opt.on("-d [Directory]", "--directory [Directory]", comment(:specify_dir)) do |dir|
-  if dir.nil?
-    dir = ""
-  elsif !Dir.exist?(dir)
-    warn(comment(:no_directory))
-    exit(false)
-  end
-  main(directory: dir)
-  exit(true)
+opt.on("-v", "--verbose", comment(:output_log)) do |v|
+  verbose = v
 end
 
-opt.on("") do |_v|
-  main
-  exit(true)
+opt.on("-c [Command]", "--command", comment(:arg_command)) do |command|
+  cmd = command
+end
+
+opt.on("-d [Directory]", "--directory", comment(:specify_dir)) do |directory|
+  dir = directory
+end
+
+opt.on("-l", "--legacy", comment(:legacy)) do |_v|
+  legacy = true
 end
 
 begin
   opt.parse!(ARGV)
 rescue OptionParser::InvalidOption
   warn(comment(:option_not_appropriate))
+  exit(false)
 end
+
+main(directory: dir, verbose: verbose, command: cmd, legacy: legacy)

data/lib/sumire/version.rb

@@ -1,5 +1,29 @@
 # frozen_string_literal: true
 
 module Sumire
-  VERSION = "24.03.30"
+  VERSION = "24.04.03"
+
+  COPYRIGHT = <<~COPYRIGHT_TEXT
+    The MIT License (MIT)
+
+    Copyright (c) 2024 MURATA Mitsuharu
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+  COPYRIGHT_TEXT
 end

data/lib/sumire.rb

@@ -2,30 +2,68 @@
 
 require_relative "sumire/version"
 require "ansi2txt"
+require "fileutils"
 
 module Sumire
   class Error < StandardError; end
 
   class Sumire # rubocop:disable Style/Documentation
-    class << self
-      attr_accessor :directory
+    def self.remove_cr(text) # rubocop:disable Metrics/MethodLength
+      chars = text.bytes
+      remove_cr_chars = [0] * chars.length
+      idx = 0
+      chars.map do |chr|
+        if chr.eql?(8)
+          idx -= 1
+          next
+        end
+
+        if chr.eql?(13)
+          idx = 0
+          next
+        end
+        remove_cr_chars[idx] = chr
+        idx += 1
+      end
+      remove_cr_chars.filter { |e| e != 0 }.pack("C*")
+    end
+
+    def self.remove_crs(text, mode: false) # rubocop:disable Metrics/MethodLength
+      if mode
+        begin
+          text.encode!("UTF-16", "UTF-8", invalid: :replace, replace: "")
+          text = text.encode!("UTF-8", "UTF-16")
+          text = text.gsub(/\r+/, "\r").gsub(/\r+\n\r+/, "\n").gsub("\r", "\n") if mode
+        rescue StandardError
+          nil
+        end
+        return text
+      end
+
+      text.split("\n").map { |e| remove_cr(e) }.join("\n")
     end
 
     # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity, Lint/MissingCopEnableDirective
     def self.exec(**kwargs)
-      directory = kwargs[:directory]
-      directory = "." if directory.nil?
+      legacy = kwargs[:legacy] || false
+      destination = kwargs[:destination]
+      if destination.nil?
+        uuid = SecureRandom.uuid
+        FileUtils.mkdir_p("/tmp/sumire/#{uuid}")
+        destination = "/tmp/sumire/#{uuid}/typescript"
+      end
       target = kwargs[:target]
       target = "typescript" if target.nil?
       verbose = kwargs[:verbose] || false
       old_lines = 0
       list = []
       old_text = ""
-      start_time = Time.now.strftime("%Y%m%d_%H%M%S")
+
+      listen_dir = File.dirname(target)
 
       # rubocop:disable Metrics/BlockLength
-      listener = Listen.to(".") do |modified, _added, _removed|
-        if modified.map { |file| File.basename(file) }.include?(target)
+      listener = Listen.to(listen_dir) do |modified, _added, _removed|
+        if modified.include?(target)
           input = File.open(target)
 
           # txt: string
@@ -33,16 +71,22 @@ module Sumire
 
           # Add target text
           add_line_txt = txt[old_text.size...-1]
+          add_line_txt = remove_crs(add_line_txt, mode: legacy)
 
           regex = /Script\sdone\son\s\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}\s\[COMMAND_EXIT_CODE="\d+"\]/
-          exit if !add_line_txt.nil? && add_line_txt.match(regex)
+          begin
+            match = add_line_txt.encode("utf-8", "utf-8").match(regex)
+            exit if !add_line_txt.nil? && match
+          rescue ArgumentError
+            nil
+          end
           next if add_line_txt.nil?
 
-          add_line = add_line_txt.gsub("\n\r", "\n").lines.map(&:chomp).map do |line|
+          add_line = add_line_txt.lines.map(&:chomp).map do |line|
             time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
             "[#{time}] #{line}"
           end
-          add_line_color = add_line_txt.gsub("\n\r", "\n").lines.map(&:chomp).map do |line|
+          add_line_color = add_line_txt.lines.map(&:chomp).map do |line|
             time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
             "\e[32m[#{time}]\e[0m #{line}"
           end
@@ -54,7 +98,7 @@ module Sumire
           if old_lines < new_lines
             add_line.each do |line|
               list.append(line)
-              File.open("#{directory}/#{start_time}.log", "a") do |f|
+              File.open(destination, "a") do |f|
                 f.puts(line)
               end
             end
@@ -64,10 +108,8 @@ module Sumire
                 puts(line)
               end
             end
-
             old_text = txt
           end
-
           old_lines = new_lines
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sumire
 version: !ruby/object:Gem::Version
-  version: 24.03.30
+  version: 24.04.03
 platform: ruby
 authors:
 - MURATA Mitsuharu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi2txt