gitlab_mr_release 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc48c402abe1f670c8c18c04c576c255a9cc1ec8
-  data.tar.gz: d8b9de1a425fb13cb90385c06276bb974b52dcc3
+SHA256:
+  metadata.gz: fce9fdb5d70a8f372a0d8ee7848a5b553062630bc256864dec6e03b04a3bc160
+  data.tar.gz: 7907f2ceb6b0113726f6228017cab3c4a4a1780f6afdc1bee2e2a02b8c149bde
 SHA512:
-  metadata.gz: 1b78fb3343cdc42a95edbf9c1880e02f87c3f1f9b8591a86fb9dceb9308dae684d7744cc5e02aa77cad4408c62e1cd6e4bc677baee67cda937322c605bedc86c
-  data.tar.gz: 1db0224850457c577ab8367766f9c76229bf5dae3a5c55424264f009394cd9e1a4ade55b97f3edc3f5441c25616c84ce9931f93b99b07aa0dceb67a19407fe45
+  metadata.gz: 77964b63d42c89d65a4edffb46438c86cc2f709afb5c4105180b03148ce6b7c4447cde6546883ddd808ae497c45adbe8453d7afd56bbb7ef2638a92bde9b5aa7
+  data.tar.gz: 620b5d8a6244118c48125568b9cc0ae530d0000a05bc206c86ced8fd0b2f8a534dc7df6ac2dd7d1516fa44c7ccf0771671d833567da58284aaf1e3bb3b01448c

data/.github/workflows/test.yml

@@ -0,0 +1,108 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 10 * * 5" # JST 19:00 (Fri)
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    container: ${{ matrix.ruby }}
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - ruby:2.2
+          - ruby:2.3
+          - ruby:2.4
+          - ruby:2.5
+          - ruby:2.6
+          - ruby:2.7
+          - ruby:3.0
+          - rubylang/ruby:master-nightly-bionic
+        include:
+          - ruby: rubylang/ruby:master-nightly-bionic
+            allow_failures: "true"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache vendor/bundle
+        uses: actions/cache@v1
+        id: cache_gem
+        with:
+          path: vendor/bundle
+          key: v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ github.sha }}
+          restore-keys: |
+            v1-gem-${{ runner.os }}-${{ matrix.ruby }}-
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: bundle update
+        run: |
+          set -xe
+          bundle config path vendor/bundle
+          bundle update --jobs $(nproc) --retry 3
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: Setup Code Climate Test Reporter
+        uses: aktions/codeclimate-test-reporter@v1
+        with:
+          codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
+          command: before-build
+        if: matrix.ruby >= 'ruby:2.4'
+        continue-on-error: true
+
+      - name: Run test
+        run: |
+          set -xe
+          bundle exec rspec
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+        timeout-minutes: 1
+
+      - name: Teardown Code Climate Test Reporter
+        uses: aktions/codeclimate-test-reporter@v1
+        with:
+          codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
+          command: after-build
+        if: matrix.ruby >= 'ruby:2.4' && always()
+        continue-on-error: true
+
+      - name: Slack Notification (not success)
+        uses: lazy-actions/slatify@master
+        if: "! success()"
+        continue-on-error: true
+        with:
+          job_name: ${{ format('*build* ({0})', matrix.ruby) }}
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  notify:
+    needs:
+      - test
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Slack Notification (success)
+        uses: lazy-actions/slatify@master
+        if: always()
+        continue-on-error: true
+        with:
+          job_name: '*build*'
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 ## Unreleased
-[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.0.0...master)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.2...master)
+
+## v1.1.2
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.1...v1.1.2)
+
+* Enable MFA requirement for gem releasing
+  * https://github.com/sue445/gitlab_mr_release/pull/53
+
+## v1.1.1
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.0...v1.1.1)
+
+* Preserve checkbox statuses on update
+  * https://github.com/sue445/gitlab_mr_release/pull/45
+
+## v1.1.0
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.0.1...v1.1.0)
+
+* Update the release MR when release MR is already exists
+  * https://github.com/sue445/gitlab_mr_release/pull/41
+
+## v1.0.1
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.0.0...v1.0.1)
+
+* Support new merge commit format for GitLab v10.0.0+
+  * https://github.com/sue445/gitlab_mr_release/pull/25
 
 ## v1.0.0
 [full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.4.0...v1.0.0)

data/Gemfile

@@ -4,11 +4,24 @@ source 'https://rubygems.org'
 gemspec
 
 if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
-  # NOTE: activesupport 5.x supports only ruby 2.2.2+
-  gem "activesupport", "< 5.0.0"
+  group :development do
+    # NOTE: activesupport 5.x supports only ruby 2.2.2+
+    gem "activesupport", "< 5.0.0", group: :test
+  end
 end
 
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.0")
-  # NOTE: byebug 9.1.0+ requires ruby 2.2.0+
-  gem "byebug", "< 9.1.0"
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.3.0")
+  # NOTE: httparty v0.19.0+ requires Ruby 2.3+
+  gem "httparty", "< 0.19.0"
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
+  # NOTE: unparser v0.3.0+ requires Ruby 2.5+
+  gem "unparser", "< 0.3.0"
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.4.0")
+  # String#unpack1 is available since ruby 2.4, but gitlab gem uses String#unpack1 ...
+  # c.f. https://github.com/NARKOZ/gitlab/commit/d9ef580#diff-84e3ba49bf244c6684f7d26a3312adc4R81
+  gem "gitlab", "< 4.14.0"
 end

data/README.md

@@ -3,10 +3,9 @@
 Release MergeRequest generator for [GitLab](https://about.gitlab.com/)
 
 [![Gem Version](https://badge.fury.io/rb/gitlab_mr_release.svg)](https://badge.fury.io/rb/gitlab_mr_release)
-[![Build Status](https://travis-ci.org/sue445/gitlab_mr_release.svg?branch=master)](https://travis-ci.org/sue445/gitlab_mr_release)
+[![Build Status](https://github.com/sue445/gitlab_mr_release/workflows/test/badge.svg?branch=master)](https://github.com/sue445/gitlab_mr_release/actions?query=workflow%3Atest)
 [![Code Climate](https://codeclimate.com/github/sue445/gitlab_mr_release/badges/gpa.svg)](https://codeclimate.com/github/sue445/gitlab_mr_release)
 [![Coverage Status](https://coveralls.io/repos/sue445/gitlab_mr_release/badge.svg?branch=master&service=github)](https://coveralls.io/github/sue445/gitlab_mr_release?branch=master)
-[![Dependency Status](https://gemnasium.com/sue445/gitlab_mr_release.svg)](https://gemnasium.com/sue445/gitlab_mr_release)
 
 This is inspired by the [git-pr-release](https://github.com/motemen/git-pr-release)
 

data/bin/console

@@ -9,14 +9,11 @@ require "gitlab_mr_release"
 require "dotenv"
 Dotenv.load(".env.gitlab", "~/.env.gitlab")
 
-clean_room = Object.new
-clean_room.instance_eval do
-  @project = GitlabMrRelease::Project.new(
-    api_endpoint:  ENV["GITLAB_API_ENDPOINT"],
-    private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
-    project_name:  ENV["GITLAB_PROJECT_NAME"],
-  )
-end
+@project = GitlabMrRelease::Project.new(
+  api_endpoint:  ENV["GITLAB_API_ENDPOINT"],
+  private_token: ENV["GITLAB_API_PRIVATE_TOKEN"],
+  project_name:  ENV["GITLAB_PROJECT_NAME"],
+)
 
-require "pry"
-Pry.start(clean_room)
+require "irb"
+IRB.start

data/gitlab_mr_release.gemspec

@@ -14,6 +14,11 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/sue445/gitlab_mr_release"
   spec.license       = "MIT"
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -24,13 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
 
   spec.add_development_dependency "activesupport"
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", ">= 1.10"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-parameterized"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "unparser", ">= 0.4.5"
   spec.add_development_dependency "webmock", ">= 3.0.0"
 end

data/lib/gitlab_mr_release/cli.rb

@@ -78,60 +78,62 @@ MergeRequest is created
 
     private
 
-    def assert_env(name)
-      if !ENV[name] || ENV[name].empty?
-        puts "Error: Environment variable #{name} is required"
-        exit!
+    no_commands do
+      def assert_env(name)
+        if !ENV[name] || ENV[name].empty?
+          puts "Error: Environment variable #{name} is required"
+          exit!
+        end
       end
-    end
 
-    def assert_option_or_env(option_name, env_name)
-      option_or_env!(option_name, env_name)
-    end
+      def assert_option_or_env(option_name, env_name)
+        option_or_env!(option_name, env_name)
+      end
 
-    def generate_title
-      return options[:title] if options[:title]
+      def generate_title
+        return options[:title] if options[:title]
 
-      generate_default_title(
-        title_template: ENV["DEFAULT_TITLE"],
-        source_branch:  source_branch,
-        target_branch:  target_branch,
-      )
-    end
+        generate_default_title(
+          title_template: ENV["DEFAULT_TITLE"],
+          source_branch:  source_branch,
+          target_branch:  target_branch,
+          )
+      end
 
-    def generate_default_title(title_template:, source_branch:, target_branch:)
-      title_template ||= DEFAULT_TITLE_TEMPLATE
-      ERB.new(title_template).result(binding).strip
-    end
+      def generate_default_title(title_template:, source_branch:, target_branch:)
+        title_template ||= DEFAULT_TITLE_TEMPLATE
+        ERB.new(title_template).result(binding).strip
+      end
 
-    def template_file
-      ENV["TEMPLATE_FILE"] || "#{__dir__}/../templates/gitlab_mr_release.md.erb"
-    end
+      def template_file
+        ENV["TEMPLATE_FILE"] || "#{__dir__}/../templates/gitlab_mr_release.md.erb"
+      end
 
-    def source_branch
-      option_or_env(:source, "DEFAULT_SOURCE_BRANCH")
-    end
+      def source_branch
+        option_or_env(:source, "DEFAULT_SOURCE_BRANCH")
+      end
 
-    def target_branch
-      option_or_env(:target, "DEFAULT_TARGET_BRANCH")
-    end
+      def target_branch
+        option_or_env(:target, "DEFAULT_TARGET_BRANCH")
+      end
 
-    def labels
-      option_or_env(:labels, "DEFAULT_LABELS")
-    end
+      def labels
+        option_or_env(:labels, "DEFAULT_LABELS")
+      end
 
-    def option_or_env(option_name, env_name, default = nil)
-      return options[option_name] if options[option_name] && !options[option_name].empty?
-      return ENV[env_name] if ENV[env_name] && !ENV[env_name].empty?
-      default
-    end
+      def option_or_env(option_name, env_name, default = nil)
+        return options[option_name] if options[option_name] && !options[option_name].empty?
+        return ENV[env_name] if ENV[env_name] && !ENV[env_name].empty?
+        default
+      end
 
-    def option_or_env!(option_name, env_name)
-      value = option_or_env(option_name, env_name)
-      return value if value
+      def option_or_env!(option_name, env_name)
+        value = option_or_env(option_name, env_name)
+        return value if value
 
-      puts "Error: --#{option_name} or #{env_name} is either required!"
-      exit!
+        puts "Error: --#{option_name} or #{env_name} is either required!"
+        exit!
+      end
     end
   end
 end

data/lib/gitlab_mr_release/project.rb

@@ -30,7 +30,7 @@ module GitlabMrRelease
     def merge_request_iids_between(from, to)
       commits = Gitlab.repo_compare(@project_name, from, to).commits
       commits.map do |commit|
-        commit["message"] =~ /^Merge branch .*See merge request \!(\d+)$/m
+        commit["message"] =~ /^Merge branch .*See merge request .*\!(\d+)$/m
         $1
       end.compact.map(&:to_i)
     end
@@ -42,13 +42,45 @@ module GitlabMrRelease
 
     def create_merge_request(source_branch:, target_branch:, title:, template:, labels:)
       iids = merge_request_iids_between(target_branch, source_branch)
-      options = {
-        source_branch: source_branch,
-        target_branch: target_branch,
-        description:   generate_description(iids, template),
-        labels:        labels,
-      }
-      Gitlab.create_merge_request(@project_name, title, options)
+      description = generate_description(iids, template)
+
+      mr = find_current_release_mr(source_branch, target_branch)
+      if mr.nil?
+        options = {
+          source_branch: source_branch,
+          target_branch: target_branch,
+          description:   description,
+          labels:        labels,
+        }
+        Gitlab.create_merge_request(@project_name, title, options)
+      else
+        options = {
+          title: title,
+          description: apply_checkbox_statuses(description, mr.description)
+        }
+        Gitlab.update_merge_request(@project_name, mr.iid, options)
+      end
+    end
+
+    # find release mr already exists
+    def find_current_release_mr(source_branch, target_branch)
+      Gitlab.merge_requests(@project_name, state: :opened).find do |mr|
+        mr.source_branch == source_branch && mr.target_branch == target_branch
+      end
+    end
+
+    def apply_checkbox_statuses(new_desc, old_desc)
+      checked_iids = old_desc.split("\n").select{ |line| line.include?("[x]") }.map{ |line| /\!\d+/.match(line).to_a.first }.compact
+
+      applied_lines = new_desc.split("\n").map do |line|
+        iid = /\!\d+/.match(line).to_a.first
+        if !iid.nil? && checked_iids.include?(iid)
+          line.gsub(/^( *)(\d+?\.|-|\*) \[ \]/) { "#{$1}#{$2} [x]" }
+        else
+          line
+        end
+      end
+      applied_lines.join("\n")
     end
   end
 end

data/lib/gitlab_mr_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabMrRelease
-  VERSION = "1.0.0"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_mr_release
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - sue445
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -70,14 +70,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
@@ -95,21 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-parameterized
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-parameterized
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -202,9 +188,9 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".env.gitlab.example"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -224,8 +210,12 @@ files:
 homepage: https://github.com/sue445/gitlab_mr_release
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/sue445/gitlab_mr_release
+  source_code_uri: https://github.com/sue445/gitlab_mr_release
+  changelog_uri: https://github.com/sue445/gitlab_mr_release/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,9 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Release MergeRequest generator for GitLab
 test_files: []

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-rvm:
-- 2.1
-- 2.2.5
-- 2.3.1
-- 2.4.1
-- ruby-head
-cache: bundler
-sudo: false
-before_install: gem install bundler -v 1.10.6
-before_script:
-- export CODECLIMATE_REPO_TOKEN=771643fe0b3a3f2185eacf5fb025ec009d40cab4402d97b83ece04436e5e1739
-- export CI=true
-script:
-- bundle exec rspec
-- bundle exec codeclimate-test-reporter
-branches:
-  only:
-  - master
-notifications:
-  email: false
-  slack:
-    secure: dkjEtoWyHEstKewrX6InD/wym1hmUZMdr/JfSP2HJLWS5U4mWyq8UY3ulvRWgoElKFhEUtQYYTzAp0BwoM4pQ9VdXX+tR0wIg6ETte2uP/ETTv/bZLbCm6ZfD0pk86Wq5NJVAVskwjZcxL3GKYVJz5kru83h7yGGHJ2oxB0ClZLK0DPJSReC7fItzcKHiz0LQe1P26BqOSeRIzTLiJldNiu/tCQyZxN8m5rRiaDfsWxeH0oRnz0VCY8L3ZU0ji5qTXZeE89o+TikL4fNri78bziDRXOiC+PGAsr03F8fNCja6UgofNSRsVkpjkbQhyBnjQJnU4aVzRIOcZDcRXXRvk/VNfvxiodZ8EpEwn9qkjx71rfklTyOj2HMNpuWLeNfFkdnh2qaVOfKAQ/hW0wfStn2Pcxm1mBV0bAFQuon2mXcj+vUYrXo9iHslXlzO6nf/wQR7R6rvqJGgmjSpVomehoR5EllD6AmhaWyboh0i0Kyr6INKzvLtV4bHqaYlZXD931gRXGW0PWHrX8KvXAtYVngjmouJ8Jqu5PdJm2nH0OQMHfwxWbh991gGG76UIga4Pfou+XSxTji3G3T0D1btHvMLpNvx6rfeL+cPXq5LGc2UVf9QEwEwJyKB/i2XjXUNQE4X5yl+rfgky9dWOBu+D8yYxnoUoKYfo1uOg/kns8=
-matrix:
-  allow_failures:
-  - rvm: ruby-head