assayo 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6892ee282b9b6b170c19d5aedfbd900d2037847c8acc92f4bedc00d9bc00a8ed
-  data.tar.gz: 720f3a120844ae4bdb6cf7f12e39c7cdac0f65dbd436e574466b1127cc6be744
+  metadata.gz: 66a62a3ea793b569e22233d954bff82aeade815dff55b6d3dc5fc4cd568ab92c
+  data.tar.gz: '0786a08326588fc58537055525d145d00cf67ca31c5c8fb52e65f6882c83b9aa'
 SHA512:
-  metadata.gz: 94ba49a5ea65707b8312d7f88f19b0e34beff4720209a6f42d303e78fee25de8fc332562c66bea2b03f25eeda0a46921c6eaa570c5d45094cb7361e4c91e17a3
-  data.tar.gz: d98294bf085b25ef3254782fbc8ed5d0b7ee5c4c031f59733e7dede275cc6f9b3c713fa8a4016be09369c55db6906762f686f3887c3a9704bb26664320f9aaa2
+  metadata.gz: 6845051e391bbf1ff04a5ad2d32907f09ebdd016433f38f6640d16c1d1d675f1ea52904c6a67e6e6d5ba7dd45eee035f2552110ae93c668bf3603e333104a208
+  data.tar.gz: 5be0facf3b010a88b93c31d6fd95646170a43315272dba80ed36f82c7711063f4006ee8d04cfa9dc365843bea5c1be0e098c4e2b6a6bd18da3d6ab7dd81d6834

data/ruby/assayo

@@ -1,61 +1,125 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-def get_save_log_command()
-  $raw = "--raw --numstat"
-  if ARGV.include?('--no-file')
-    $raw = ""
-  end
-  return "git --no-pager log #{$raw} --oneline --all --reverse --date=iso-strict --pretty=format:\"%ad>%aN>%aE>%s\""
-end
+require 'fileutils'
+require 'etc'
 
-def show_message(message)
-  if ARGV.include?('--debug')
-    puts "Assayo: #{message}"
-  end
-end
+module Assayo
+  module LoggerMixin
+    private
 
-def write_in_file(fileName, content)
-  File.open(fileName, 'w') do |file|
-    file.write(content)
-  end
-end
+    def debug_enabled?
+      ARGV.include?('--debug')
+    end
 
-def create_report()
-  # folder, when library was saved
-  $SOURCE_DIR = '../assayo'
-  $SOURCE_PATH = __dir__
-
-  # folder, when user run library
-  $DIST_DIR = 'assayo'
-  $DIST_PATH = Dir.pwd
-
-  # 1. Copy folder ./assayo from package to ./assayo in project
-  $source = File.join($SOURCE_PATH, $SOURCE_DIR)
-  $target = File.join($DIST_PATH, $DIST_DIR)
-  $copy_cmd = "cp -r #{$source} #{$target}"
-  begin
-    system($copy_cmd) or raise $copy_cmd
-  rescue => e
-    puts "Assayo: cant copy files: #{e.message}"
+    def debug(message)
+      return unless debug_enabled?
+      warn "[Assayo][DEBUG] #{message}"
+    end
   end
-  show_message("directory with HTML report was be created")
-
-  # Run "git log" and save output in file ./assayo/log.txt
-  show_message("reading git log was be started")
-  $fileName = File.join(Dir.pwd, $DIST_DIR, "log.txt")
-  $save_log_cmd = get_save_log_command()
-  begin
-    system($save_log_cmd, { out: $fileName }) or raise $save_log_cmd
-  rescue => e
-    puts "Assayo: cant create log file: #{e.message}"
-  end
-  show_message("the file with git log was be saved")
 
-  # 3. Replace symbols in ./assayo/log.txt
-  $content = IO.read($fileName)
-  $content = $content.gsub(/`/, "")
-  $content = $content.gsub(/\$/, "")
-  write_in_file($fileName, "R(f\`#{$content}\`);")
+  class Reporter
+    LIB_SOURCE_RELATIVE = '../assayo'.freeze
+    DIST_DIR_NAME = 'assayo'.freeze
+    TEMP_LOG_FILENAME = 'log.txt'.freeze
+
+    include LoggerMixin
+
+    GIT_FORMAT = '%ad>%aN>%aE>%s'.freeze
+    DANGEROUS_CHARS = /[\\`$%\x00-\x1f\x7f]/.freeze
+
+    def initialize
+      @script_dir = File.expand_path(__dir__)
+    end
+
+    # Точка входа
+    def run
+      copy_library_files
+      generate_git_log
+      assemble_final_payload
+      debug("Report generation finished successfully.")
+    rescue StandardError => e
+      abort "Assayo: Fatal error — #{e.class}: #{e.message}"
+    end
+
+    private
+
+    def source_path
+      @source_path ||= File.expand_path(LIB_SOURCE_RELATIVE, @script_dir)
+    end
+
+    def dist_path
+      @dist_path ||= File.join(Dir.pwd, DIST_DIR_NAME)
+    end
+
+    def log_file_path
+      @log_file_path ||= File.join(dist_path, TEMP_LOG_FILENAME)
+    end
+
+    # Копирование ассетов отчета
+    def copy_library_files
+      raise "Source directory not found at '#{source_path}'" unless Dir.exist?(source_path)
+      
+      FileUtils.mkdir_p(dist_path) unless Dir.exist?(dist_path)
+      debug("Copying assets from '#{source_path}' to '#{dist_path}'")
+      FileUtils.cp_r("#{source_path}/.", dist_path, remove_destination: true)
+    rescue SystemCallError => e
+      raise IOError, "Failed to copy library files: #{e.message}"
+    end
+
+    def generate_git_log
+      cmd = build_git_command
+      debug("Spawning process: #{cmd.shelljoin}")
+
+      begin
+        File.open(log_file_path, 'w') do |file|
+          Open3.popen2e(*cmd) do |stdin, stdout_err, wait_thr|
+            stdin.close
+            stdout_err.each_line { |line| file.write(line) }
+            
+            exit_status = wait_thr.value
+            unless exit_status.success?
+              raise RuntimeError, "Git exited with code #{exit_status.exitstatus}"
+            end
+          end
+        end
+        debug("Raw git log streamed to '#{log_file_path}'")
+      rescue Errno::ENOENT
+        raise "Executable 'git' not found in PATH."
+      end
+    end
+
+    def build_git_command
+      base_args = %w[git --no-pager log --oneline --all --reverse --date=iso-strict]
+      base_args << '--raw' << '--numstat' unless ARGV.include?('--no-file')
+      base_args.concat(%W[--pretty=format:#{GIT_FORMAT}])
+      base_args
+    end
+
+    def assemble_final_payload
+      debug('Assembling final payload...')
+      
+      output_lines = +'R(f`'
+      File.foreach(log_file_path, encoding: 'UTF-8') do |line|
+        sanitized = line.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
+                             .gsub(DANGEROUS_CHARS, '')
+                             .chomp
+        next if sanitized.empty?
+        
+        output_lines << sanitized << "\n"
+      end
+      output_lines.chomp! # Убираем лишний перевод строки перед закрывающим тегом
+      output_lines << '`)'
+
+      File.binwrite(log_file_path, output_lines)
+      debug('Final payload assembled and written.')
+    rescue SystemCallError => e
+      raise IOError, "Failed during assembly or write of final payload: #{e.message}"
+    end
+  end
 end
 
-create_report()
+if __FILE__ == $PROGRAM_NAME
+  reporter = Assayo::Reporter.new
+  reporter.run
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assayo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Aleksei Bakhirev
 autorequire:
 bindir: ruby
 cert_chain: []
-date: 2026-08-14 00:00:00.000000000 Z
+date: 2026-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Visualization and analysis you git log. Creates HTML report about commits
   statistics, employees and company. Also it parse git log and give a achievements
@@ -190,11 +190,19 @@ files:
 - assayo/assets/map/map.png
 - assayo/assets/menu/branch.svg
 - assayo/assets/menu/building.svg
+- assayo/assets/menu/common.svg
 - assayo/assets/menu/company.svg
 - assayo/assets/menu/country.svg
+- assayo/assets/menu/day.svg
 - assayo/assets/menu/department.svg
 - assayo/assets/menu/email.svg
+- assayo/assets/menu/feat.svg
+- assayo/assets/menu/files.svg
+- assayo/assets/menu/files_ext.svg
+- assayo/assets/menu/files_remove.svg
+- assayo/assets/menu/hours.svg
 - assayo/assets/menu/logout.svg
+- assayo/assets/menu/month.svg
 - assayo/assets/menu/per_money.svg
 - assayo/assets/menu/per_speed.svg
 - assayo/assets/menu/print.svg
@@ -205,21 +213,13 @@ files:
 - assayo/assets/menu/release.svg
 - assayo/assets/menu/setting.svg
 - assayo/assets/menu/share.svg
-- assayo/assets/menu/team_common.svg
-- assayo/assets/menu/team_day.svg
-- assayo/assets/menu/team_feat.svg
-- assayo/assets/menu/team_files.svg
-- assayo/assets/menu/team_files_ext.svg
-- assayo/assets/menu/team_files_remove.svg
-- assayo/assets/menu/team_hours.svg
-- assayo/assets/menu/team_month.svg
-- assayo/assets/menu/team_tasks.svg
-- assayo/assets/menu/team_type.svg
-- assayo/assets/menu/team_week.svg
-- assayo/assets/menu/team_words.svg
-- assayo/assets/menu/team_work.svg
-- assayo/assets/menu/team_work_2.svg
+- assayo/assets/menu/tasks.svg
+- assayo/assets/menu/type.svg
 - assayo/assets/menu/vacation.svg
+- assayo/assets/menu/week.svg
+- assayo/assets/menu/words.svg
+- assayo/assets/menu/work.svg
+- assayo/assets/menu/work_2.svg
 - assayo/assets/notifications/alert.svg
 - assayo/assets/notifications/fact.svg
 - assayo/assets/notifications/info.svg