gitlab_mr_release 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e69b5810bf061f37ae9f366d2d5bb5617db1542f
-  data.tar.gz: 52c996083b7d9109618d58edbb77ee77a2a85861
+SHA256:
+  metadata.gz: 69b7126c1aca9a96bb04c081db7e50c0609a78990d792f55eb1c8cfdc4688d5c
+  data.tar.gz: 1033a6b4d36af3ae5e31568b0d88ead48eabc4a38fc40947b29ea249c67c0771
 SHA512:
-  metadata.gz: 9664a05defc958d24c6ebd690b4fd875544c58c3082a56a797cbd136874d49cdbd20a6e9b9e53d06bf41e627b300d5abbe0437e28ebb2edd9bd5390a044176fa
-  data.tar.gz: 4f1e30528718c8cef8bee930c7c50a45e8ea1e1e8ca6e42450a62dc4c2cb969fd812ee39c3bae54b4d89ea26b344f536af4d9b6127fad6403f6d536f32dbb873
+  metadata.gz: 5a4d2b7496f4fc07530d91325c4c2134f24040f811ee52f757fee8833434be323e800a578ff55bc677a902ffe35d213fe91decf9382c5fe479e8b3ab898ab2ec
+  data.tar.gz: 69d575164e5fed8d72a39b5d0308e359cb8a9dd98cfe0987b6f7646634100821e6c62e38d01cbdea72dd0cc933274a5905870d21f49d13049211b0890c06ebd8

data/.github/workflows/test.yml

@@ -0,0 +1,107 @@
+name: test
+
+on:
+  push:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 10 * * 5" # JST 19:00 (Fri)
+
+env:
+  CI: "true"
+
+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
+          - 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' }}
+
+      - 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: homoluctus/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: homoluctus/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,11 @@
 ## Unreleased
-[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.0.1...master)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v1.1.0...master)
+
+## 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)

data/Gemfile

@@ -4,11 +4,26 @@ 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"
+  group :development do
+    # NOTE: byebug 9.1.0+ requires ruby 2.2.0+
+    gem "byebug", "< 9.1.0", group: :test
+  end
+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/gitlab_mr_release.gemspec

@@ -24,13 +24,13 @@ 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

@@ -42,13 +42,31 @@ 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: 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
   end
 end

data/lib/gitlab_mr_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabMrRelease
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_mr_release
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2020-03-12 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,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +123,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 +151,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 +165,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 +202,9 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".env.gitlab.example"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -240,8 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Release MergeRequest generator for GitLab

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