remind_me 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad4645fc24e7238a0722f828cd63edac243c528dd649d52752067488a5777f72
-  data.tar.gz: 3ebd1346fc2391ff256fa99994aea089255ffa30692057f3b4e5bbb03dc4c0be
+  metadata.gz: 3f76a53f49a07d6a0e777ef236281f87dff2e4881f83b8edcd7b18c5fb99dce3
+  data.tar.gz: c6e765928f9020b17c035429dac9cb941e717c67fd07b700790e4c49f4f15129
 SHA512:
-  metadata.gz: 63ad32bbb05678a25fef45ec2bdc975d6926494b441b294ce715e187d6c0737f0ebb9dea40c34c1869091a492ebcefe0d528f39c8907ebb2ebccd399ba47970e
-  data.tar.gz: b7ae5dcb4acc4c4c71a02d320a1408aa167b97cf7e4c28223da1010ba8aafaf6d80da26100750ec39148b7d7f978c6d8bbe00f2d23e10c78e8235885f5fddaae
+  metadata.gz: 736d8b964280e45d6300c53c76ba476fc6bffc68262341d4fbc59f1cb139ac3333e327bdc9e680a1c4a94f0131e8ab1762e93649e18a13f5728f380cbbdc1c49
+  data.tar.gz: 7e3fa1d5760d38f9d77e0172dc082e21c7b236d74451f57d0cdb00ad477cbca4c28113ff96d4dd5196f5c9d70b5269995926c66681c396042c5b8eb2e2f20576

data/.github/workflows/main.yml

@@ -8,17 +8,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ "2.3.7", "2.4.10", "2.5.9", "2.6.8", "2.7.4", "3.0.2", "jruby-9.2" ]
+        ruby: [ "2.3.7", "2.4.10", "2.5.9", "2.6.8", "2.7.4", "3.0.6", "3.1.4", "3.2.2", "jruby-9.2", "jruby-9.3", "jruby-9.4" ]
+        include:
+          - ruby: "2.3.7"
+            requires-older-rubygems: true
+            requires-older-bundler: true
+          - ruby: "2.4.10"
+            requires-older-rubygems: true
+            requires-older-bundler: true
+          - ruby: "jruby-9.2"
+            requires-older-bundler: true
+          - ruby: "jruby-9.3"
+            requires-older-bundler: true
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+    - if: ${{ matrix.requires-older-rubygems }}
+      run: gem update --system 3.2.3
+    - if: ${{ matrix.requires-older-bundler }}
+      run: gem install bundler -v 2.3.26
     - name: Bundle install
-      run: |
-        gem install bundler
-        bundle install --jobs=3
+      run: bundle install --jobs=3
     - name: Run tests (MRI)
       run: bundle exec rake spec
       if: "!startsWith(matrix.ruby, 'jruby')"

data/.gitignore

@@ -1,3 +1,4 @@
+/Gemfile*lock
 /.bundle/
 /.yardoc
 /_yardoc/
@@ -10,4 +11,5 @@
 # rspec failure tracking
 .rspec_status
 .ruby-version
-/*.gem
+/*.gem
+/target/

data/lib/remind_me/runner.rb

@@ -2,7 +2,6 @@
 
 require 'parser/current'
 require 'find'
-require 'parallel/processor_count'
 require 'parallel'
 
 require_relative 'version'
@@ -15,7 +14,19 @@ module RemindMe
   class Runner
     extend BailOut
     extend Utils::Logger
-    extend Parallel::ProcessorCount
+    extend Utils::Versions
+
+    def self.using_old_parallel_gem?
+      gem_version('parallel') < Gem::Version.new('1.23.0')
+    end
+
+    # older versions of parallel gem used different code
+    if using_old_parallel_gem?
+      # :nocov:
+      require 'parallel/processor_count'
+      extend Parallel::ProcessorCount
+      # :nocov:
+    end
 
     def self.check_reminders(check_path: '.')
       Utils::ResultPrinter.new(collect_reminders(check_path)).print_results
@@ -23,7 +34,8 @@ module RemindMe
 
     def self.collect_reminders(path)
       files = relevant_ruby_files(path)
-      bail_out!('Need something to parse!') if files.empty?
+      return if files.empty?
+
       Parallel.flat_map(in_groups(files, processor_count, false)) do |files|
         parser = silent_parser
         raw_comments = collect_relevant_comments(files, parser)
@@ -87,6 +99,16 @@ module RemindMe
       groups
     end
 
+    # :nocov:
+    def self.processor_count
+      if using_old_parallel_gem?
+        super
+      else
+        Parallel.processor_count
+      end
+    end
+    # :nocov:
+
     private_class_method :in_groups,
                          :collect_ruby_files,
                          :collect_relevant_comments

data/lib/remind_me/utils/result_printer.rb

@@ -12,8 +12,9 @@ module RemindMe
       end
 
       def print_results
-        if reminders.empty?
+        if reminders.nil? || reminders.empty?
           log_info 'No reminders found'
+          exit(0)
         else
           valid_reminders = reminders.reject { |r| r.is_a?(RemindMe::Reminder::InvalidReminder) }
           invalid_reminders = reminders.select { |r| r.is_a?(RemindMe::Reminder::InvalidReminder) }

data/lib/remind_me/utils/versions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'rubygems'
 
 module RemindMe
   module Utils
@@ -9,6 +10,10 @@ module RemindMe
         current_version.__send__(condition_comparators[comparator.to_sym], target_version)
       end
 
+      def gem_version(gem_name)
+        INSTALLED_GEMS[gem_name]
+      end
+
       def gem_installed?(gem)
         INSTALLED_GEMS.key?(gem.to_s)
       end

data/lib/remind_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RemindMe
-  VERSION = '0.3.0'
+  VERSION = '0.6.0'
 end

data/remind_me.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
 
-  spec.add_dependency 'parallel', '~> 1.19.2'
-  spec.add_dependency 'parser', '~> 3.0.2.0'
+  spec.add_dependency 'parallel'
+  spec.add_dependency 'parser'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remind_me
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Nikola Marić
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,30 +70,30 @@ dependencies:
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2.0
+        version: '0'
 description: Processor of REMIND_ME comments in the code, reminding us to revisit
   parts of code
 email:
@@ -108,7 +108,6 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,62 +0,0 @@
-PATH
-  remote: .
-  specs:
-    remind_me (0.3.0)
-      parallel (~> 1.19.2)
-      parser (~> 3.0.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    jaro_winkler (1.5.4)
-    json (2.6.1)
-    parallel (1.19.2)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.11.0)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  remind_me!
-  rspec
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   2.1.4