gitlab_awesome_release 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a979bdde04b5ca5d62dff7ec28e985cca5e25073
-  data.tar.gz: 503eafbd5ad0b00e5dd515347918c376924b2318
+SHA256:
+  metadata.gz: 8f8216d0fc231295e49843e172a98823956739932b4e1c9234a47c10c41d6d73
+  data.tar.gz: 44d3f967e2acb74643e7dabdcaaf94308b7446f954954050281b8c51cdf0a3bd
 SHA512:
-  metadata.gz: fdf228b744476dd9499069824ce00485dd861d0e98d2d13b82a96c5772add70c8a74f0c62340e74421277f12963839cdba5c6c1b16d54354fffa02b757e0b897
-  data.tar.gz: 4a7aa43a91b60bbcf6f9f15723e6e87e279ca36fb44fc2bebdc0a2b11acf35784bf125e3bbdcfde809f54248cdc93308696aaa0bb4abc73314ab117f1d18d3bc
+  metadata.gz: d71835b0b185a3b3003c0c2f185a3067c7bdf07f3a3c390046430c4fd1c5387154254e1b27bbaf6def8de879c9db1348cf7ade8d302b316e43be428893498cbc
+  data.tar.gz: 9f7c6371fcd757fa9ccfc4353a81c69abd3cced58acc681a0f78f1dbe4e7d88f61ff7e6dde2666446f12f4cf38fa92afb00363d6b45bd8ccab5b1863b9ee6bda

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .env.gitlab
+public/

data/.gitlab-ci.yml

@@ -1,13 +1,12 @@
 stages:
   - test
+  - deploy
 
-.job_template: &job_definition
+.default:
   variables:
-    CI: "true"
     BUNDLE_CACHE: "vendor/bundle/"
 
   cache:
-    untracked: true
     key: "$CI_BUILD_NAME"
     paths:
       - vendor/bundle/
@@ -17,42 +16,46 @@ stages:
 
   stage: test
 
-  except:
-    - tags
-
-ruby2.1:rspec:
-  <<: *job_definition
-  image: drecom/centos-ruby:2.1.10
-
-  script:
-    - ./gitlab-ci/rspec.sh
-
-ruby2.2:rspec:
-  <<: *job_definition
-  image: drecom/centos-ruby:2.2.6
-
-  script:
-    - ./gitlab-ci/rspec.sh
+test:
+  extends: .default
 
-ruby2.3:rspec:
-  <<: *job_definition
-  image: drecom/centos-ruby:2.3.3
+  image: $IMAGE
 
   script:
-    - ./gitlab-ci/rspec.sh
-
-ruby2.4:rspec:
-  <<: *job_definition
-  image: drecom/centos-ruby:2.4.0
-
-  script:
-    - ./gitlab-ci/rspec.sh
-
-rubocop:
-  <<: *job_definition
-  image: drecom/centos-ruby
+    - bundle exec rspec
+    - bundle exec rubocop -P
+
+  rules:
+    - if: '$IMAGE == "rubylang/ruby:master-nightly-bionic"'
+      allow_failure: true
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+
+  parallel:
+    matrix:
+      - IMAGE:
+          - ruby:2.1
+          - 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
+
+pages:
+  extends: .default
+  image: ruby
+
+  stage: deploy
 
   script:
-    - ./gitlab-ci/rubocop.sh
-
-  allow_failure: true
+    - bundle exec yard
+  artifacts:
+    paths:
+    - public
+  only:
+    - master
+  except:
+    - tags

data/.rubocop.yml

@@ -4,5 +4,17 @@ inherit_gem:
 AllCops:
   TargetRubyVersion: 2.4
 
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Layout/AlignHash:
+  EnforcedColonStyle: table
+
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+
+Layout/IndentHeredoc:
+  Enabled: false
+
 Metrics/ClassLength:
   Max: 130

data/.yardopts

@@ -1,2 +1,3 @@
 --markup markdown
 --no-private
+--output-dir public

data/CHANGELOG.md

@@ -1,6 +1,48 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.2...HEAD)
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v1.0.4...master)
 
+## v1.0.4
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v1.0.3...v1.0.4)
+
+* Enable MFA requirement for gem releasing
+  * https://gitlab.com/sue445/gitlab_awesome_release/-/merge_requests/47
+
+## v1.0.3
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v1.0.2...v1.0.3)
+
+### Bugfix
+* Bugfixed. 404 Not Found error when contains other repo's merge commit [!43](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/43) *@sue445*
+
+### Others
+* CI against ruby 2.7 [!41](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/41) *@sue445*
+* CI against for Ruby 3.0 [!42](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/42) *@sue445*
+
+## v1.0.2
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v1.0.1...v1.0.2)
+
+### Bugfix
+* Fixed SEGV on ruby 2.6.0 [!39](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/39) *@sue445*
+
+### Others
+* CI against ruby 2.5 [!33](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/33) *@sue445*
+* Setup Dependency Scanning [!34](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/34) *@sue445*
+* Fixed failed CI on ruby < 2.3 [!35](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/35) *@sue445*
+* Fix CI [!36](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/36) *@sue445*
+* Update rubocop [!37](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/37) *@sue445*
+* Relax bundler dependency [!38](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/38) *@sue445*
+
+## v1.0.1
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v1.0.0...v1.0.1)
+
+* Deploy yard to GitLab Pages [!29](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/29) *@sue445*
+* Tweak .gitlab-ci.yml [!30](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/30) *@sue445*
+* Support new merge commit format for GitLab v10.0.0+ [!31](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/31) *@sue445*
+* Refactor .gitlab-ci.yml [!32](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/32) *@sue445*
+
+## v1.0.0
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.2...v1.0.0)
+
+* :warning: Drop support GitLab API v3 and support GitLab API v4 [!28](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/28) *@sue445*
 
 ## v0.1.2
 [full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.1...v0.1.2)

data/Gemfile

@@ -2,3 +2,57 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in gitlab_awesome_release.gemspec
 gemspec
+
+# rubocop:disable Bundler/DuplicatedGem
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.3.0")
+  group :development do
+    # NOTE: gitlab 4.6.0+ requires ruby 2.3.0+
+    gem "gitlab", "< 4.6.0"
+
+    # NOTE: json 2.6.0+ requires ruby 2.3.0+
+    gem "json", "< 2.6.0"
+
+    # NOTE: httparty 0.20.0+ requires ruby 2.3.0+
+    gem "httparty", "< 0.20.0"
+  end
+elsif Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.4.0")
+  group :development do
+    # NOTE: gitlab 4.14.0 doesn't work on Ruby 2.3
+    # https://gitlab.com/sue445/gitlab_awesome_release/-/jobs/1235102823
+    gem "gitlab", "< 4.14.0"
+  end
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.0")
+  group :development do
+    # NOTE: parallel 1.14.0+ requires ruby 2.2.0+
+    gem "parallel", "< 1.14.0"
+  end
+elsif Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.4.0")
+  group :development do
+    # NOTE: parallel 1.20.1+ requires ruby 2.4.0+
+    gem "parallel", "< 1.20.1"
+  end
+end
+# rubocop:enable Bundler/DuplicatedGem
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
+  group :development do
+    # NOTE: docile 1.4.0+ requires ruby 2.5.0+
+    gem "docile", "< 1.4.0"
+  end
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.4.0")
+  group :development do
+    # NOTE: simplecov-html 0.11.0+ requires ruby 2.4.0+
+    gem "simplecov-html", "< 0.11.0"
+  end
+end
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.3.0")
+  group :development do
+    # NOTE: public_suffix 4.0.0+ requires ruby 2.3.0+
+    gem "public_suffix", "< 4.0.0"
+  end
+end

data/README.md

@@ -2,7 +2,8 @@
 Generate changelog from tags and MergeRequests on [GitLab](https://about.gitlab.com/)
 
 [![Gem Version](https://badge.fury.io/rb/gitlab_awesome_release.svg)](https://badge.fury.io/rb/gitlab_awesome_release)
-[![Dependency Status](https://gemnasium.com/7f058801015a4fbcf603d936c08836a4.svg)](https://gemnasium.com/19478d2f2735ee355f4c6cd1b8d2c12e)
+[![pipeline status](https://gitlab.com/sue445/gitlab_awesome_release/badges/master/pipeline.svg)](https://gitlab.com/sue445/gitlab_awesome_release/commits/master)
+[![coverage report](https://gitlab.com/sue445/gitlab_awesome_release/badges/master/coverage.svg)](https://gitlab.com/sue445/gitlab_awesome_release/commits/master)
 
 This is inspired by [GitHub Changelog Generator](https://github.com/skywinder/github-changelog-generator)
 
@@ -12,7 +13,8 @@ see [CHANGELOG.md](CHANGELOG.md)
 ## Requirements
 
 * Ruby v2.1+
-* GitLab v7.11.0+
+* GitLab v9.0.0+
+* GitLab API v4
 
 ## Installation
 

data/gitlab-ci/setup.sh

@@ -1,3 +1,11 @@
 #!/bin/bash -xe
 
-bundle check --path=${BUNDLE_CACHE} || bundle install --path=${BUNDLE_CACHE} --jobs=2 --retry=3
+bundle config set --local path 'vendor/bundle/'
+bundle config set --local clean 'true'
+
+ruby --version
+gem --version
+bundle --version
+
+bundle install --jobs $(nproc)
+bundle update

data/gitlab_awesome_release.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "gitlab_awesome_release/version"
 
@@ -14,9 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://gitlab.com/sue445/gitlab_awesome_release"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  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) }
+  spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
@@ -25,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "gitlab", ">= 4.0.0"
   spec.add_dependency "thor"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "onkcop", "0.47.1.0"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "bundler", ">= 1.10"
+  spec.add_development_dependency "onkcop", "0.53.0.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-temp_dir"
+  spec.add_development_dependency "rubocop", "0.57.2" # rubocop v0.58.0+ requires ruby 2.2+
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"

data/lib/gitlab_awesome_release/cli.rb

@@ -7,7 +7,7 @@ module GitlabAwesomeRelease
 
   class CLI < Thor
     DEFAULT_VERSION_FORMAT = "^v?[\\d.]+".freeze
-    GITLAB_ENV_FILES = %w(.env.gitlab ~/.env.gitlab).freeze
+    GITLAB_ENV_FILES = %w[.env.gitlab ~/.env.gitlab].freeze
 
     GITLAB_API_DESCRIPTION               = "GitLab API endpoint (e.g. http://example.com/api/v4)".freeze
     GITLAB_API_PRIVATE_TOKEN_DESCRIPTION = "Your private token".freeze
@@ -118,7 +118,7 @@ module GitlabAwesomeRelease
 
         @logger = Logger.new(STDOUT)
         @logger.level = logger_level(option_or_env(:log_level))
-        @logger.formatter = proc { |severity, datetime, _progname, message|
+        @logger.formatter = proc {|severity, datetime, _progname, message|
           "[#{datetime}] #{severity} #{message}\n"
         }
 
@@ -128,7 +128,7 @@ module GitlabAwesomeRelease
           private_token:    gitlab_api_private_token,
           project_name:     gitlab_project_name,
           allow_tag_format: /#{allow_tag_format}/,
-          logger:           @logger
+          logger:           @logger,
         )
       end
 

data/lib/gitlab_awesome_release/gitlab_logging_ext.rb

@@ -10,7 +10,7 @@ module GitlabAwesomeRelease
           end_time = Time.now
 
           # NOTE: options[:headers] contains PRIVATE-TOKEN
-          _options = options.reject { |k, _v| k == :headers }
+          _options = options.reject {|k, _v| k == :headers }
           self.class.logger.debug "(#{end_time - start_time} sec) #{method.upcase} #{path} #{_options}"
         end
       end

data/lib/gitlab_awesome_release/project.rb

@@ -35,12 +35,16 @@ module GitlabAwesomeRelease
         with_paging do |params|
           Gitlab.repo_tags(@project_name, params)
         end
-      @all_tag_names = repo_tags.sort_by { |tag| tag.commit.authored_date }.map(&:name)
+
+      # rubocop:disable Style/SymbolProc avoid SEGV on ruby 2.6.0
+      # https://bugs.ruby-lang.org/issues/15489
+      @all_tag_names = repo_tags.sort_by {|tag| tag.commit.authored_date }.map {|tag| tag.name }
+      # rubocop:enable Style/SymbolProc
     end
 
     # @return [Array<String>]
     def release_tag_names
-      all_tag_names.find_all { |tag| tag =~ @allow_tag_format }
+      all_tag_names.find_all {|tag| tag =~ @allow_tag_format }
     end
 
     # @param oldest_tag [String]
@@ -100,7 +104,7 @@ module GitlabAwesomeRelease
 
       merge_request_iids =
         commits.map do |commit|
-          commit["message"] =~ /^Merge branch .*See merge request \!(\d+)$/m
+          commit["message"] =~ /^Merge branch .*See merge request .*\!(\d+)$/m
           Regexp.last_match(1)
         end
 
@@ -130,6 +134,17 @@ module GitlabAwesomeRelease
       @logger.info "Add [#{label}] to !#{mr.iid} #{mr.title}"
     end
 
+    def merge_requests_summary_between(from, to)
+      mr_iids = merge_request_iids_between(from, to)
+      mr_iids.each_with_object("") do |iid, str|
+        begin
+          str << merge_request_summary(iid) + "\n"
+        rescue Gitlab::Error::NotFound # rubocop:disable Lint/HandleExceptions
+          # NOTE: suppress error (e.g. other repo's iid)
+        end
+      end
+    end
+
     private
 
       # @yield [params] paging block
@@ -145,12 +160,5 @@ module GitlabAwesomeRelease
           page += 1
         end
       end
-
-      def merge_requests_summary_between(from, to)
-        mr_iids = merge_request_iids_between(from, to)
-        mr_iids.each_with_object("") do |iid, str|
-          str << merge_request_summary(iid) + "\n"
-        end
-      end
   end
 end

data/lib/gitlab_awesome_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabAwesomeRelease
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_awesome_release
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - sue445
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -56,14 +56,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
@@ -72,28 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.47.1.0
+        version: 0.53.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.47.1.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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'
+        version: 0.53.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.57.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.57.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -200,8 +200,6 @@ files:
 - bin/console
 - bin/setup
 - exe/gitlab_awesome_release
-- gitlab-ci/rspec.sh
-- gitlab-ci/rubocop.sh
 - gitlab-ci/setup.sh
 - gitlab_awesome_release.gemspec
 - img/private_token.png
@@ -214,8 +212,12 @@ files:
 homepage: https://gitlab.com/sue445/gitlab_awesome_release
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://gitlab.com/sue445/gitlab_awesome_release
+  source_code_uri: https://gitlab.com/sue445/gitlab_awesome_release
+  changelog_uri: https://gitlab.com/sue445/gitlab_awesome_release/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -230,9 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Generate changelog from tags and MergeRequests on GitLab
 test_files: []

data/gitlab-ci/rspec.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -xe
-
-bundle exec rspec

data/gitlab-ci/rubocop.sh

@@ -1,3 +0,0 @@
-#!/bin/bash -xe
-
-bundle exec rubocop