nya_pr 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ee2a7a39ef6c0643bf8fd4c29e75ace604a36112958a08d5a2ad21f7dd6d51
-  data.tar.gz: 8390d9f7533c7c1d9abd9f2588548152d520d9e624c62ec841a9e57181b2a88c
+  metadata.gz: 733e769aa9751489e6a8e219de2804dc33d40a1cc7aef589bffd002c83e47f19
+  data.tar.gz: e9327003b3b327834904206c9b9fd402ef09ee5143afccc846dacad5899ce4e8
 SHA512:
-  metadata.gz: 3b290bc4f56e97ab8770f044aed6dc7c90a2ac8125f7899e43b53e31a481fc58b6fcbe60308ffb8087c07746456412fc6d5add5bbffbb2fd1ff5a04660d8c05b
-  data.tar.gz: a99c47b8e324b2f5b005b93fe1f7a657e07ce6e88bc1e1bd9566aa15e33009131129a375c52f7c22358f609b3029be6f4c1c2a9fa2c1c4913809b4657470dd36
+  metadata.gz: 9f27db9b27067f525f3b50b87c61f849c0cffbb71d2c7f2622dd2aba9bd56d1741559766b8eb3261a97b7d4f6192df082970daf6b0fe3f5103d91fd9b74b5e07
+  data.tar.gz: 7dc96cd1812762b1b437955536eb1725de85888d2a5a28bfe461cd262afa597237a540e339d9d93a2c5cce7e8495e10ab939cd72d924977c41258861cf38f2d4

data/README.md

@@ -304,6 +304,7 @@ Logs are written to `stderr`, while actual pull request output goes to `stdout`.
     --skip-drafts                Ignore draft pull requests
     --[no-]progress              Show or hide progress bars
     --exclude-repos              Repositories to exclude, in owner/name format
+    --save-pull-requests         Save pull requests to CSV
     --log-level LEVEL            Logging level
 -w, --workers                    Number of repository scan workers
 -v, --version                    Show NyaPr version

data/exe/nya-pr

@@ -5,7 +5,7 @@ require 'nya_pr'
 
 begin
   NyaPr.run
-rescue OptionParser::ParseError, NyaPr::Error => e
+rescue NyaPr::Error => e
   warn "nya-pr: #{e.message}"
   exit 1
 rescue Interrupt

data/lib/nya_pr/cli/command.rb

@@ -49,12 +49,16 @@ module NyaPr
              type: :array,
              desc: 'Repositories to exclude, in owner/name format'
 
+      option :save_pull_requests,
+             type: :boolean,
+             desc: 'Save pull requests to CSV'
+
       option :progress,
              type: :boolean,
              desc: 'Show progress bars'
 
       option :log_level,
-             values: Config::Global::LOG_LEVELS.keys,
+             values: Config::Builder::LOG_LEVELS.keys,
              desc: 'Log level'
 
       option :workers,
@@ -74,12 +78,14 @@ module NyaPr
 
         file_options = Config::Loader.load(config)
 
-        Runner.new(
-          Config::Global.from_options(
-            options,
-            file_options: file_options
-          )
-        ).run
+        app_config = Config::Builder.build(
+          options,
+          file_options: file_options
+        )
+
+        NyaPr.logger.level = app_config.log_level
+
+        RunnerFactory.build(app_config).run
       end
     end
   end

data/lib/nya_pr/config/builder.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+module NyaPr
+  module Config
+    class Builder
+      LOG_LEVELS = {
+        'debug' => Logger::DEBUG,
+        'info' => Logger::INFO,
+        'warn' => Logger::WARN,
+        'error' => Logger::ERROR,
+        '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
+
+      def initialize(options, file_options)
+        @options = options
+        @file_options = file_options
+      end
+
+      def build
+        validate_keys!
+
+        Global.new(
+          **normalize(
+            Defaults::OPTIONS.
+              merge(file_options).
+              merge(options.compact)
+          )
+        )
+      end
+
+      private
+
+      attr_reader :options, :file_options
+
+      def normalize(attributes)
+        attributes.merge(
+          username: normalize_username(attributes[:username]),
+          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'
+      end
+
+      def normalize_list(values)
+        Array(values).
+          flat_map { |value| value.to_s.split(',') }.
+          map(&:strip).
+          reject(&:empty?)
+      end
+
+      def normalize_repositories(values)
+        normalize_list(values).
+          map(&:downcase).
+          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?
+
+        raise NyaPr::Error,
+              "Unknown config option(s): #{unknown.join(', ')}"
+      end
+    end
+  end
+end

data/lib/nya_pr/config/defaults.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module NyaPr
+  module Config
+    module Defaults
+      LIMIT = 100
+      WORKERS = 10
+
+      OPTIONS = {
+        owners: [],
+        token: nil,
+        repositories_csv: nil,
+        pull_requests_dir: nil,
+        limit: LIMIT,
+        refresh: false,
+        skip_archived: false,
+        skip_drafts: false,
+        exclude_repositories: [],
+        save_pull_requests: true,
+        progress: true,
+        log_level: 'info',
+        workers: WORKERS
+      }.freeze
+    end
+  end
+end

data/lib/nya_pr/config/global.rb

@@ -2,7 +2,7 @@
 
 module NyaPr
   module Config
-    class Global < Data.define(
+    Global = Data.define(
       :username,
       :owners,
       :token,
@@ -13,137 +13,10 @@ module NyaPr
       :skip_archived,
       :skip_drafts,
       :exclude_repositories,
+      :save_pull_requests,
       :progress,
       :log_level,
       :workers
     )
-      LOG_LEVELS = {
-        'debug' => Logger::DEBUG,
-        'info' => Logger::INFO,
-        'warn' => Logger::WARN,
-        'error' => Logger::ERROR,
-        'fatal' => Logger::FATAL
-      }.freeze
-
-      DEFAULTS = {
-        owners: [],
-        token: nil,
-        repositories_csv: nil,
-        pull_requests_dir: nil,
-        limit: PullRequest::Config::DEFAULT_LIMIT,
-        refresh: false,
-        skip_archived: false,
-        skip_drafts: false,
-        progress: true,
-        log_level: 'info',
-        workers: Repository::Config::DEFAULT_WORKERS,
-        exclude_repositories: []
-      }.freeze
-
-      BOOLEAN_KEYS = %i[
-        refresh
-        skip_archived
-        skip_drafts
-        progress
-      ].freeze
-
-      class << self
-        def from_options(options, file_options: {})
-          validate_keys!(file_options)
-
-          attributes = DEFAULTS.
-                       merge(file_options).
-                       merge(options.compact)
-
-          build(attributes)
-        end
-
-        private
-
-        def build(attributes)
-          normalized = attributes.merge(
-            username: normalize_username(attributes[:username]),
-            owners: normalize_owners(attributes[:owners]),
-            limit: normalize_positive_integer(attributes[:limit], :limit),
-            workers: normalize_positive_integer(attributes[:workers], :workers),
-            log_level: normalize_log_level(attributes[:log_level]),
-            exclude_repositories: normalize_repositories(
-              attributes[:exclude_repositories]
-            ),
-            **normalize_booleans(attributes)
-          )
-
-          new(**normalized)
-        end
-
-        def normalize_username(value)
-          username = value.to_s.strip
-
-          validate_username!(username)
-
-          username
-        end
-
-        def normalize_repositories(repositories)
-          Array(repositories).
-            flat_map { |repository| repository.to_s.split(',') }.
-            map(&:strip).
-            reject(&:empty?).
-            map(&:downcase).
-            uniq
-        end
-
-        def normalize_booleans(attributes)
-          BOOLEAN_KEYS.to_h do |key|
-            [key, normalize_boolean(attributes[key], key)]
-          end
-        end
-
-        def validate_keys!(options)
-          unknown = options.keys - members
-
-          return if unknown.empty?
-
-          raise NyaPr::Error,
-                "Unknown config option(s): #{unknown.join(', ')}"
-        end
-
-        def normalize_owners(owners)
-          Array(owners).
-            flat_map { |owner| owner.to_s.split(',') }.
-            map(&:strip).
-            reject(&:empty?)
-        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_username!(username)
-          return unless username.empty?
-
-          raise NyaPr::Error, 'GitHub username is required'
-        end
-      end
-    end
   end
 end

data/lib/nya_pr/pull_request/config.rb

@@ -2,14 +2,12 @@
 
 module NyaPr
   module PullRequest
-    class Config < Data.define(
+    Config = Data.define(
       :limit,
       :skip_drafts,
       :progress_enabled,
       :pull_requests_dir
-    )
-      DEFAULT_LIMIT = 100
-
+    ) do
       def self.from_app(config)
         new(
           limit: config.limit,

data/lib/nya_pr/pull_request/finder.rb

@@ -8,25 +8,27 @@ module NyaPr
       MAX_PER_PAGE = 100
 
       attr_reader :client,
-                  :repositories,
                   :config,
                   :filter
 
-      def initialize(client, repositories, config, filter: nil)
+      def initialize(client, config, filter: nil)
         @client = client
-        @repositories = repositories
         @config = config
         @filter = filter || Filter.new(config)
       end
 
-      def find
+      def find(repositories)
         NyaPr.logger.info(
           "Searching for up to #{config.limit} open pull requests " \
           "in #{repositories.size} repositories"
         )
 
-        progress_bar = build_progress
-        pull_requests = collect_pull_requests(progress_bar)
+        progress_bar = build_progress(repositories.size)
+
+        pull_requests = collect_pull_requests(
+          repositories,
+          progress_bar
+        )
 
         progress_bar.finish
 
@@ -39,7 +41,7 @@ module NyaPr
 
       private
 
-      def collect_pull_requests(progress_bar)
+      def collect_pull_requests(repositories, progress_bar)
         pull_requests = []
 
         repositories.each do |repository|
@@ -134,10 +136,10 @@ module NyaPr
         )
       end
 
-      def build_progress
+      def build_progress(total)
         Progress.new(
           '🐾 Checking pull requests',
-          total: repositories.size,
+          total: total,
           enabled: config.progress_enabled && $stderr.tty?
         )
       end

data/lib/nya_pr/repository/config.rb

@@ -2,7 +2,7 @@
 
 module NyaPr
   module Repository
-    class Config < Data.define(
+    Config = Data.define(
       :username,
       :owners,
       :refresh,
@@ -11,9 +11,7 @@ module NyaPr
       :workers,
       :repositories_csv,
       :exclude_repositories
-    )
-      DEFAULT_WORKERS = 10
-
+    ) do
       def self.from_app(config)
         new(
           username: config.username,

data/lib/nya_pr/runner.rb

@@ -1,20 +1,27 @@
 # frozen_string_literal: true
 
-require 'dotenv'
-
 module NyaPr
   class Runner
-    attr_reader :config
-
-    def initialize(config)
-      @config = config
+    attr_reader :repository_collector,
+                :pull_request_finder,
+                :pull_request_printer,
+                :pull_request_store
+
+    def initialize(
+      repository_collector:,
+      pull_request_finder:,
+      pull_request_printer:,
+      pull_request_store:
+    )
+      @repository_collector = repository_collector
+      @pull_request_finder = pull_request_finder
+      @pull_request_printer = pull_request_printer
+      @pull_request_store = pull_request_store
     end
 
     def run
-      Dotenv.load
-      configure_logger
-
-      pull_requests = find_pull_requests
+      repositories = repository_collector.collect
+      pull_requests = pull_request_finder.find(repositories)
 
       pull_request_printer.print(pull_requests)
       save_pull_requests(pull_requests)
@@ -22,85 +29,14 @@ module NyaPr
 
     private
 
-    def configure_logger
-      NyaPr.logger.level = config.log_level
-    end
-
-    def target_repositories
-      repository_collector.collect
-    end
-
-    def repository_config
-      @repository_config ||= Repository::Config.from_app(config)
-    end
-
-    def pull_request_config
-      @pull_request_config ||= PullRequest::Config.from_app(config)
-    end
-
-    def repository_paths
-      @repository_paths ||= Repository::Paths.new(
-        repository_config
-      )
-    end
-
-    def pull_request_paths
-      @pull_request_paths ||= PullRequest::Paths.new(
-        pull_request_config
-      )
-    end
-
-    def repository_store
-      @repository_store ||= Repository::CsvStore.new(
-        repository_paths.csv
-      )
-    end
-
-    def pull_request_store
-      @pull_request_store ||= PullRequest::CsvStore.new(
-        pull_request_paths.csv
-      )
-    end
-
-    def repository_collector
-      @repository_collector ||= Repository::Collector.new(
-        client,
-        repository_store,
-        repository_config
-      )
-    end
-
-    def find_pull_requests
-      PullRequest::Finder.
-        new(
-          client,
-          target_repositories,
-          pull_request_config
-        ).
-        find
-    end
-
     def save_pull_requests(pull_requests)
+      return unless pull_request_store
+
       pull_request_store.write(pull_requests)
 
       NyaPr.logger.info(
         "Saved #{pull_requests.size} pull requests to #{pull_request_store.path}"
       )
     end
-
-    def pull_request_printer
-      @pull_request_printer ||= PullRequest::Printer.new
-    end
-
-    def client
-      @client ||= Github::Client.new(token)
-    end
-
-    def token
-      config.token || ENV.fetch('GITHUB_TOKEN') do
-        raise NyaPr::Error,
-              'GitHub token is required (--token or GITHUB_TOKEN)'
-      end
-    end
   end
 end

data/lib/nya_pr/runner_factory.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module NyaPr
+  class RunnerFactory
+    def self.build(config)
+      new(config).build
+    end
+
+    def initialize(config)
+      @config = config
+    end
+
+    def build
+      Runner.new(
+        repository_collector: repository_collector,
+        pull_request_finder: pull_request_finder,
+        pull_request_printer: PullRequest::Printer.new,
+        pull_request_store: pull_request_store
+      )
+    end
+
+    private
+
+    attr_reader :config
+
+    def repository_config
+      @repository_config ||= Repository::Config.from_app(config)
+    end
+
+    def pull_request_config
+      @pull_request_config ||= PullRequest::Config.from_app(config)
+    end
+
+    def repository_store
+      @repository_store ||= Repository::CsvStore.new(
+        Repository::Paths.new(repository_config).csv
+      )
+    end
+
+    def repository_collector
+      @repository_collector ||= Repository::Collector.new(
+        client,
+        repository_store,
+        repository_config
+      )
+    end
+
+    def pull_request_finder
+      @pull_request_finder ||= PullRequest::Finder.new(
+        client,
+        pull_request_config
+      )
+    end
+
+    def pull_request_store
+      return unless config.save_pull_requests
+
+      @pull_request_store ||= PullRequest::CsvStore.new(
+        PullRequest::Paths.new(pull_request_config).csv
+      )
+    end
+
+    def client
+      @client ||= Github::Client.new(token)
+    end
+
+    def token
+      config.token || ENV.fetch('GITHUB_TOKEN') do
+        raise NyaPr::Error,
+              'GitHub token is required (--token or GITHUB_TOKEN)'
+      end
+    end
+  end
+end

data/lib/nya_pr/version.rb

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

data/lib/nya_pr.rb

@@ -4,6 +4,7 @@ require 'zeitwerk'
 require 'logger'
 require 'csv'
 require 'dry/cli'
+require 'dotenv'
 
 loader = Zeitwerk::Loader.for_gem
 loader.setup
@@ -11,6 +12,8 @@ loader.setup
 module NyaPr
   class << self
     def run(argv = ARGV)
+      Dotenv.load
+
       Dry::CLI.new(Cli::Command).call(arguments: argv)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nya_pr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Elijah S. Krukowski
@@ -122,6 +122,8 @@ files:
 - exe/nya-pr
 - lib/nya_pr.rb
 - lib/nya_pr/cli/command.rb
+- lib/nya_pr/config/builder.rb
+- lib/nya_pr/config/defaults.rb
 - lib/nya_pr/config/global.rb
 - lib/nya_pr/config/loader.rb
 - lib/nya_pr/error.rb
@@ -142,6 +144,7 @@ files:
 - lib/nya_pr/repository/finder.rb
 - lib/nya_pr/repository/paths.rb
 - lib/nya_pr/runner.rb
+- lib/nya_pr/runner_factory.rb
 - lib/nya_pr/version.rb
 homepage: https://github.com/bodrovis/nya_pr
 licenses: