michael 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 147eb2a1f8bb87dd4236aba99b6ff495fbb16a6b09cedf7ecb01edcac8124305
-  data.tar.gz: 1304c1b36bc36d3066a876dc530f1dfa3dc11c38b8cc31767b77e6a211c3c390
+  metadata.gz: e7807c64c30fb214d1532da9a97d6abc4f5173b52bd2f1256aa9a3b4b44c43a8
+  data.tar.gz: 84ab17dfada0424db92341ab7911a338716d04cda02c35f2e6779cfb1cbb75bd
 SHA512:
-  metadata.gz: 88ce61019ef7992ee575befae3902a2b5c359125ab1bc338a598e64273e27c01a134bc16dd33d4d27a6c944c49e6b0da18e4602e028794d9ba1ccbf4c484f2ca
-  data.tar.gz: 9f6d158d879cce2ed941f88370d09bcc3d608cb505f1caabba690a0cc5a054215d9b41e72a7fee0f1536cdc200318f0e4e8169a67db2bae7a3980532f1a042ed
+  metadata.gz: d89f9e455b2048c657b6e3a152a0ac7d3691af7826eba6df3798065641d75d6cf6d39c368e34f9f5fa4d0961ecea820114279d649547610b34e50d06c6b1fae5
+  data.tar.gz: e1a8370c604d5de524384bce470dce5d3ee87bb2e052c2f2b7f98f8ad0e2f04af6698ac24ffc7c28a93fcbd0eca62ddf5f8fcd9f3e07d353e2d04b46308351cb

data/.rubocop.yml

@@ -1,2 +1,5 @@
 Style/Documentation:
-  Enabled: false
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120

data/Gemfile.lock

@@ -1,42 +1,26 @@
 PATH
   remote: .
   specs:
-    michael (0.1.0)
+    michael (0.2.0)
       octokit (~> 4.0)
       parallel (~> 1.18.0)
       pastel (~> 0.7.2)
       ruby-duration (~> 3.2.3)
       thor (~> 0.20.0)
-      tty-box (~> 0.4.1)
-      tty-color (~> 0.5)
-      tty-command (~> 0.9.0)
       tty-config (~> 0.3.2)
-      tty-cursor (~> 0.7)
       tty-editor (~> 0.5)
-      tty-file (~> 0.8.0)
-      tty-font (~> 0.4.0)
       tty-logger (~> 0.2.0)
-      tty-markdown (~> 0.6.0)
-      tty-pager (~> 0.12)
-      tty-pie (~> 0.3.0)
-      tty-platform (~> 0.2)
-      tty-progressbar (~> 0.17)
       tty-prompt (~> 0.19)
-      tty-screen (~> 0.7)
-      tty-spinner (~> 0.9)
-      tty-table (~> 0.11.0)
-      tty-tree (~> 0.3)
-      tty-which (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.0)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     coderay (1.1.2)
@@ -50,9 +34,8 @@ GEM
       concurrent-ruby (~> 1.0)
     iso8601 (0.12.1)
     json (2.2.0)
-    kramdown (1.16.2)
     method_source (0.9.2)
-    minitest (5.12.2)
+    minitest (5.13.0)
     multipart-post (2.1.1)
     necromancer (0.5.0)
     octokit (4.14.0)
@@ -66,7 +49,6 @@ GEM
       method_source (~> 0.9.0)
     public_suffix (4.0.1)
     rake (10.5.0)
-    rouge (3.12.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -92,52 +74,16 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    strings (0.1.6)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tty-box (0.4.1)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
-      tty-cursor (~> 0.7)
     tty-color (0.5.0)
-    tty-command (0.9.0)
-      pastel (~> 0.7.0)
     tty-config (0.3.2)
     tty-cursor (0.7.0)
     tty-editor (0.5.1)
       tty-prompt (~> 0.19)
       tty-which (~> 0.4)
-    tty-file (0.8.0)
-      diff-lcs (~> 1.3)
-      pastel (~> 0.7.2)
-      tty-prompt (~> 0.18)
-    tty-font (0.4.0)
     tty-logger (0.2.0)
       pastel (~> 0.7.0)
-    tty-markdown (0.6.0)
-      kramdown (~> 1.16.2)
-      pastel (~> 0.7.2)
-      rouge (~> 3.3)
-      strings (~> 0.1.4)
-      tty-color (~> 0.4)
-      tty-screen (~> 0.6)
-    tty-pager (0.12.1)
-      strings (~> 0.1.4)
-      tty-screen (~> 0.6)
-      tty-which (~> 0.4)
-    tty-pie (0.3.0)
-      pastel (~> 0.7.3)
-      tty-cursor (~> 0.7)
-    tty-platform (0.2.1)
-    tty-progressbar (0.17.0)
-      strings-ansi (~> 0.1.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      unicode-display_width (~> 1.6)
     tty-prompt (0.19.0)
       necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
@@ -147,22 +93,11 @@ GEM
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
     tty-screen (0.7.0)
-    tty-spinner (0.9.1)
-      tty-cursor (~> 0.7)
-    tty-table (0.11.0)
-      equatable (~> 0.6)
-      necromancer (~> 0.5)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.5)
-      tty-screen (~> 0.7)
-    tty-tree (0.3.0)
     tty-which (0.4.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    unicode_utils (1.4.0)
     wisper (2.0.1)
-    zeitwerk (2.2.0)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby
@@ -170,7 +105,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   michael!
-  pry
+  pry (~> 0.12.2)
   rake (~> 10.0)
   rspec (~> 3.0)
   simplecov (~> 0.17.0)

data/exe/michael

@@ -17,7 +17,7 @@ begin
 rescue TTY::Reader::InputInterrupt
   warn('interrupted')
   exit(1)
-rescue Michael::CLI::Error => e
-  puts "ERROR: #{e.message}"
+rescue Michael::Error => e
+  puts "Error: #{e.message}"
   exit 1
 end

data/lib/michael.rb

@@ -4,5 +4,6 @@ require 'michael/version'
 
 module Michael
   class Error < StandardError; end
+  class Fatal < StandardError; end
 
 end

data/lib/michael/cli.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'tty-prompt'
+require 'tty-config'
+
+require_relative 'constants'
+require_relative 'services/github/token'
+require_relative 'services/configuration'
 
 module Michael
   # Handle the application command line parsing
@@ -35,7 +41,15 @@ module Michael
         invoke :help, ['auth']
       else
         require_relative 'commands/auth'
-        Michael::Commands::Auth.new(options).execute
+        ttycfg = TTY::Config.new
+        ttycfg.append_path(Michael::CONFIG_DIR_ABSOLUTE_PATH)
+        ttycfg.filename = Michael::CONFIG_FILENAME
+
+        cfg = Michael::Services::Configuration.new(ttycfg)
+
+        token = Michael::Services::Github::Token.new(cfg)
+
+        Michael::Commands::Auth.new(TTY::Prompt.new, token, options).execute
       end
     end
   end

data/lib/michael/commands/auth.rb

@@ -1,35 +1,25 @@
 # frozen_string_literal: true
 
-require 'tty-prompt'
-
-require_relative '../command'
-require_relative '../models/github/token_validator'
-
 module Michael
   module Commands
-    class Auth < Michael::Command
-      attr_reader :prompt
-
-      def initialize(options)
-        @prompt = TTY::Prompt.new
+    class Auth
+      def initialize(prompt, token, options)
+        @prompt = prompt
+        @token = token
         @options = options
       end
 
-      def execute(out: $stdout)
-        token = read_token
-        unless Michael::Models::Github::TokenValidator.token_valid?(token)
-          return out.puts 'Specified token is invalid'
-        end
-
-        unless Michael::Models::Github::TokenValidator.save_token(token)
-          return out.puts 'Failed to save the token'
-        end
-
-        out.puts 'Token saved'
+      def execute
+        tkn = read_token
+        token.validate(tkn)
+        token.store(tkn)
+        puts 'Token saved!'
       end
 
       private
 
+      attr_reader :prompt, :token, :options
+
       def read_token
         prompt.mask('Please specify github token:', echo: false) do |q|
           q.modify :strip

data/lib/michael/commands/repos.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'tty-editor'
+
+require 'michael/constants'
+require 'michael/services/github/users'
+require 'michael/services/configuration'
+require 'michael/services/github/token'
+require 'michael/services/github/pull_requests'
+require 'michael/services/repositories'
 
 module Michael
   module Commands
@@ -15,7 +23,22 @@ module Michael
           invoke :help, ['edit']
         else
           require_relative 'repos/edit'
-          Michael::Commands::Repos::Edit.new(options).execute
+          ttycfg = TTY::Config.new
+          ttycfg.append_path(Michael::CONFIG_DIR_ABSOLUTE_PATH)
+          ttycfg.filename = Michael::CONFIG_FILENAME
+
+          ttycfgrepos = TTY::Config.new
+          ttycfgrepos.append_path(Michael::CONFIG_DIR_ABSOLUTE_PATH)
+          ttycfgrepos.filename = Michael::CONFIG_REPOS_FILENAME
+
+          cfg = Michael::Services::Configuration.new(ttycfg)
+          repocfg = Michael::Services::Configuration.new(ttycfgrepos)
+
+          token = Michael::Services::Github::Token.new(cfg)
+          token.validate(cfg.fetch(:token))
+
+          repos_filepath = Michael::CONFIG_DIR_ABSOLUTE_PATH + '/' + Michael::CONFIG_REPOS_FILENAME + '.yml'
+          Michael::Commands::Repos::Edit.new(repos_filepath, repocfg, TTY::Editor, options).execute
         end
       end
 
@@ -41,7 +64,21 @@ module Michael
           invoke :help, ['prs']
         else
           require_relative 'repos/pull_requests'
-          Michael::Commands::Repos::PullRequests.new(options).execute
+          ttycfgrepos = TTY::Config.new
+          ttycfgrepos.append_path(Michael::CONFIG_DIR_ABSOLUTE_PATH)
+          ttycfgrepos.filename = Michael::CONFIG_REPOS_FILENAME
+
+          ttycfgtkn = TTY::Config.new
+          ttycfgtkn.append_path(Michael::CONFIG_DIR_ABSOLUTE_PATH)
+          ttycfgtkn.filename = Michael::CONFIG_FILENAME
+
+          repocfg = Michael::Services::Configuration.new(ttycfgrepos)
+          tkncfg = Michael::Services::Configuration.new(ttycfgtkn)
+
+          prs = Michael::Services::Github::PullRequests.new(tkncfg)
+          users = Michael::Services::Github::Users.new(tkncfg)
+          repos = Michael::Services::Repositories.new(prs)
+          Michael::Commands::Repos::PullRequests.new(repocfg, users, repos, options).execute
         end
       end
     end

data/lib/michael/commands/repos/edit.rb

@@ -1,24 +1,28 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-require_relative '../../models/guard'
-
 module Michael
   module Commands
     class Repos
-      class Edit < Michael::Models::Guard
-        def initialize(options)
+      class Edit
+        def initialize(repos_filepath, cfg, editor, options)
           super()
 
+          @repos_filepath = repos_filepath
+          @cfg = cfg
+          @editor = editor
           @options = options
         end
 
-        def execute(input: $stdin, output: $stdout)
-          list = repos_config.fetch(:repos)
-          repos_config.append('org/repo', to: :repos) if list.nil? || list.empty?
+        def execute
+          list = cfg.fetch(:repos)
+          cfg.append('org/repo', to: :repos) if list.nil? || list.empty?
 
-          editor.open(repos_config.config_file_path)
+          editor.open(repos_filepath)
         end
+
+        private
+
+        attr_reader :repos_filepath, :cfg, :editor
       end
     end
   end

data/lib/michael/commands/repos/pull_requests.rb

@@ -2,130 +2,71 @@
 
 require 'parallel'
 
-require_relative '../../command'
-require_relative '../../models/github/pull_request'
-require_relative '../../models/guard'
-require_relative '../../models/pull_request_formatter'
-require_relative '../../models/repository_formatter'
-require_relative '../../models/github/user'
-
 module Michael
   module Commands
     class Repos
-      class PullRequests < Models::Guard
-        def initialize(options)
-          super()
-
-          @prs = Michael::Models::Github::PullRequest.new
-          @user = Michael::Models::Github::User.new
-          @repos = repos_config.fetch(:repos)
-          abort 'No repositories configured' if @repos.nil? || @repos.empty?
+      class PullRequests
+        attr_reader :config, :users, :repos, :options
 
+        def initialize(config, users, repos, options)
+          @config = config
+          @users = users
+          @repos = repos
           @options = options
         end
 
-        def execute(out: $stdout)
-          list = get_repos_with_spinner(out)
+        def execute
+          q = Queue.new
+          waiting = print_waiting(q)
+          list = config.fetch(:repos)
 
-          print_good_prs(out, repos_with_prs(list))
-          print_repos_w_no_prs(out, repos_no_prs(list)) if options[:show_empty]
-          print_broken_repos(out, list.select { |item| item[:state] == :failed })
+          list = repos.pull_requests(list, q)
+          waiting.join
+
+          puts [filter_repos_w_prs(list), get_empty(list), get_broken(list)]
+            .reject(&:nil?).join("\n\n")
         end
 
         private
 
-        attr_reader :prs, :options, :repos, :user
-
-        def get_repos_with_spinner(out)
-          progress = 0
-          spin = spinner(
-            "[:spinner] :progress/#{repos.length} processing...",
-            output: out
-          )
-
-          spin.update(progress: 0)
-
-          result = Parallel.map(repos, in_threads: 5) do |repo|
-            progress += 1
-            spin.update(progress: progress)
-            spin.spin
-            out = prs.process_repo(repo)
-            spin.spin
-            out
+        def filter_repos_w_prs(list)
+          list.each do |r|
+            r.prs.reject! { |pr| pr.author?(users.user.username) } if options[:skip_self]
+            r.prs.reject!(&:approved?) if options[:hide_approved]
+            r.prs.select!(&:needs_review?) if options[:needs_review]
+            r.prs.select! { |pr| pr.actionable?(users.user.username) } if options[:actionable]
           end
 
-          spin.stop('done')
-
-          result
+          list.select(&:has_prs?).map!(&:pretty_print).join("\n\n")
         end
 
-        def repos_no_prs(list_all)
-          list_all
-            .select { |item| item[:state] == :success && item[:prs].empty? }
-            .map { |item| item[:repo] }
-        end
-
-        def repos_with_prs(list)
-          list = needs_review(list) if options[:needs_review]
-          list = skip_self(list) if options[:skip_self]
-          list = hide_approved_or_commented(list) if options[:hide_approved]
-          list = actionable(list) if options[:actionable]
-          list = select_repos_w_prs(list)
+        def get_broken(list)
+          broken = list.select(&:broken?)
+          return nil if broken.none?
 
-          list.map { |item| Michael::Models::RepositoryFormatter.new(item[:repo], item[:prs]).pretty }
+          'Broken repos: ' + broken.map(&:pretty_print).join(', ')
         end
 
-        def skip_self(list)
-          list.each do |item|
-            item[:prs] = item[:prs].reject { |pr| pr.author == user.username }
-          end
-        end
+        def get_empty(list)
+          return nil unless options[:show_empty]
 
-        def hide_approved_or_commented(list)
-          list.each do |item|
-            item[:prs] = item[:prs].reject do |pr|
-              pr.reviews.all? { |review| review.approved? || review.commented? }
-            end
-          end
-        end
+          empty = list.reject(&:has_prs?)
+          return nil if empty.none?
 
-        def select_repos_w_prs(list)
-          list.select { |item| item[:state] == :success && item[:prs].any? }
+          'No PRs: ' + empty.map(&:pretty_print).join(', ')
         end
 
-        def needs_review(list)
-          list.each do |item|
-            item[:prs] = item[:prs].reject do |pr|
-              pr.reviews.any?
+        def print_waiting(queue)
+          Thread.new do
+            until queue.closed?
+              queue.pop
+              print '.'
+              $stdout.flush
             end
-          end
-        end
 
-        def actionable(list)
-          list.each do |item|
-            item[:prs] = item[:prs].reject do |pr|
-              reviewed = pr.reviews.any? { |review| review.author == user.username }
-              new_changes = pr.last_update_head?
-
-              reviewed && !new_changes
-            end
+            puts
           end
         end
-
-        def print_good_prs(out, list)
-          out.puts "\n" + list.join("\n\n")
-        end
-
-        def print_repos_w_no_prs(out, list)
-          out.puts "\nRepos with no opened PRs: #{list.join(', ')}" if list.any?
-        end
-
-        def print_broken_repos(out, list)
-          return if list.empty?
-
-          list = list.map { |repo| pastel.on_red.black(repo[:repo]) }
-          out.puts "\nBad repos: #{list.join(', ')}"
-        end
       end
     end
   end