gb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cbb144ce7b27e5b2d0baf6bef7ad30b081f2b858e7269575fe8077f7a82836a
-  data.tar.gz: 281cae42940517465d86449a455fd1a461059ec8863227a549515b6c0d3329d9
+  metadata.gz: b92a4e546c65aa5763dbca8c0d44ce618b7049464a6bd3b2cdd6cab0d40d8319
+  data.tar.gz: a250d44da3534a1e6d7838a85a6c4a29181c1265aff835da5d04bc0b0f82cf4c
 SHA512:
-  metadata.gz: 80d86fa85596b45d698be35d7c3e4601ecbc7f994665d257b388f1e9480088866a4b8e9d3fd17f38c6def6b8e965e84c1f5bb30b728ce14fa9db585ae5139d1e
-  data.tar.gz: 5961753dc5033357b96cb524339accb519275347ff53b5c92a68487b6c0ef0e47dfd6906a68ed0401c99d20485a9353e670efa66490175cf559d4925bb5c334b
+  metadata.gz: e51b1b5d76ee3590650665a52731fbdf11dcea9c2a67f9f9ca1034a4c8b53334690ea60c7d77a38e077bd93d74480cee0fc463f2be564aef57c527da3a61df32
+  data.tar.gz: 7a37de109ec6ec2409277f93a2e53b5ee8863ce337723d22ff630314736fac0567cc015d0be8b55af6a5f60a0bd45d1eff876b0c52efe92904761bc8b1d69343

data/lib/commands/review.rb

@@ -18,6 +18,7 @@ module Gb
     def self.options
       [
           ["--assignee=[user name]", "指定review用户名称"],
+          ["--at=[user name]", "指定要@用户名称"],
           ["--title", "merge request标题"],
           ["--show-diff", "review前是否显示变更"],
       ].concat(super)
@@ -27,6 +28,7 @@ module Gb
       # @working_branch = argv.shift_argument
       # @remote_branch = argv.shift_argument
       @assignee = argv.option('assignee')
+      @at = argv.option('at')
       @title = argv.option('title')
       @show_diff = argv.flag?('show-diff')
       super
@@ -71,6 +73,11 @@ module Gb
         user = gitlab_search_user(@assignee)
       end
 
+      at_user = nil
+      if !@at.nil?
+        at_user = gitlab_search_user(@at)
+      end
+
       self.gb_config.projects.each_with_index do |project, index|
         project_path = File.expand_path(project.name, './')
         if File.exist?(project_path)
@@ -151,11 +158,24 @@ module Gb
 
         if user.nil?
           users = gitlab_get_team_members(gitlab_project.id)
+
+          info "Find user to assign."
+          users.each_with_index do |user, index|
+            puts "#{index + 1}、#{user.username}（#{user.name})".green
+          end
+
           begin
             info "\nSelect user name or index for review."
             input_user = STDIN.gets.chomp
-            if input_user =~ /[[:digit:]]/
-              user = users[input_user.to_i - 1]
+            if input_user.length == 0
+              user = nil
+            elsif input_user =~ /[[:digit:]]/
+              index = input_user.to_i;
+              if index > 0 && index < users.size
+                user = users[input_user.to_i - 1]
+              else
+                user = nil
+              end
             else
               user = gitlab_search_user(input_user)
             end
@@ -174,6 +194,40 @@ module Gb
           end until @title.length > 0
         end
 
+        if at_user.nil?
+          info "Find user for @."
+          puts "0、none".green
+          users.each_with_index do |user, index|
+            puts "#{index + 1}、#{user.username}（#{user.name})".green
+          end
+
+          begin
+            info "\nSelect user name or index for @."
+            input_user = STDIN.gets.chomp
+            if input_user =~ /[[:digit:]]/
+              index = input_user.to_i;
+              if index == 0
+                break
+              end
+              at_user = users[index - 1]
+            else
+              if input_user.length == 0
+                break
+              elsif index < users.size
+                user = users[input_user.to_i - 1]
+              else
+                user = nil
+              end
+              at_user = gitlab_search_user(input_user)
+            end
+            if at_user.nil?
+              error "Can not found user '#{input_user}'."
+            else
+              info "@#{at_user.username}(#{at_user.name})"
+            end
+          end until !at_user.nil?
+        end
+
         # 总共 0 （差异 0），复用 0 （差异 0）
         # remote:
         #     remote: To create a merge request for dev-v3.9.0-luobin, visit:
@@ -183,8 +237,8 @@ module Gb
         # * [new branch]        dev-v3.9.0-luobin -> dev-v3.9.0-luobin
 
         begin
-          merge_request = Gitlab.create_merge_request(gitlab_project.id, @title,
-                                      { source_branch: @working_branch, target_branch: @remote_branch, assignee_id:user ? user.id : "" })
+          options = { source_branch: @working_branch, target_branch: @remote_branch, assignee_id:user ? user.id : "", description:at_user ? "@#{at_user.username}":nil }
+          merge_request = Gitlab.create_merge_request(gitlab_project.id, @title, options)
           info "Create merge request for #{project.name} success. see detail url:#{merge_request.web_url}"
           if !Gem.win_platform?
             `open -a "/Applications/Google Chrome.app"    '#{merge_request.web_url}/diffs'`
@@ -247,10 +301,7 @@ module Gb
         user.username == 'root'
       }
       if users.size > 0
-        info "Find user to assign."
-        users.each_with_index do |user, index|
-          puts "#{index + 1}、#{user.username}（#{user.name})".green
-        end
+
       else
         raise Error.new("Can't find members in project '#{project_id}''.")
       end

data/lib/gb/version.rb

@@ -1,3 +1,3 @@
 module Gb
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - binluo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab