end_of_life 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 613932e8ff35287b6f1cfd47f892ec07842432a48a86de9586daafe7c7fe2e4a
-  data.tar.gz: a8d47ebdc3838394b2dae1c86b39f02e0eb59c727fd878e956d849873ff7f1f0
+  metadata.gz: b8e0689d1cdf6da1fa737f8d699a060a8544184dfb345d6af4093e6e5e000c13
+  data.tar.gz: 608169452246f72b9351b07ae4f243d4ce74c3416c451a5fdf600b97dbc3f529
 SHA512:
-  metadata.gz: 3919afb9fce45df1d650605e05cd401fd1281f7d17bf4df56e8bc33245df04e70184ed834ba7f09d25cb88f3b6c62448170dfd40d9b38cb3e09b048417aecc4f
-  data.tar.gz: 792c5b7483671ea6b0a952ad3736c52046c95bf8b8d030082ff5270a0c0bf9a3af0f6937b02f015c63c32881bd8a9b8d4e0fe97e3ee29d8868299344cd3f7d99
+  metadata.gz: 57c0401637ca7d60d59d27ab35f4bee948f09bf188df6189a41be14ceb906c50ee77059a550076122f14a3b118c9e6fdd2f10dd520d19b562670c8fe229cf5df
+  data.tar.gz: 8cf1db7f6007559d3066696e1f3820fdaae1b055654456d47d48d67b6828530315992aae95ac9ea2ecf3927b3a39b80f84df7a762d24cc6c4f073bc2956d648e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [0.4.1] - 2025-05-23
+
+- [BUGFIX] Handle empty/invalid version files
+  - if a file like `.ruby-version` was empty, we would parse it it's version as
+    `0` which would take precedence over any other file when comparing versions.
+  - We now ignore those files and any file which version parses to `0`.
+
 ## [0.4.0] - 2025-05-23
 
 - Skip archived repos (by default)
@@ -154,7 +161,9 @@ $ end_of_life --user=matz # searches on matz's repositories
 
 - Initial release
 
-[unreleased]: https://github.com/MatheusRich/end_of_life/compare/v0.3.0...HEAD
+[unreleased]: https://github.com/MatheusRich/end_of_life/compare/v0.4.1...HEAD
+[0.4.1]: https://github.com/MatheusRich/end_of_life/releases/tag/v0.4.1
+[0.4.0]: https://github.com/MatheusRich/end_of_life/releases/tag/v0.4.0
 [0.3.0]: https://github.com/MatheusRich/end_of_life/releases/tag/v0.3.0
 [0.2.0]: https://github.com/MatheusRich/end_of_life/releases/tag/v0.2.0
 [0.1.0]: https://github.com/MatheusRich/end_of_life/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    end_of_life (0.4.0)
+    end_of_life (0.4.1)
       async
       dry-monads (~> 1.3)
       octokit (~> 9.0)

data/README.md

@@ -41,9 +41,9 @@ There are some options to help you filter down the results:
 ```
 Usage: end_of_life [options]
         --exclude=NAME,NAME2           Exclude repositories containing a certain word in its name. You can specify up to five words.
-        --public-only                  Searches only public repostories
-        --private-only                 Searches only private repostories
-        --repo, --repository=USER/REPO Searches a specific repostory
+        --public-only                  Searches only public repositories
+        --private-only                 Searches only private repositories
+        --repo, --repository=USER/REPO Searches a specific repository
         --org, --organization=ORG,ORG2 Searches within specific organizations
     -u, --user=NAME                    Sets the user used on the repository search
         --max-eol-days-away NUMBER     Sets the maximum number of days away a version can be from EOL. It defaults to 0.

data/lib/end_of_life/cli.rb

@@ -62,7 +62,8 @@ module EndOfLife
         return
       end
 
-      puts "Found #{repositories.size} repositories using EOL Ruby (<= #{RubyVersion.latest_eol(at: max_eol_date)}):"
+      word = (repositories.size == 1) ? "repository" : "repositories"
+      puts "Found #{repositories.size} #{word} using EOL Ruby (<= #{RubyVersion.latest_eol(at: max_eol_date)}):"
       puts end_of_life_table(repositories)
       exit(-1)
     end

data/lib/end_of_life/options.rb

@@ -14,15 +14,15 @@ module EndOfLife
           options[:excludes] = excludes.first(5)
         end
 
-        opts.on("--public-only", "Searches only public repostories") do
+        opts.on("--public-only", "Searches only public repositories") do
           options[:visibility] = :public
         end
 
-        opts.on("--private-only", "Searches only private repostories") do
+        opts.on("--private-only", "Searches only private repositories") do
           options[:visibility] = :private
         end
 
-        opts.on("--repo=USER/REPO", "--repository=USER/REPO", "Searches a specific repostory") do |repository|
+        opts.on("--repo=USER/REPO", "--repository=USER/REPO", "Searches a specific repository") do |repository|
           options[:repository] = repository
         end
 

data/lib/end_of_life/ruby_version/parser.rb

@@ -7,7 +7,9 @@ module EndOfLife
       extend self
 
       def parse_file(file_name:, content:)
-        if file_name == ".ruby-version"
+        return if content.strip.empty?
+
+        version = if file_name == ".ruby-version"
           parse_ruby_version_file(content)
         elsif file_name == "Gemfile.lock"
           parse_gemfile_lock_file(content)
@@ -18,6 +20,14 @@ module EndOfLife
         else
           raise ArgumentError, "Unsupported file #{file_name}"
         end
+
+        # Gem::Version is pretty forgiving and will accept empty strings
+        # as valid versions. This is a catch-all to ensure we don't return
+        # a version 0, which always takes precedence over any other version
+        # when comparing.
+        return if version&.zero?
+
+        version
       end
 
       private
@@ -38,11 +48,9 @@ module EndOfLife
       end
 
       def parse_gemfile_file(file_content)
-        return if file_content.empty?
-
         with_temp_gemfile(file_content) do |temp_gemfile|
           gemfile_version = temp_gemfile.ruby_version&.gem_version
-          return nil if gemfile_version.nil?
+          return if gemfile_version.nil?
 
           RubyVersion.new(gemfile_version)
         end

data/lib/end_of_life/ruby_version.rb

@@ -6,6 +6,8 @@ module EndOfLife
   class RubyVersion
     include Comparable
 
+    ZERO = Gem::Version.new("0")
+
     class << self
       include Dry::Monads[:try]
 
@@ -58,6 +60,8 @@ module EndOfLife
       @version <=> other.version
     end
 
+    def zero? = @version == ZERO
+
     def to_s
       @version.to_s
     end

data/lib/end_of_life/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EndOfLife
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: end_of_life
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matheus Richard
@@ -104,7 +104,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
-- ".standard.yml"
 - ".tool-versions"
 - CHANGELOG.md
 - Gemfile

data/.standard.yml

@@ -1 +0,0 @@
-ruby_version: 2.7.1