nya_pr 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 733e769aa9751489e6a8e219de2804dc33d40a1cc7aef589bffd002c83e47f19
-  data.tar.gz: e9327003b3b327834904206c9b9fd402ef09ee5143afccc846dacad5899ce4e8
+  metadata.gz: 90e3eebf9061c21b3c4579fbd29a454c4f8984c30dd39fbd1633bc263a717075
+  data.tar.gz: c19a7c957ecd8177c10075455699e41812dd1e5c43d07965d1af642fac84b342
 SHA512:
-  metadata.gz: 9f27db9b27067f525f3b50b87c61f849c0cffbb71d2c7f2622dd2aba9bd56d1741559766b8eb3261a97b7d4f6192df082970daf6b0fe3f5103d91fd9b74b5e07
-  data.tar.gz: 7dc96cd1812762b1b437955536eb1725de85888d2a5a28bfe461cd262afa597237a540e339d9d93a2c5cce7e8495e10ab939cd72d924977c41258861cf38f2d4
+  metadata.gz: a0734d5b31fd4e72bf9a8058a90e3215edb6449e45f222d5083b09066b836a2fe9b2a77e100a5ecc0f80f3557c480044b0f0aa0ca28e2a91ba27e547faee8a06
+  data.tar.gz: b08e6e60dc6174f204cd018bc8d0b1fa16be47b27566b9889db7af5a484d8ff289e3fcbbfedba9a9a9c297f92f301e48ebde02d6671ab6058df2c0642ef9584c

data/lib/nya_pr/config/builder.rb

@@ -11,14 +11,6 @@ module NyaPr
         'fatal' => Logger::FATAL
       }.freeze
 
-      BOOLEAN_KEYS = %i[
-        refresh
-        skip_archived
-        skip_drafts
-        progress
-        save_pull_requests
-      ].freeze
-
       def self.build(options, file_options: {})
         new(options, file_options).build
       end
@@ -29,15 +21,19 @@ module NyaPr
       end
 
       def build
-        validate_keys!
-
-        Global.new(
-          **normalize(
+        result = Schema.call(
+          normalize(
             Defaults::OPTIONS.
               merge(file_options).
               merge(options.compact)
           )
         )
+
+        raise_config_error!(result) unless result.success?
+
+        Global.new(
+          **result.to_h, log_level: LOG_LEVELS.fetch(result[:log_level])
+        )
       end
 
       private
@@ -50,20 +46,12 @@ module NyaPr
           owners: normalize_list(attributes[:owners]),
           exclude_repositories: normalize_repositories(
             attributes[:exclude_repositories]
-          ),
-          limit: normalize_positive_integer(attributes[:limit], :limit),
-          workers: normalize_positive_integer(attributes[:workers], :workers),
-          log_level: normalize_log_level(attributes[:log_level]),
-          **normalize_booleans(attributes)
+          )
         )
       end
 
       def normalize_username(value)
-        username = value.to_s.strip
-
-        return username unless username.empty?
-
-        raise NyaPr::Error, 'GitHub username is required'
+        value&.to_s&.strip
       end
 
       def normalize_list(values)
@@ -79,41 +67,16 @@ module NyaPr
           uniq
       end
 
-      def normalize_booleans(attributes)
-        BOOLEAN_KEYS.to_h do |key|
-          [key, normalize_boolean(attributes[key], key)]
-        end
-      end
-
-      def normalize_positive_integer(value, name)
-        number = Integer(value)
-
-        return number if number.positive?
-
-        raise NyaPr::Error, "#{name} must be greater than 0"
-      rescue ArgumentError, TypeError
-        raise NyaPr::Error, "#{name} must be a positive integer"
-      end
-
-      def normalize_boolean(value, name)
-        return value if [true, false].include?(value)
-
-        raise NyaPr::Error, "#{name} must be true or false"
-      end
-
-      def normalize_log_level(value)
-        LOG_LEVELS.fetch(value.to_s) do
-          raise NyaPr::Error, "Invalid log level: #{value}"
-        end
-      end
-
-      def validate_keys!
-        unknown = file_options.keys - Global.members
-
-        return if unknown.empty?
+      def raise_config_error!(result)
+        message = result.errors.to_h.
+                  flat_map do |key, messages|
+                    Array(messages).map do |error|
+                      "#{key} #{error}"
+                    end
+                  end.
+                  join(', ')
 
-        raise NyaPr::Error,
-              "Unknown config option(s): #{unknown.join(', ')}"
+        raise NyaPr::Error, message
       end
     end
   end

data/lib/nya_pr/config/defaults.rb

@@ -3,15 +3,12 @@
 module NyaPr
   module Config
     module Defaults
-      LIMIT = 100
-      WORKERS = 10
-
       OPTIONS = {
         owners: [],
         token: nil,
         repositories_csv: nil,
         pull_requests_dir: nil,
-        limit: LIMIT,
+        limit: 100,
         refresh: false,
         skip_archived: false,
         skip_drafts: false,
@@ -19,7 +16,7 @@ module NyaPr
         save_pull_requests: true,
         progress: true,
         log_level: 'info',
-        workers: WORKERS
+        workers: 30
       }.freeze
     end
   end

data/lib/nya_pr/config/global.rb

@@ -3,20 +3,7 @@
 module NyaPr
   module Config
     Global = Data.define(
-      :username,
-      :owners,
-      :token,
-      :repositories_csv,
-      :pull_requests_dir,
-      :limit,
-      :refresh,
-      :skip_archived,
-      :skip_drafts,
-      :exclude_repositories,
-      :save_pull_requests,
-      :progress,
-      :log_level,
-      :workers
+      *Schema.key_map.dump
     )
   end
 end

data/lib/nya_pr/config/schema.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'dry/schema'
+
+module NyaPr
+  module Config
+    STRICT_BOOL = Dry::Types['strict.bool']
+
+    private_constant :STRICT_BOOL
+
+    Schema = Dry::Schema.Params do
+      config.validate_keys = true
+
+      required(:username).filled(:string)
+
+      required(:owners).array(:string)
+
+      required(:token).maybe(:string)
+      required(:repositories_csv).maybe(:string)
+      required(:pull_requests_dir).maybe(:string)
+
+      required(:limit).filled(
+        :integer,
+        gt?: 0
+      )
+
+      required(:workers).filled(
+        :integer,
+        gt?: 0
+      )
+
+      required(:refresh).value(STRICT_BOOL)
+      required(:skip_archived).value(STRICT_BOOL)
+      required(:skip_drafts).value(STRICT_BOOL)
+      required(:save_pull_requests).value(STRICT_BOOL)
+      required(:progress).value(STRICT_BOOL)
+
+      required(:exclude_repositories).array(:string)
+
+      required(:log_level).filled(
+        :string,
+        included_in?: %w[
+          debug
+          info
+          warn
+          error
+          fatal
+        ]
+      )
+    end
+  end
+end

data/lib/nya_pr/pull_request/config.rb

@@ -6,14 +6,16 @@ module NyaPr
       :limit,
       :skip_drafts,
       :progress_enabled,
-      :pull_requests_dir
+      :pull_requests_dir,
+      :workers
     ) do
       def self.from_app(config)
         new(
           limit: config.limit,
           skip_drafts: config.skip_drafts,
           progress_enabled: config.progress,
-          pull_requests_dir: config.pull_requests_dir
+          pull_requests_dir: config.pull_requests_dir,
+          workers: config.workers
         )
       end
     end

data/lib/nya_pr/pull_request/finder.rb

@@ -44,27 +44,56 @@ module NyaPr
       def collect_pull_requests(repositories, progress_bar)
         pull_requests = []
 
-        repositories.each do |repository|
-          break if pull_requests.size >= config.limit
+        repositories.each_slice(config.workers) do |repositories_batch|
+          remaining = config.limit - pull_requests.size
+          break unless remaining.positive?
 
-          process_repository(
-            repository,
-            pull_requests,
+          results = process_batch(
+            repositories_batch,
+            remaining,
             progress_bar
           )
+
+          append_results(
+            pull_requests,
+            results
+          )
         end
 
         pull_requests
       end
 
-      def process_repository(repository, pull_requests, progress_bar)
-        return unless pull_requests_enabled?(repository)
+      def process_batch(repositories, limit, progress_bar)
+        threads = repositories.map do |repository|
+          Thread.new do
+            Thread.current.report_on_exception = false
+
+            process_repository(
+              repository,
+              limit,
+              progress_bar
+            )
+          end
+        end
 
-        remaining = config.limit - pull_requests.size
+        threads.map(&:value)
+      end
 
-        pull_requests.concat(
-          pull_requests_for(repository, remaining)
-        )
+      def append_results(pull_requests, results)
+        results.each do |repository_pull_requests|
+          remaining = config.limit - pull_requests.size
+          break unless remaining.positive?
+
+          pull_requests.concat(
+            repository_pull_requests.first(remaining)
+          )
+        end
+      end
+
+      def process_repository(repository, limit, progress_bar)
+        return [] unless pull_requests_enabled?(repository)
+
+        pull_requests_for(repository, limit)
       ensure
         progress_bar.advance
       end

data/lib/nya_pr/repository/collector.rb

@@ -49,7 +49,7 @@ module NyaPr
         store.write(repositories)
 
         NyaPr.logger.info(
-          "Saved #{repositories.size} repositories to #{store.path}"
+          "Selected #{repositories.size} repositories for pull request scanning"
         )
 
         repositories

data/lib/nya_pr/repository/filter.rb

@@ -40,7 +40,7 @@ module NyaPr
 
       def log_start(repositories)
         NyaPr.logger.info(
-          "Checking contributions in #{repositories.size} repositories " \
+          "Checking contributions in #{repositories.size} external repositories " \
           "using #{workers} workers"
         )
       end
@@ -75,7 +75,7 @@ module NyaPr
 
       def log_result(result)
         NyaPr.logger.info(
-          "Finished contribution check: #{result.size} repositories matched"
+          "Finished contribution check: contributions found in #{result.size} repositories"
         )
       end
 

data/lib/nya_pr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nya_pr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Elijah S. Krukowski
@@ -51,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +140,7 @@ files:
 - lib/nya_pr/config/defaults.rb
 - lib/nya_pr/config/global.rb
 - lib/nya_pr/config/loader.rb
+- lib/nya_pr/config/schema.rb
 - lib/nya_pr/error.rb
 - lib/nya_pr/github/client.rb
 - lib/nya_pr/github/connection.rb