gitlab_awesome_release 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275b6a408d136a5640c4c80d0798947403c1584c
-  data.tar.gz: 8abbbd924954996a5f53338d69a598753569000b
+  metadata.gz: faf0baaeedceda64b9174c9bb51eee530f0318e8
+  data.tar.gz: 1fc19a40157181302624ba03bf87e52559e1a1bf
 SHA512:
-  metadata.gz: 99f3b3db0ecc9ed025011d85ba4f3b1118a3e35f9a19b5b0c2df88a73d7ff7ef3e71d68ee0ece63029e6e6cbe8f33ca96c789c516d5f57bcd8ab717dd371167e
-  data.tar.gz: f3adac92ac52c25f00f240e4d7836d4e9d615cd2f0c37bd2be18174a3fe582fa46f15425b4a81b80511998f72650f1097a4d2e5aff05ba7682bcc31b49e0abec
+  metadata.gz: 6e45e224237477007cb9cc328f7d7bf3e5ccf95b48b4c30edb49a4fdb98c0c2fe27d1475f483baf40d8c6e743365a3f96ef652c7edc89386e6ad3a8990901199
+  data.tar.gz: 4ecd3077daca1765e1fb710cdb65b06579cc450e14aa7dcfd488132aa30479f37eafa8c2ef4b6d15b18e47385e18ab65a4516be95aec0749e337e89b2c84e602

data/.gitlab-ci.yml

@@ -1,9 +1,86 @@
 stages:
   - test
 
-job1:
+.job_template: &job_definition
+  variables:
+    CI: "true"
+    BUNDLE_CACHE: "vendor/bundle/"
+
+  cache:
+    untracked: true
+    key: "$CI_BUILD_NAME"
+    paths:
+      - vendor/bundle/
+
+  before_script:
+    - ./gitlab-ci/setup.sh
+
   stage: test
+
+  except:
+    - tags
+
+ruby2.1:rspec:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.1.10
+
+  script:
+    - ./gitlab-ci/rspec.sh
+
+ruby2.1:rubocop:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.1.10
+
+  script:
+    - ./gitlab-ci/rubocop.sh
+
+  allow_failure: true
+
+ruby2.2:rspec:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.2.6
+
+  script:
+    - ./gitlab-ci/rspec.sh
+
+ruby2.2:rubocop:
+  <<: *job_definition
+
+  image: drecom/centos-ruby:2.2.6
+
+  script:
+    - ./gitlab-ci/rubocop.sh
+
+  allow_failure: true
+
+ruby2.3:rspec:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.3.3
+
+  script:
+    - ./gitlab-ci/rspec.sh
+
+ruby2.3:rubocop:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.3.3
+
   script:
-    - ./script/build.sh
-  tags:
-    - ruby
+    - ./gitlab-ci/rubocop.sh
+
+  allow_failure: true
+
+ruby2.4:rspec:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.4.0
+
+  script:
+    - ./gitlab-ci/rspec.sh
+
+ruby2.4:rubocop:
+  <<: *job_definition
+  image: drecom/centos-ruby:2.4.0
+
+  script:
+    - ./gitlab-ci/rubocop.sh
+
+  allow_failure: true

data/.rubocop.yml

@@ -0,0 +1,8 @@
+inherit_gem:
+  onkcop: "config/rubocop.yml"
+
+AllCops:
+  TargetRubyVersion: 2.4
+
+Metrics/ClassLength:
+  Max: 130

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta8...HEAD)
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0...HEAD)
 
 
+## v0.1.0
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta8...v0.1.0)
+
+* Add create_latest_note [!18](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/18) *@sue445*
+
 ## v0.1.0.beta8
 [full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta7...v0.1.0.beta8)
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in gitlab_awesome_release.gemspec
 gemspec

data/README.md

@@ -2,7 +2,6 @@
 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)
-[![build status](https://gitlab.com/ci/projects/9759/status.png?ref=master)](https://gitlab.com/ci/projects/9759?ref=master)
 [![Dependency Status](https://gemnasium.com/7f058801015a4fbcf603d936c08836a4.svg)](https://gemnasium.com/19478d2f2735ee355f4c6cd1b8d2c12e)
 
 This is inspired by [GitHub Changelog Generator](https://github.com/skywinder/github-changelog-generator)

data/gitlab-ci/rspec.sh

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

data/gitlab-ci/rubocop.sh

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

data/gitlab-ci/setup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash -xe
+
+bundle check --path=${BUNDLE_CACHE} || bundle install --path=${BUNDLE_CACHE} --jobs=2 --retry=3

data/gitlab_awesome_release.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gitlab_awesome_release/version'
+require "gitlab_awesome_release/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "gitlab_awesome_release"
@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["sue445"]
   spec.email         = ["sue445@sue445.net"]
 
-  spec.summary       = %q{Generate changelog from tags and MergeRequests on GitLab}
-  spec.description   = %q{Generate changelog from tags and MergeRequests on GitLab}
+  spec.summary       = "Generate changelog from tags and MergeRequests on GitLab"
+  spec.description   = "Generate changelog from tags and MergeRequests on GitLab"
   spec.homepage      = "https://gitlab.com/sue445/gitlab_awesome_release"
   spec.license       = "MIT"
 
@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1.0"
 
-  spec.add_dependency "activesupport"
   spec.add_dependency "dotenv"
   spec.add_dependency "gitlab"
   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 "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

data/lib/gitlab_awesome_release.rb

@@ -1,4 +1,3 @@
-require "active_support/all"
 require "gitlab_awesome_release/version"
 require "gitlab_awesome_release/project"
 require "gitlab"

data/lib/gitlab_awesome_release/cli.rb

@@ -3,14 +3,16 @@ require "gitlab_awesome_release"
 require "dotenv"
 
 module GitlabAwesomeRelease
+  require "logger"
+
   class CLI < Thor
-    DEFAULT_VERSION_FORMAT = "^v?[\\d.]+"
-    GITLAB_ENV_FILES = %w(.env.gitlab ~/.env.gitlab)
+    DEFAULT_VERSION_FORMAT = "^v?[\\d.]+".freeze
+    GITLAB_ENV_FILES = %w(.env.gitlab ~/.env.gitlab).freeze
 
-    GITLAB_API_DESCRIPTION               = "GitLab API endpoint (e.g. http://example.com/api/v3)"
-    GITLAB_API_PRIVATE_TOKEN_DESCRIPTION = "Your private token"
-    GITLAB_API_PROJECT_NAME              = "Target project (e.g. group/repo_name)"
-    LOG_LEVEL_DESCRIPTION                = "Log level (debug|info|warn|error|fatal|unknown)"
+    GITLAB_API_DESCRIPTION               = "GitLab API endpoint (e.g. http://example.com/api/v3)".freeze
+    GITLAB_API_PRIVATE_TOKEN_DESCRIPTION = "Your private token".freeze
+    GITLAB_API_PROJECT_NAME              = "Target project (e.g. group/repo_name)".freeze
+    LOG_LEVEL_DESCRIPTION                = "Log level (debug|info|warn|error|fatal|unknown)".freeze
 
     desc "version", "Show gitlab_awesome_release version"
     def version
@@ -92,70 +94,73 @@ module GitlabAwesomeRelease
 
     private
 
-    def option_or_env(name, default = nil)
-      upper_name = name.to_s.upcase
-      options[name].presence || ENV[upper_name].presence || default
-    end
+      def option_or_env(name, default = nil)
+        upper_name = name.to_s.upcase
+        return options[name] if options[name] && !options[name].to_s.empty?
+        return ENV[upper_name] if ENV[upper_name] && !ENV[upper_name].empty?
 
-    def option_or_env!(name)
-      value = option_or_env(name)
-      return value if value
+        default
+      end
 
-      puts "--#{name.to_s.gsub("_", "-")} or #{name.to_s.upcase} is either required!"
-      exit!
-    end
+      def option_or_env!(name)
+        value = option_or_env(name)
+        return value if value
 
-    def create_project
-      gitlab_api_endpoint      = option_or_env!(:gitlab_api_endpoint)
-      gitlab_api_private_token = option_or_env!(:gitlab_api_private_token)
-      gitlab_project_name      = option_or_env!(:gitlab_project_name)
-      allow_tag_format         = option_or_env(:allow_tag_format, DEFAULT_VERSION_FORMAT)
-
-      @logger = Logger.new(STDOUT)
-      @logger.level = logger_level(option_or_env(:log_level))
-      @logger.formatter = proc{ |severity, datetime, progname, message|
-        "[#{datetime}] #{severity} #{message}\n"
-      }
-
-      Gitlab::Request.logger = @logger
-      GitlabAwesomeRelease::Project.new(
-        api_endpoint:     gitlab_api_endpoint,
-        private_token:    gitlab_api_private_token,
-        project_name:     gitlab_project_name,
-        allow_tag_format: /#{allow_tag_format}/,
-        logger:           @logger,
-      )
-    end
+        puts "--#{name.to_s.tr("_", "-")} or #{name.to_s.upcase} is either required!"
+        exit!
+      end
 
-    def write_changelog(changelog)
-      filename = option_or_env(:filename)
-      if filename
-        File.open(filename, "wb") do |f|
-          f.write(changelog)
+      def create_project
+        gitlab_api_endpoint      = option_or_env!(:gitlab_api_endpoint)
+        gitlab_api_private_token = option_or_env!(:gitlab_api_private_token)
+        gitlab_project_name      = option_or_env!(:gitlab_project_name)
+        allow_tag_format         = option_or_env(:allow_tag_format, DEFAULT_VERSION_FORMAT)
+
+        @logger = Logger.new(STDOUT)
+        @logger.level = logger_level(option_or_env(:log_level))
+        @logger.formatter = proc { |severity, datetime, _progname, message|
+          "[#{datetime}] #{severity} #{message}\n"
+        }
+
+        Gitlab::Request.logger = @logger
+        GitlabAwesomeRelease::Project.new(
+          api_endpoint:     gitlab_api_endpoint,
+          private_token:    gitlab_api_private_token,
+          project_name:     gitlab_project_name,
+          allow_tag_format: /#{allow_tag_format}/,
+          logger:           @logger
+        )
+      end
+
+      def write_changelog(changelog)
+        filename = option_or_env(:filename)
+        if filename
+          File.open(filename, "wb") do |f|
+            f.write(changelog)
+          end
+          @logger.info "Write to #{filename}"
+        else
+          puts changelog
         end
-        @logger.info "Write to #{filename}"
-      else
-        puts changelog
       end
-    end
 
-    def logger_level(log_level)
-      case log_level.to_sym
-      when :debug
-        Logger::DEBUG
-      when :error
-        Logger::ERROR
-      when :fatal
-        Logger::FATAL
-      when :info
-        Logger::INFO
-      when :unknown
-        Logger::UNKNOWN
-      when :warn
-        Logger::WARN
-      else
-        raise "Unknown log_level: #{log_level}"
+      def logger_level(log_level)
+        case log_level.to_sym
+        when :debug
+          Logger::DEBUG
+        when :error
+          Logger::ERROR
+        when :fatal
+          Logger::FATAL
+        when :info
+          Logger::INFO
+        when :unknown
+          Logger::UNKNOWN
+        when :warn
+          Logger::WARN
+        else
+          raise "Unknown log_level: #{log_level}"
+        end
       end
-    end
   end
 end

data/lib/gitlab_awesome_release/gitlab_logging_ext.rb

@@ -10,8 +10,8 @@ module GitlabAwesomeRelease
           end_time = Time.now
 
           # NOTE: options[:headers] contains PRIVATE-TOKEN
-          _options = options.reject{ |k, _v| k == :headers }
-          logger.debug "(#{end_time - start_time} sec) #{method.upcase} #{path} #{_options}"
+          _options = options.reject { |k, _v| k == :headers }
+          self.class.logger.debug "(#{end_time - start_time} sec) #{method.upcase} #{path} #{_options}"
         end
       end
     end
@@ -20,5 +20,12 @@ end
 
 Gitlab::Request.class_eval do
   prepend GitlabAwesomeRelease::GitlabLoggingExt
-  cattr_accessor :logger
+
+  def self.logger
+    Gitlab::Request.instance_variable_get(:@logger)
+  end
+
+  def self.logger=(logger)
+    Gitlab::Request.instance_variable_set(:@logger, logger)
+  end
 end

data/lib/gitlab_awesome_release/project.rb

@@ -35,7 +35,7 @@ module GitlabAwesomeRelease
         with_paging do |params|
           Gitlab.repo_tags(escaped_project_name, params)
         end
-      @all_tag_names = repo_tags.sort_by{ |tag| tag.commit.authored_date }.map(&:name)
+      @all_tag_names = repo_tags.sort_by { |tag| tag.commit.authored_date }.map(&:name)
     end
 
     # @return [Array<String>]
@@ -60,8 +60,8 @@ module GitlabAwesomeRelease
           str << "\n"
         end
 
-      changelog << <<-MARKDOWN.strip_heredoc
-        *This Change Log was automatically generated by [gitlab_awesome_release](https://gitlab.com/sue445/gitlab_awesome_release)*
+      changelog << <<-MARKDOWN
+*This Change Log was automatically generated by [gitlab_awesome_release](https://gitlab.com/sue445/gitlab_awesome_release)*
       MARKDOWN
 
       changelog
@@ -79,8 +79,8 @@ module GitlabAwesomeRelease
       summary = merge_requests_summary_between(from, to)
 
       header = generate_heading(title)
-      header << <<-MARKDOWN.strip_heredoc
-        [full changelog](#{web_url}/compare/#{from}...#{to})
+      header << <<-MARKDOWN
+[full changelog](#{web_url}/compare/#{from}...#{to})
 
       MARKDOWN
 
@@ -97,10 +97,14 @@ module GitlabAwesomeRelease
     # @return [Array<Integer>] MergeRequest iids
     def merge_request_iids_between(from, to)
       commits = Gitlab.repo_compare(escaped_project_name, from, to).commits
-      commits.map do |commit|
-        commit["message"] =~ /^Merge branch .*See merge request \!(\d+)$/m
-        $1
-      end.compact.map(&:to_i)
+
+      merge_request_iids =
+        commits.map do |commit|
+          commit["message"] =~ /^Merge branch .*See merge request \!(\d+)$/m
+          Regexp.last_match(1)
+        end
+
+      merge_request_iids.compact.map(&:to_i)
     end
 
     # @param iid [Integer] MergeRequest iid
@@ -130,34 +134,34 @@ module GitlabAwesomeRelease
 
     private
 
-    def escaped_project_name
-      CGI.escape(@project_name)
-    end
+      def escaped_project_name
+        CGI.escape(@project_name)
+      end
 
-    # @yield [params] paging block
-    # @yieldparam params [Hash] paging params for GitLab API (page: current page, per_page)
-    # @yieldreturn response in all pages
-    def with_paging
-      all_response = []
-      page = 1
-      loop do
-        response = yield(page: page, per_page: PER_PAGE)
-        all_response += response
-        return all_response if response.size < PER_PAGE
-        page += 1
+      # @yield [params] paging block
+      # @yieldparam params [Hash] paging params for GitLab API (page: current page, per_page)
+      # @yieldreturn response in all pages
+      def with_paging
+        all_response = []
+        page = 1
+        loop do
+          response = yield(page: page, per_page: PER_PAGE)
+          all_response += response
+          return all_response if response.size < PER_PAGE
+          page += 1
+        end
       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"
+      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
 
-    def assert_merge_request_iid(mr, iid)
-      # NOTE: MR is found, but server is old GitLab?
-      raise "MergeRequest iid does not match (expected #{iid}, but #{mr.iid})" unless iid == mr.iid
-    end
+      def assert_merge_request_iid(mr, iid)
+        # NOTE: MR is found, but server is old GitLab?
+        raise "MergeRequest iid does not match (expected #{iid}, but #{mr.iid})" unless iid == mr.iid
+      end
   end
 end

data/lib/gitlab_awesome_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabAwesomeRelease
-  VERSION = "0.1.0"
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_awesome_release
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: onkcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.47.1.0
+  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
@@ -190,6 +190,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -199,6 +200,9 @@ 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
 - lib/gitlab_awesome_release.rb
@@ -207,7 +211,6 @@ files:
 - lib/gitlab_awesome_release/gitlab_logging_ext.rb
 - lib/gitlab_awesome_release/project.rb
 - lib/gitlab_awesome_release/version.rb
-- script/build.sh
 homepage: https://gitlab.com/sue445/gitlab_awesome_release
 licenses:
 - MIT
@@ -228,9 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate changelog from tags and MergeRequests on GitLab
 test_files: []
-has_rdoc: 

data/script/build.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -xe
-
-export CI=true
-
-bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=2 --retry=3
-
-bundle exec rspec