gerrit 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c14a9161708725543c0375055c068e864a8e0d00
-  data.tar.gz: 1aab149820844fe5cebae082f3f77bd728062b65
+  metadata.gz: d050a0ac17abfa314ecaa5b6fd07037499f8e471
+  data.tar.gz: 72446d0641f5ed8ca4e4963234b126166e01f36a
 SHA512:
-  metadata.gz: f44d2871bc42bf4dee823f3ee878fc8c01657e0a942d10b2a12f92f521b2c81cf3e82cd127317996ff20f94e2f6b8b059a4cf4d95fd97c1b360d6d91407fff0f
-  data.tar.gz: 0d7d9d5fd9631a66ad805e452570ac917a8e03cb90f8062aa39e99bcbd95d4a97027147d147345ca5c0e9c0c6a0de5fad19b3275072e67eeeadcc5c71e2205c7
+  metadata.gz: 9dd2197c2035696ea52a8cf13595b88ecdcbaabeb2dfede9d60299f11d3097b54bf7e3ae7843d3dae75984433c0dd4b6b1f4bbc66384369c3f82af3fa62bcbb0
+  data.tar.gz: 6b403e7c5c7dae06f10734d94a8de8a681f484f701946634b042b8c8ca71586e33e85b90b6267c7bc472655d956642a25a4baad72b6355d986d78edf0c09ef99

data/lib/gerrit/command/push.rb

@@ -10,19 +10,34 @@ module Gerrit::Command
       if commit_hash?(arguments[1]) || arguments[1] == 'HEAD'
         ref = arguments[1]
         reviewer_args = arguments[2..-1] || []
-        target_branch = 'master'
         type = 'publish'
         topic = nil
+        target_branch = 'master'
       else
         ref = 'HEAD'
         reviewer_args = arguments[1..-1] || []
-        target_branch = ask_target_branch
         type = ask_review_type
         topic = ask_topic
+        target_branch = ask_target_branch
       end
 
       reviewers = extract_reviewers(reviewer_args)
 
+      if reviewers.size > 3
+        ui.newline
+        ui.info("You are adding #{reviewers.size} people as reviewers for this change")
+
+        reviewers.each do |username|
+          ui.print username
+        end
+
+        until %w[y n].include?(ui.ask('Is this ok? (y/n) ')
+                                 .argument(:required)
+                                 .modify(:downcase)
+                                 .read_string)
+        end
+      end
+
       push_changes(remote_url, ref, reviewers, target_branch, type, topic)
     end
 
@@ -56,7 +71,7 @@ module Gerrit::Command
 
     def extract_reviewers(reviewer_args)
       if reviewer_args.empty?
-        reviewer_args = ui.ask('Enter users/groups you would like to review your changes')
+        reviewer_args = ui.ask('Enter users/groups you would like to review your changes: ')
                           .argument(:required)
                           .read_string
                           .split(/\s*,\s*/)
@@ -64,15 +79,21 @@ module Gerrit::Command
 
       return [] if reviewer_args.empty?
 
-      ui.spinner('Finding matching users/groups...') do
-        extract_users(reviewer_args)
-      end
+      extract_users(reviewer_args)
     end
 
     def extract_users(reviewer_args)
       usernames = []
-      groups = client.groups
-      users = client.users
+      groups = nil
+      users = nil
+
+      # HACK: We wrap these slow calls in a spinner since other parts of this
+      # helper can prompt for input, which doesn't play well with the spinner
+      # animation.
+      ui.spinner('Finding matching users/groups...') do
+        groups = client.groups
+        users = client.users
+      end
 
       reviewer_args.each do |arg|
         users_or_groups = arg.split(/\s*,\s*|\s+/)
@@ -91,7 +112,27 @@ module Gerrit::Command
       # Don't scan users since we already matched a group
       return group_users if group_users.any?
 
-      users.grep(/#{pattern}/i)
+      matching_users = users.grep(/#{pattern}/i)
+
+      # If more than one match for an individual user, confirm which one.
+      if matching_users.size >= 2
+        ui.info("Multiple users match the pattern '#{pattern}':")
+        matching_users.each_with_index do |username, index|
+          ui.print "#{index + 1}. #{username}"
+        end
+
+        while matching_users.size >= 2
+          index = ui.ask('Enter the number of the user you meant: ')
+                    .argument(:required)
+                    .read_int
+
+          if index > 0 && index <= matching_users.size
+            matching_users = [matching_users[index - 1]]
+          end
+        end
+      end
+
+      matching_users
     end
 
     def users_from_group(groups, group)
@@ -103,7 +144,7 @@ module Gerrit::Command
     end
 
     def ask_target_branch
-      target = ui.ask('Target branch (default master)')
+      target = ui.ask('Target branch [master] ')
                  .modify(:trim)
                  .read_string
 
@@ -111,7 +152,7 @@ module Gerrit::Command
     end
 
     def ask_review_type
-      draft = ui.ask('Are you pushing this as a draft? (y/n) [n]')
+      draft = ui.ask('Are you pushing this as a draft? (y/n) [n] ')
                 .argument(:required)
                 .default('n')
                 .modify(:downcase)
@@ -121,13 +162,12 @@ module Gerrit::Command
     end
 
     def ask_topic
-      topic = ui.ask('Topic name (optional; enter * to autofill with your current branch:')
+      topic = ui.ask('Enter topic name (optional; enter * to use current branch name) ')
                 .argument(:optional)
                 .read_string
 
       topic = repo.branch('HEAD') if topic == '*'
       topic.strip.empty? ? nil : topic
     end
-
   end
 end

data/lib/gerrit/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Gerrit
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gerrit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shane da Silva