compare_logs 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1231dd6a6387dab1b7f230036742c38c0315296d2f278679b0c6d973590bea37
-  data.tar.gz: '06117930de01a60aa13ae67ea7e735eafe50e8bfe5bf488af6dfb64a6896db5d'
+  metadata.gz: ed6ef09abaee145c706d044fcb4b44db42557c42306d3a9ba485a095c7408bc3
+  data.tar.gz: f45467b0e724460447a6c81e234ec13ed6491532bd1c2026064e063ae9ed75ba
 SHA512:
-  metadata.gz: c0830e159fc5516a68ed8fc73ef787b5b800c4d4b50a896ac4de0f5faea40abdc8962d5e18a3704e06a84a99581a65d1fec884e464fd4b1ddda2ab8c19f917ea
-  data.tar.gz: da1a0521ac0e78dc9b8592a052de95ffcda02f947d2d2ac1aa99de18dba3c5cd3630db80d50783735dd22c0daea6adc29d4b239f1d18293dd62ccc80b30b2d66
+  metadata.gz: b84a4add4b5d65d2337186cf46efcd4964024e11b401c185b7cf2907845b4f8f8ef5a7f6df5b19e4fc20e082d89b033d58ca588e8ab90732cccfac42df0c2944
+  data.tar.gz: 6e9f928c26e71b04bc9d2244b71b8e01099b2ce292478060a186e411937ee858efd4479e406d8aebee262f43cd90ac957b6aca9b82f86f54409ae1eaa6435c93

data/CHANGELOG.md

@@ -1,5 +1,68 @@
 # Changelog
 
+## [0.5.1] - 2025-11-18
+
+### Added
+- ISO 8601 timestamp format support (e.g., "2025-10-22T23:57:34Z")
+- HTTP date format support (e.g., "Wed, 22 Oct 2025 23:57:37 GMT")
+
+## [0.5.0] - 2025-11-18
+
+### Changed
+- **Breaking Change**: Config file moved from `.env` to `~/.compare_logs` for simpler, centralized configuration
+- Removed dotenv dependency (no longer needed)
+- Config file now uses simple line-based format with comments support
+- Renamed `.env.example` to `compare_logs.example`
+
+### Improved
+- Simplified custom substitution configuration
+- Better documentation for configuration options
+
+## [0.4.0] - 2025-11-18
+
+### Added
+- Added `--ignore-timings` flag to normalize timing strings (e.g., "1.234 seconds", "5 minutes") to TIMING placeholder
+
+## [0.3.0] - 2025-11-18
+
+### Added
+- Added `--ignore-versions` flag to normalize semantic version strings (x.y.z) to VERSION placeholder
+
+## [0.2.0] - 2025-11-18
+
+### Added
+- Added `--aggressive` flag to remove all identical lines after normalization, showing only differences
+- Support for combining multiple flags
+
+## [0.1.3] - 2025-11-18
+
+### Fixed
+- Improved encoding handling with explicit UTF-8 validation after reading files
+- Better error handling for invalid byte sequences
+
+## [0.1.2] - 2025-11-18
+
+### Fixed
+- Fixed encoding errors when reading UTF-16LE encoded log files
+- Added fallback encoding support (UTF-8 → UTF-16LE → binary with scrubbing)
+
+## [0.1.1] - 2025-11-17
+
+### Added
+- Custom substitution patterns via `.env` file with `COMPARE_LOGS_SUBSTITUTIONS` environment variable
+- Dotenv gem dependency for environment variable support
+- Rake tasks for version bumping (`version:bump_patch`, `version:bump_minor`, `version:bump_major`)
+- Rake task for changelog generation from git commits (`changelog:generate`)
+- GitHub Actions CI workflow for testing on multiple Ruby versions (2.7, 3.0, 3.1, 3.2)
+- GitHub Actions release workflow with automatic version bumping, changelog generation, and RubyGems publishing
+- `.env.example` file with documentation for custom substitutions
+- Comprehensive documentation in README for all new features
+
+### Changed
+- Refactored substitution logic to use constant `DEFAULT_SUBSTITUTIONS` array
+- Moved hardcoded buildkite path substitution to default substitutions
+- Fixed gemspec to use file globbing instead of `git ls-files` for non-git repositories
+
 ## [0.1.0] - 2025-11-14
 
 ### Added

data/README.md

@@ -71,22 +71,27 @@ CompareLogs normalizes variable data in log files to make meaningful comparisons
 
 After normalization, it opens the files in `gvimdiff` for visual comparison.
 
-## Custom Substitutions
+## Options
+
+- `--aggressive` - Remove all lines that are identical in both files after normalization
+- `--ignore-versions` - Normalize x.y.z version strings to VERSION
+- `--ignore-timings` - Normalize timing strings (e.g., '1.234 seconds') to TIMING
 
-You can add your own custom substitutions using a `.env` file:
+Options can be combined for maximum noise reduction.
+
+## Custom Substitutions
 
-1. Create a `.env` file in your current directory or the gem directory
-2. Add custom patterns using the `COMPARE_LOGS_SUBSTITUTIONS` variable
+You can add your own custom substitutions using a config file at `~/.compare_logs`:
 
 ```bash
 # Format: pattern|||replacement (use ||| as separator)
-COMPARE_LOGS_SUBSTITUTIONS=C:\\Users\\buildkite-agent.*source.wxs|||BUILDKITEPATH
+# One pattern per line, lines starting with # are comments
 
-# Multiple substitutions (comma-separated)
-COMPARE_LOGS_SUBSTITUTIONS=pattern1|||replacement1,pattern2|||replacement2
+/my/custom/path/\d+|||CUSTOM_PATH
+\b[A-Z]{3,}_\d+\b|||IDENTIFIER
 ```
 
-Custom substitutions are applied in addition to the default patterns.
+See `compare_logs.example` for more examples. Custom substitutions are applied in addition to the default patterns.
 
 ## Development
 

data/compare_logs.gemspec

@@ -13,19 +13,16 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/yourusername/compare_logs"
-  spec.metadata["changelog_uri"] = "https://github.com/yourusername/compare_logs/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/stringsn88keys/compare_logs"
+  spec.metadata["changelog_uri"] = "https://github.com/stringsn88keys/compare_logs/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   spec.files = Dir["{lib,exe}/**/*", "*.md", "*.txt", "*.gemspec", "Gemfile", "Rakefile"]
-  
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Runtime dependencies
-  spec.add_dependency "dotenv", "~> 2.8"
-
   # Development dependencies
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/compare_logs/version.rb

@@ -1,3 +1,3 @@
 module CompareLogs
-  VERSION = "0.4.0"
+  VERSION = "0.5.2"
 end

data/lib/compare_logs.rb

@@ -1,5 +1,4 @@
 require_relative "compare_logs/version"
-require "dotenv"
 
 module CompareLogs
   class Error < StandardError; end
@@ -10,9 +9,11 @@ module CompareLogs
     # Default substitutions that are always applied
     DEFAULT_SUBSTITUTIONS = [
       [/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{7}/, 'BUILD_TIMESTAMP'],
+      [/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, 'ISO8601_TIMESTAMP'],
       [/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{9} [-+]\d{4}/, 'INTERNAL_TIMESTAMP'],
       [/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[-+]\d{2}:\d{2}/, 'INTERNAL_TIMESTAMP2'],
       [/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/, 'INTERNAL_TIMESTAMP3'],
+      [/\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} GMT/, 'HTTP_DATE'],
       [/\d{14}/, 'INTEGER_TIMESTAMP'],
       [/\d{2}\/\d{2}\/\d{4} \d{1,2}:\d{2}:\d{2} [AP]M/, 'WINDOWS_TIMESTAMP'],
       [/\d{14}\.\d{4}/, 'BUILDLOG_TIMESTAMP'],
@@ -147,19 +148,17 @@ module CompareLogs
     def load_custom_substitutions
       @custom_substitutions = []
       
-      # Try to load .env file from current directory or gem root
-      [Dir.pwd, File.expand_path('../..', __dir__)].each do |dir|
-        env_file = File.join(dir, '.env')
-        if File.exist?(env_file)
-          Dotenv.load(env_file)
-          break
-        end
-      end
-
-      # Parse COMPARE_LOGS_SUBSTITUTIONS if present
-      if ENV['COMPARE_LOGS_SUBSTITUTIONS'] && !ENV['COMPARE_LOGS_SUBSTITUTIONS'].empty?
-        ENV['COMPARE_LOGS_SUBSTITUTIONS'].split(',').each do |sub|
-          pattern_str, replacement = sub.split('|||', 2)
+      # Load config from ~/.compare_logs
+      config_file = File.expand_path('~/.compare_logs')
+      
+      if File.exist?(config_file)
+        File.readlines(config_file).each do |line|
+          # Skip comments and empty lines
+          line = line.strip
+          next if line.empty? || line.start_with?('#')
+          
+          # Parse pattern|||replacement format
+          pattern_str, replacement = line.split('|||', 2)
           next unless pattern_str && replacement
           
           begin
@@ -203,7 +202,23 @@ module CompareLogs
 
     def launch_diff_viewer
       modified_files = @files.map { |f| "\"#{f}.modified\"" }.join(' ')
-      system("gvimdiff #{modified_files}")
+      
+      # Try diff viewers in order of preference
+      viewers = ['gvimdiff', 'windiff', 'diff']
+      
+      viewer_found = viewers.find do |viewer|
+        # Check if the command exists
+        system("which #{viewer} > /dev/null 2>&1")
+      end
+      
+      if viewer_found
+        system("#{viewer_found} #{modified_files}")
+      else
+        puts "No diff viewer found. Tried: #{viewers.join(', ')}"
+        puts "Modified files created:"
+        @files.each { |f| puts "  #{f}.modified" }
+        exit 1
+      end
     end
 
     def print_usage

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: compare_logs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Thomas Powell
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 2025-11-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +77,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/stringsn88keys/compare_logs
-  source_code_uri: https://github.com/yourusername/compare_logs
-  changelog_uri: https://github.com/yourusername/compare_logs/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/stringsn88keys/compare_logs
+  changelog_uri: https://github.com/stringsn88keys/compare_logs/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: