gitlabci-bundle-update-mr 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd83034890eb4da2344c15b2c56067609a5e1e61f33c7641ecc7a5669716ed99
-  data.tar.gz: b2187f1938ddced13cdb264789b6d2abb32ae8cff942619507fd2016d6e5acd0
+  metadata.gz: 74c00bc91c7d10b1e98b13306612d4ebfbaf85d9996ec7ba6afa9edf927d73d6
+  data.tar.gz: abf4225860bf01f5806d9f190edfc16196de3b36b15f76f05e641ed2da8b1370
 SHA512:
-  metadata.gz: 4ee7b26bbb3fb4537247a9063789508f09efb856c93b716e5717042ce128849e5909e9b80cc96604e0e7c3b1262c8f622a9d6280ff20f8fc1ad21e2e4633bf7f
-  data.tar.gz: 63fca35ce40e9e23f01fa6ae63e9300c4d0a942b777e0ae75bbedeedba922196e8472935614d96b8bfabe1cf67c16f1bba9c2b8219fbcffa36628dc38b8c577c
+  metadata.gz: a59d9d7cd005e94d7415df45874cf3d5b6b8ed81fb29999802edeab8081690724279019f3fc16019d84c88d7e4e771edbc42c0d9e3c331be80f2979573c2c6dd
+  data.tar.gz: 12c2bd50c6c9c20311a2fbffa3d233ef3fc789d66670fd4c3807630f6785ccad95c248a18099d525fa08cdcdcf1def125c849d0719d43fc0b5bee3b01878b938

data/.gitlab-ci.yml

@@ -12,6 +12,7 @@ continuous_bundle_update:
     CACHE_VERSION: "v2"
     GIT_EMAIL:     "gitlabci@example.com"
     GIT_USER:      "GitLab CI"
+    OPTIONS:       "--merge-when-pipeline-succeeds"
 
   before_script:
     # Set timezone to Asia/Tokyo
@@ -71,6 +72,16 @@ test:trunk:
   image: rubylang/ruby:trunk-nightly-bionic
   allow_failure: true
 
+rubocop:
+  <<: *default
+
+  stage: build
+
+  image: ruby
+
+  script:
+    - bundle exec rubocop -P
+
 pages:
   <<: *default
 

data/.rubocop.yml

@@ -0,0 +1,25 @@
+require: rubocop-performance
+
+inherit_gem:
+  onkcop:
+    - "config/rubocop.yml"
+    # uncomment if use rails cops
+    # - "config/rails.yml"
+    # uncomment if use rspec cops
+    # - "config/rspec.yml"
+
+AllCops:
+  TargetRubyVersion: 2.3
+
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+
+Layout/IndentFirstHashElement:
+  EnforcedStyle: consistent
+
+Metrics/MethodLength:
+  Max: 21

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.2.2...HEAD)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.3.0...master)
+
+## v0.3.0
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.2.2...v0.3.0)
+
+* Support "Merge when pipeline succeeds" [!41](https://gitlab.com/sue445/gitlabci-bundle-update-mr/merge_requests/41) *@sue445*
 
 ## v0.2.2
 [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v0.2.1...v0.2.2)

data/Gemfile

@@ -7,3 +7,7 @@ gemspec
 gem "faraday", ">= 0.15.4"
 gem "octokit", ">= 4.13.0"
 gem "sawyer", ">= 0.8.1"
+
+# TODO: Remove after https://github.com/onk/onkcop/pull/62 is merged
+gem "onkcop", github: "sue445/onkcop", branch: "rubocop_0.68.0", ref: "6256494"
+gem "rubocop", ">= 0.68.0"

data/Gemfile.lock

@@ -1,7 +1,17 @@
+GIT
+  remote: git://github.com/sue445/onkcop.git
+  revision: 6256494c1f860f62df6a4d57c81a4c200beee53b
+  ref: 6256494
+  branch: rubocop_0.68.0
+  specs:
+    onkcop (0.53.0.3)
+      rubocop (>= 0.53.0)
+      rubocop-rspec (>= 1.24.0)
+
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (0.2.2)
+    gitlabci-bundle-update-mr (0.3.0)
       bundler
       compare_linker (>= 1.4.3)
       gitlab (>= 4.0.0)
@@ -12,6 +22,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
     byebug (11.0.1)
     coderay (1.1.2)
     compare_linker (1.4.3)
@@ -21,31 +32,35 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.1)
-    dotenv (2.7.1)
+    dotenv (2.7.2)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     git (1.5.0)
-    gitlab (4.10.0)
+    gitlab (4.11.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
     gitlab_awesome_release (1.0.2)
       dotenv
       gitlab (>= 4.0.0)
       thor
-    hashdiff (0.3.8)
-    httparty (0.16.4)
+    hashdiff (0.3.9)
+    httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
+    jaro_winkler (1.5.2)
     json (2.2.0)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -53,6 +68,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (3.0.3)
+    rainbow (3.0.0)
     rake (10.5.0)
     restore_bundled_with (1.0.0)
       git
@@ -63,7 +79,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -72,6 +88,20 @@ GEM
     rspec-support (3.8.0)
     rspec-temp_dir (1.1.0)
       rspec (>= 3.0)
+    rubocop (0.68.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    rubocop-performance (1.1.0)
+      rubocop (>= 0.67.0)
+    rubocop-rspec (1.32.0)
+      rubocop (>= 0.60.0)
+    rubocop_auto_corrector (0.1.0)
+      rubocop (>= 0.49.0)
+    ruby-progressbar (1.10.0)
     safe_yaml (1.0.5)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -89,7 +119,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.18)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -100,10 +130,14 @@ DEPENDENCIES
   gitlab_awesome_release
   gitlabci-bundle-update-mr!
   octokit (>= 4.13.0)
+  onkcop!
   pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
   rspec-temp_dir
+  rubocop (>= 0.68.0)
+  rubocop-performance
+  rubocop_auto_corrector
   sawyer (>= 0.8.1)
   simplecov
   webmock

data/README.md

@@ -80,7 +80,7 @@ continuous_bundle_update:
 
 * GitLab Core 11.4+
 * GitLab Premium 10.5+
-* Starter, Premium and Ultimate 10.6+)
+* Starter, Premium and Ultimate 10.6+
 
 c.f. https://docs.gitlab.com/ce/ci/yaml/README.html#include
 
@@ -120,6 +120,8 @@ Usage: gitlabci-bundle-update-mr [options]
     -d, --duplicate                  Make MR even if it has already existed (default. false)
     -l, --labels 'In Review, Update' Add labels to the MR
         --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)
 ```
 
 ## Development

data/exe/gitlabci-bundle-update-mr

@@ -10,12 +10,14 @@ author_name = `git config user.name`.strip
 allow_dup_mr = false
 mr_labels = []
 update_bundled_with = false
+merge_when_pipeline_succeeds = false
 
-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 }
-opt.on("-d", "--duplicate", "Make MR even if it has already existed (default. false)") { |v| allow_dup_mr = v }
-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("--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 }
+opt.on("-d", "--duplicate", "Make MR even if it has already existed (default. false)") {|v| allow_dup_mr = v }
+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.parse!(ARGV)
 
@@ -30,4 +32,9 @@ client = Gitlabci::Bundle::Update::Mr::Client.new(
   author_name:              author_name,
 )
 
-client.perform(allow_dup_mr: allow_dup_mr, mr_labels: mr_labels, update_bundled_with: update_bundled_with)
+client.perform(
+  allow_dup_mr:                 allow_dup_mr,
+  mr_labels:                    mr_labels,
+  update_bundled_with:          update_bundled_with,
+  merge_when_pipeline_succeeds: merge_when_pipeline_succeeds,
+)

data/gitlabci-bundle-update-mr.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "gitlabci/bundle/update/mr/version"
 
@@ -9,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["sue445"]
   spec.email         = ["sue445@sue445.net"]
 
-  spec.summary       = %q{Create MergeRequest of bundle update in GitLab CI}
-  spec.description   = %q{Create MergeRequest of bundle update in GitLab CI}
+  spec.summary       = "Create MergeRequest of bundle update in GitLab CI"
+  spec.description   = "Create MergeRequest of bundle update in GitLab CI"
   spec.homepage      = "https://gitlab.com/sue445/gitlabci-bundle-update-mr"
   spec.license       = "MIT"
 
@@ -27,12 +26,12 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|img)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features|img)/}) }
   end
 
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.3.0"
@@ -44,10 +43,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "gitlab_awesome_release"
+  spec.add_development_dependency "onkcop"
   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-temp_dir"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop_auto_corrector"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"

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

@@ -15,13 +15,13 @@ module Gitlabci
         class MissingKeyError < Error; end
 
         def self.assert_env_keys
-          %w(
-              OCTOKIT_ACCESS_TOKEN
-              GITLAB_API_ENDPOINT
-              GITLAB_API_PRIVATE_TOKEN
-              CI_PROJECT_PATH
-              CI_COMMIT_REF_NAME
-            ).each do |key|
+          %w[
+            OCTOKIT_ACCESS_TOKEN
+            GITLAB_API_ENDPOINT
+            GITLAB_API_PRIVATE_TOKEN
+            CI_PROJECT_PATH
+            CI_COMMIT_REF_NAME
+          ].each do |key|
             assert_env_key(key)
           end
         end

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

@@ -2,9 +2,11 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        class Client
-          BRANCH_PREFIX = "bundle-update-"
-          TITLE_PREFIX  = "bundle update at "
+        class Client # rubocop:disable Metrics/ClassLength
+          BRANCH_PREFIX = "bundle-update-".freeze
+          TITLE_PREFIX  = "bundle update at ".freeze
+
+          # rubocop:disable Metrics/ParameterLists
 
           # @param gitlab_api_endpoint [String]
           # @param gitlab_api_private_token [String]
@@ -20,11 +22,13 @@ module Gitlabci
             @author_email = author_email
             @author_name = author_name
           end
+          # rubocop:enable Metrics/ParameterLists
 
           # @param allow_dup_mr [Boolean]
           # @param mr_labels [Array<String>]
           # @param update_bundled_with [Boolean]
-          def perform(allow_dup_mr:, mr_labels:, update_bundled_with:)
+          # @param merge_when_pipeline_succeeds [Boolean]
+          def perform(allow_dup_mr:, mr_labels:, update_bundled_with:, merge_when_pipeline_succeeds:)
             if !allow_dup_mr && exists_bundle_update_mr?
               puts "Skip because it has already existed."
               return
@@ -49,6 +53,11 @@ module Gitlabci
 
             mr = create_merge_request(description: description, mr_labels: mr_labels)
             puts "MR is created: #{mr.web_url}"
+
+            if merge_when_pipeline_succeeds
+              accept_merge_request(mr.iid)
+              puts "Set merge_when_pipeline_succeeds to #{mr.web_url}"
+            end
           end
 
           # @param lockfile [String]
@@ -59,14 +68,14 @@ module Gitlabci
               "$ bundle update && bundle update --ruby",
               [
                 {
-                  action: "update",
+                  action:    "update",
                   file_path: lockfile_name,
-                  content: lockfile,
-                }
+                  content:   lockfile,
+                },
               ],
               start_branch: @branch,
               author_email: @author_email,
-              author_name: @author_name,
+              author_name:  @author_name,
             )
           end
 
@@ -74,10 +83,10 @@ module Gitlabci
           # @param mr_labels [Array<String>]
           def create_merge_request(description:, mr_labels:)
             params = {
-              source_branch: new_branch,
-              target_branch: @branch,
+              source_branch:        new_branch,
+              target_branch:        @branch,
               remove_source_branch: true,
-              description: description
+              description:          description,
             }
 
             unless mr_labels.empty?
@@ -99,8 +108,8 @@ module Gitlabci
             compare_linker = CompareLinker.new("dummy", "dummy")
             compare_linker.formatter = CompareLinker::Formatter::Markdown.new
             compare_links = compare_linker.
-              make_compare_links_from_lockfiles(Bundler::LockfileParser.new(old_lockfile), Bundler::LockfileParser.new(new_lockfile)).
-              to_a.join("\n")
+                              make_compare_links_from_lockfiles(Bundler::LockfileParser.new(old_lockfile), Bundler::LockfileParser.new(new_lockfile)).
+                              to_a.join("\n")
 
             <<~MARKDOWN
               **Updated RubyGems:**
@@ -113,50 +122,54 @@ module Gitlabci
 
           private
 
-          def system!(command)
-            # NOTE: system(exception: true) requires Ruby 2.6+
-            ret = system(command)
-            raise "`#{command}` is failed" unless ret
-          end
+            def system!(command)
+              # NOTE: system(exception: true) requires Ruby 2.6+
+              ret = system(command)
+              raise "`#{command}` is failed" unless ret
+            end
 
-          def restore_bundled_with
-            RestoreBundledWith::CLI.new.invoke(
-              :restore,
-              [],
-              {
-                lockfile: lockfile_name,
-              },
-            )
-          end
+            def restore_bundled_with
+              RestoreBundledWith::CLI.new.invoke(
+                :restore,
+                [],
+                {
+                  lockfile: lockfile_name,
+                },
+              )
+            end
+
+            def gemfile_name
+              return @gemfile_name if @gemfile_name
 
-          def gemfile_name
-            return @gemfile_name if @gemfile_name
+              @gemfile_name = ENV["BUNDLE_GEMFILE"] || "Gemfile"
 
-            @gemfile_name = ENV["BUNDLE_GEMFILE"] || "Gemfile"
+              if @gemfile_name.start_with?("#{Dir.pwd}/")
+                @gemfile_name = @gemfile_name.gsub("#{Dir.pwd}/", "")
+              end
 
-            if @gemfile_name.start_with?("#{Dir.pwd}/")
-              @gemfile_name = @gemfile_name.gsub("#{Dir.pwd}/", "")
+              @gemfile_name
             end
 
-            @gemfile_name
-          end
+            def lockfile_name
+              "#{gemfile_name}.lock"
+            end
 
-          def lockfile_name
-            "#{gemfile_name}.lock"
-          end
+            def current_time
+              @current_time ||= Time.now
+            end
 
-          def current_time
-            @current_time ||= Time.now
-          end
+            def new_branch
+              "#{BRANCH_PREFIX}#{current_time.strftime("%Y%m%d%H%M%S")}"
+            end
 
-          def new_branch
-            "#{BRANCH_PREFIX}#{current_time.strftime("%Y%m%d%H%M%S")}"
-          end
+            def exists_bundle_update_mr?
+              merge_requests = @gitlab.merge_requests(@project_name, state: "opened", target_branch: @branch, search: TITLE_PREFIX.strip)
+              merge_requests.any? {|mr| mr.title.start_with?(TITLE_PREFIX) && mr.source_branch.start_with?(BRANCH_PREFIX) }
+            end
 
-          def exists_bundle_update_mr?
-            merge_requests = @gitlab.merge_requests(@project_name, state: "opened", target_branch: @branch, search: TITLE_PREFIX.strip)
-            merge_requests.any? { |mr| mr.title.start_with?(TITLE_PREFIX) && mr.source_branch.start_with?(BRANCH_PREFIX) }
-          end
+            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
         end
       end
     end

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

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "0.2.2"
+        VERSION = "0.3.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: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: onkcop
+  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: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,34 @@ 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: rubocop_auto_corrector
+  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
@@ -205,6 +247,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -242,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Create MergeRequest of bundle update in GitLab CI