gitlabci-bundle-update-mr 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a065986105c7fbd7f50eb145776cb26e84fc40d4e6880008f5be67f2200cdc57
-  data.tar.gz: 652216fddd681c1d47098a4067a362fecda7238024967d56d4eae6abb3696621
+  metadata.gz: 328b0a88d5bbc5b521b604ee4d223ebe299b0b3eeb130680c18683ff8150bfc4
+  data.tar.gz: fff81a3041e33440121420c3adbace6229105eddce5ce3514e726313af5a8d1a
 SHA512:
-  metadata.gz: c976b5cfa5ef0b0c45ebb585dd184f2ad783c67ae5a4635fba35071197c3e6e2459807a75fb7eeac2dfc2e15704419793684dfeba14c28bcd58a69fe60e618c3
-  data.tar.gz: 8a105f20e246ce52d15779c0a5c69534c451a4c22387c65c554b058f1386f32bda2a0bf29ecd146838c8027fb0392e71d3070376075bc68a7b008a718969ca22
+  metadata.gz: e1b567cbe53d70bb6677221d500d07a417db35dfbbfc8c2061056926b1e6a2840f203cfab1ed8983c48591d74a28efbe08411bbebb122e27d08f7a2535c18ef0
+  data.tar.gz: 3bba3ccee80b94393b1294a0238b4bf0a21e8463a8b1e42ef99e4a5b4d8ed3574b50a70219efc8114d5dab82ced6abfaf9b9335f23b268f9cbca99e1baa0f5bc

data/.gitlab-ci.yml

@@ -13,6 +13,7 @@ continuous_bundle_update:
     GIT_EMAIL:     "gitlabci@example.com"
     GIT_USER:      "GitLab CI"
     OPTIONS:       "--merge-when-pipeline-succeeds"
+    ASSIGNEES:     "sue445"
 
   before_script:
     # Set timezone to Asia/Tokyo

data/.rubocop.yml

@@ -10,6 +10,7 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
@@ -25,4 +26,4 @@ Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 Metrics/MethodLength:
-  Max: 21
+  Max: 22

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.0.0...master)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.1.0...master)
+
+## v1.1.0
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v1.0.0...v1.1.0)
+
+* Support assignee [!113](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/113) *@sue445*
 
 ## v1.0.0
 [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.3.0...v1.0.0)

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (1.0.0)
+    gitlabci-bundle-update-mr (1.1.0)
       bundler
       compare_linker (>= 1.4.3)
       gitlab (>= 4.14.1)
@@ -21,22 +21,21 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    compare_linker (1.4.3)
+    ast (2.4.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    compare_linker (1.4.4)
       httpclient
       octokit
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
+    crack (0.4.4)
+    diff-lcs (1.4.4)
     docile (1.3.2)
-    dotenv (2.7.5)
-    faraday (1.0.0)
+    dotenv (2.7.6)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    git (1.6.0)
+    git (1.7.0)
       rchardet (~> 1.8)
-    gitlab (4.14.1)
+    gitlab (4.16.1)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab_awesome_release (1.0.2)
@@ -44,34 +43,33 @@ GEM
       gitlab (>= 4.0.0)
       thor
     hashdiff (1.0.1)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    octokit (4.16.0)
+    octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.1)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    public_suffix (4.0.3)
+    parallel (1.19.2)
+    parser (2.7.1.5)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
     rake (13.0.1)
     rchardet (1.8.0)
+    regexp_parser (1.8.0)
     restore_bundled_with (1.0.0)
       git
       thor
@@ -80,50 +78,55 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rspec-temp_dir (1.1.0)
       rspec (>= 3.0)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    rubocop_auto_corrector (0.3.0)
-      rubocop (>= 0.72.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.6.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (1.43.2)
+      rubocop (~> 0.87)
+    rubocop_auto_corrector (0.4.1)
+      rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    simplecov (0.17.1)
+    simplecov (0.19.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
-    unicode-display_width (1.6.1)
-    webmock (3.8.2)
+    unicode-display_width (1.7.0)
+    webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.24)
+    yard (0.9.25)
 
 PLATFORMS
   ruby
@@ -138,6 +141,7 @@ DEPENDENCIES
   pry-byebug
   rake (>= 10.0)
   rspec (~> 3.0)
+  rspec-its
   rspec-temp_dir
   rubocop (>= 0.68.0)
   rubocop-performance
@@ -146,3 +150,6 @@ DEPENDENCIES
   simplecov
   webmock
   yard
+
+BUNDLED WITH
+   2.1.2

data/README.md

@@ -101,6 +101,7 @@ continuous_bundle_update:
     GIT_EMAIL:     "gitlabci@example.com"
     GIT_USER:      "GitLab CI"
     LABELS:        "bundle update"
+    ASSIGNEES:     "foo, bar, baz"
     OPTIONS:       ""
 
   before_script:
@@ -124,6 +125,32 @@ Usage: gitlabci-bundle-update-mr [options]
         --update-bundled-with        Whether to update `BUNDLED WITH` section in Gemfie.lock (default. false)
         --merge-when-pipeline-succeeds
                                      Whether to set 'Merge when pipeline succeeds' (default. false)
+        --assignees 'foo, bar'       Add assignees to the MR
+```
+
+## ProTip
+### Randomly assign 1 person to MergeRequest
+```yml
+include:
+  - remote: "https://gitlab.com/sue445/gitlabci-bundle-update-mr/raw/master/gitlabci-templates/continuous_bundle_update.yml"
+
+continuous_bundle_update:
+  stage: build
+
+  before_script:
+    - ASSIGNEES=$(ruby -e 'print %w[foo bar baz].sample')
+```
+
+### Assign one person to MR on a weekly basis
+```yml
+include:
+  - remote: "https://gitlab.com/sue445/gitlabci-bundle-update-mr/raw/master/gitlabci-templates/continuous_bundle_update.yml"
+
+continuous_bundle_update:
+  stage: build
+
+  before_script:
+    - ASSIGNEES=$(ruby -rtime -e 'a=%w[foo bar baz]; print a[Time.now.to_date.cweek% a.size]')
 ```
 
 ## Development

data/exe/gitlabci-bundle-update-mr

@@ -11,6 +11,7 @@ allow_dup_mr = false
 mr_labels = []
 update_bundled_with = false
 merge_when_pipeline_succeeds = false
+assignees = []
 
 opt.on("--email EMAIL", "git email address (default. `git config user.email`)") {|v| author_email = v }
 opt.on("--user USER", "git username (default. `git config user.name`)") {|v| author_name = v }
@@ -18,6 +19,7 @@ opt.on("-d", "--duplicate", "Make MR even if it has already existed (default. fa
 opt.on("-l", "--labels 'In Review, Update'", Array, "Add labels to the MR") {|v| mr_labels = v.map(&:strip) }
 opt.on("--update-bundled-with", "Whether to update `BUNDLED WITH` section in Gemfie.lock (default. false)") {|v| update_bundled_with = v }
 opt.on("--merge-when-pipeline-succeeds", "Whether to set 'Merge when pipeline succeeds' (default. false)") {|v| merge_when_pipeline_succeeds = v }
+opt.on("--assignees 'foo, bar'", Array, "Add assignees to the MR") {|v| assignees = v.map(&:strip) }
 
 opt.parse!(ARGV)
 
@@ -37,4 +39,5 @@ client.perform(
   mr_labels:                    mr_labels,
   update_bundled_with:          update_bundled_with,
   merge_when_pipeline_succeeds: merge_when_pipeline_succeeds,
+  assignees:                    assignees,
 )

data/gitlabci-bundle-update-mr.gemspec

@@ -47,9 +47,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-temp_dir"
-  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "rubocop_auto_corrector"
+  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"

data/gitlabci-templates/continuous_bundle_update.yml

@@ -6,6 +6,7 @@ continuous_bundle_update:
     GIT_EMAIL:     "gitlabci@example.com"
     GIT_USER:      "GitLab CI"
     LABELS:        "bundle update"
+    ASSIGNEES:     ""
     OPTIONS:       ""
 
   cache:
@@ -16,6 +17,10 @@ continuous_bundle_update:
   script:
     - bundle install --path vendor/bundle --clean
     - gem install --no-doc gitlabci-bundle-update-mr
+    - |
+      if [ -n "$ASSIGNEES" ]; then
+        OPTIONS="--assignees $ASSIGNEES $OPTIONS"
+      fi
     - gitlabci-bundle-update-mr --user="$GIT_USER" --email="$GIT_EMAIL" --labels="$LABELS" $OPTIONS
 
   only:

data/lib/gitlabci/bundle/update/mr.rb

@@ -14,6 +14,8 @@ module Gitlabci
 
         class MissingKeyError < Error; end
 
+        class NotFoundUserError < Error; end
+
         def self.assert_env_keys
           %w[
             OCTOKIT_ACCESS_TOKEN

data/lib/gitlabci/bundle/update/mr/client.rb

@@ -28,12 +28,14 @@ module Gitlabci
           # @param mr_labels [Array<String>]
           # @param update_bundled_with [Boolean]
           # @param merge_when_pipeline_succeeds [Boolean]
-          def perform(allow_dup_mr:, mr_labels:, update_bundled_with:, merge_when_pipeline_succeeds:)
+          # @param assignees [Array<String>]
+          def perform(allow_dup_mr:, mr_labels:, update_bundled_with:, merge_when_pipeline_succeeds:, assignees:)
             if !allow_dup_mr && exists_bundle_update_mr?
               puts "Skip because it has already existed."
               return
             end
 
+            assignee_ids = get_assignee_ids(assignees)
             old_lockfile = File.read(lockfile_name)
 
             system!("bundle update")
@@ -51,7 +53,7 @@ module Gitlabci
             commit_gemfile_lock(new_lockfile)
             description = merge_request_description(old_lockfile, new_lockfile)
 
-            mr = create_merge_request(description: description, mr_labels: mr_labels)
+            mr = create_merge_request(description: description, mr_labels: mr_labels, assignee_ids: assignee_ids)
             puts "MR is created: #{mr.web_url}"
 
             if merge_when_pipeline_succeeds
@@ -81,7 +83,10 @@ module Gitlabci
 
           # @param description [String]
           # @param mr_labels [Array<String>]
-          def create_merge_request(description:, mr_labels:)
+          # @param assignee_ids [Array<Integer>]
+          #
+          # @see https://docs.gitlab.com/ee/api/merge_requests.html#create-mr
+          def create_merge_request(description:, mr_labels:, assignee_ids:)
             params = {
               source_branch:        new_branch,
               target_branch:        @branch,
@@ -93,6 +98,12 @@ module Gitlabci
               params[:labels] = mr_labels.join(",")
             end
 
+            if assignee_ids.length == 1
+              params[:assignee_id] = assignee_ids[0]
+            elsif assignee_ids.length >= 2
+              params[:assignee_ids] = assignee_ids
+            end
+
             @gitlab.create_merge_request(
               @project_name,
               "#{TITLE_PREFIX}#{current_time.strftime("%Y-%m-%d %H:%M:%S %Z")}",
@@ -120,6 +131,33 @@ module Gitlabci
             MARKDOWN
           end
 
+          # @param username [String]
+          #
+          # @return [Gitlab::ObjectifiedHash]
+          # @return [nil] User isn't found
+          #
+          # @see https://docs.gitlab.com/ee/api/users.html#for-normal-users
+          def find_by_username(username)
+            @gitlab.users(username: username).first
+          end
+
+          # @param username [String]
+          #
+          # @return [Gitlab::ObjectifiedHash]
+          #
+          # @raise [Gitlabci::Bundle::Update::Mr::NotFoundUserError]
+          #
+          # @see https://docs.gitlab.com/ee/api/users.html#for-normal-users
+          def find_by_username!(username)
+            user = find_by_username(username)
+
+            unless user
+              raise NotFoundUserError, "#{username} isn't found"
+            end
+
+            user
+          end
+
           private
 
             def system!(command)
@@ -170,6 +208,13 @@ module Gitlabci
             def accept_merge_request(mr_id)
               @gitlab.accept_merge_request(@project_name, mr_id, merge_when_pipeline_succeeds: true, should_remove_source_branch: true)
             end
+
+            def get_assignee_ids(assignees)
+              assignees.map do |username|
+                user = find_by_username!(username)
+                user.id
+              end
+            end
         end
       end
     end

data/lib/gitlabci/bundle/update/mr/version.rb

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "1.0.0".freeze
+        VERSION = "1.1.0".freeze
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlabci-bundle-update-mr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-temp_dir
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rspec-temp_dir
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement