sumire 24.03.31 → 24.04.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de68f31761206015fad844eb5b09054a51dc52edb88b1e72e9730f0889e95c56
-  data.tar.gz: 85395b3f6d1c7a2305f333718fbf7ff0753c4314940989af2bf62030c3078064
+  metadata.gz: 163fa9383b3591e43b8f8d3cb814bd7b44c2037ffce0c92c49be26c1c4dbf238
+  data.tar.gz: 737005aa5b6552b7734294c754f4b68284ae77ddc296194d9f7f20cc2fab2fa9
 SHA512:
-  metadata.gz: c05ba6d0cea2755c9c91ee86e1342d31a366ad8ef55f15d08647c3dd72e4e57e7d77268318437c9ea0a82db892f0e2f474af9b1e87edc14e4eb7b97b577d329f
-  data.tar.gz: 90da7a33132ed5b254e3bb146857a618d79ab6a27f3dfbb7ab9c8d6bd4649cd49210ec1c5602a0e91c5b36493b8da05d67d6d7077500f370b50e62f1beeb4f4b
+  metadata.gz: e3baf3169714078dbbec1955c6daa676c47e62817f860db115ccf31d2333780eea5fac79459eb841af67ebb488c2d22462ca2bdf93dda542a4fa51eb95a9517d
+  data.tar.gz: 5a914c0381618108d77c6c3e575debc97c9d8a09c72a75b372a965032b2ed6eeb0662995872d60b0072d307c50f5de502fa8d4694b1ed238d7dbc529ac71c6f3

data/exe/sumire

@@ -22,7 +22,8 @@ require "fileutils"
     "save_to": "Save to: ",
     "version_info": "Display version information",
     "arg_command": "Run the command rather than an interactive shell",
-    "license_info": "Displays license information"
+    "license_info": "Displays license information",
+    "legacy": "Enable legacy mode"
   },
   "ja": {
     "arg_less_one": "引数の個数は 1 個以下でなければなりません",
@@ -37,7 +38,8 @@ require "fileutils"
     "save_to": "保存先: ",
     "version_info": "バージョン情報を表示します",
     "arg_command": "コマンドではなくシェルを実行します",
-    "license_info": "ソフトウェアのライセンス情報を表示します"
+    "license_info": "ソフトウェアのライセンス情報を表示します",
+    "legacy": "レガシーモードを有効にします"
   }
 }
 
@@ -57,17 +59,7 @@ def main(**kwargs)
   command = command ? " -c \"#{command}\"" : ""
 
   verbose = kwargs[:verbose] || false
-
-  unless verbose
-    processes = Sys::ProcTable.ps
-    processes.each do |process|
-      next unless process.cmdline.match(/^script/)
-
-      warn("#{comment(:exist_process)}\n\n")
-      warn("\e[32mkill #{process.pid}\e[0m")
-      exit(false)
-    end
-  end
+  legacy = kwargs[:legacy] || false
 
   dst = "#{dir}/#{Time.now.strftime("%Y%m%d_%H%M%S")}.log"
   dst = File.expand_path(dst)
@@ -75,15 +67,15 @@ def main(**kwargs)
   puts(dst)
   puts(comment(:start_recording))
 
-  FileUtils.mkdir_p("/tmp/sumire")
-  tmp = "/tmp/sumire/#{SecureRandom.uuid}.log"
+  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)
+    Sumire::Sumire.exec(destination: dst, target: tmp, verbose: verbose, legacy: legacy)
   end
   thread.join if verbose
 
-  script_cmd = "script -f #{tmp}#{command}"
+  script_cmd = "script -q -f #{tmp}#{command}"
   system(script_cmd) unless verbose
 
   puts(comment(:EOR))
@@ -91,6 +83,7 @@ end
 
 opt = OptionParser.new
 verbose = false
+legacy = false
 dir = "."
 cmd = nil
 
@@ -116,6 +109,10 @@ 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
@@ -123,4 +120,4 @@ rescue OptionParser::InvalidOption
   exit(false)
 end
 
-main(directory: dir, verbose: verbose, command: cmd)
+main(directory: dir, verbose: verbose, command: cmd, legacy: legacy)

data/lib/sumire/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sumire
-  VERSION = "24.03.31"
+  VERSION = "24.04.03"
 
   COPYRIGHT = <<~COPYRIGHT_TEXT
     The MIT License (MIT)

data/lib/sumire.rb

@@ -8,12 +8,49 @@ module Sumire
   class Error < StandardError; end
 
   class Sumire # rubocop:disable Style/Documentation
+    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)
+      legacy = kwargs[:legacy] || false
       destination = kwargs[:destination]
       if destination.nil?
-        FileUtils.mkdir_p("/tmp/sumire")
-        destination = "/tmp/sumire/#{SecureRandom.uuid}.log"
+        uuid = SecureRandom.uuid
+        FileUtils.mkdir_p("/tmp/sumire/#{uuid}")
+        destination = "/tmp/sumire/#{uuid}/typescript"
       end
       target = kwargs[:target]
       target = "typescript" if target.nil?
@@ -34,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
@@ -65,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.31
+  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