gitlab_awesome_release 0.1.0.beta4 → 0.1.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4321a1ddcd333baf04ef1a04801a708615032e71
-  data.tar.gz: 4ff58ff17f64e70a5229db5c1ab772d355b6dab3
+  metadata.gz: 79dcca8a59190f69caa1c4fdcf4ccfd6a3128b24
+  data.tar.gz: 065353fae2858639d9fa75ced13213f5bdc8f7e5
 SHA512:
-  metadata.gz: 2e7ebf887200d56c6c58a68bd8b9bf035b5e948fa81a2e5bedcd512760bd8c7c45a17090f6d4c69457d15ca60b21637b74b97e33a9767e3b55bb5208b83da767
-  data.tar.gz: 9195680883c5ed88b9a28551f377e04f7bb5979d265ead07d5a93cb80e6cf10fff2af9381211d675b5903a2775e5ae27b755230ca6955d3ab050427a4cf2b5ef
+  metadata.gz: 5d5c011aa2d599c46f02e6b667ff766559c96001ead5ccf7ea7bdf1253d25e887afe396fc7d4159718936f6cfa6b712ac99b3e680ffe7ecd7f5b3ffc4d3c8562
+  data.tar.gz: 2085fceb89ed4b4f6e1231cf8479193eb84497dcc3f55d30d73c5d4825e9928e7086b370d1cd89ff7bf7f871acb43d0bdb1f468728c042dc11bb5890b986ece3

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta3...HEAD)
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta4...HEAD)
 
 
+## v0.1.0.beta4
+[full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta3...v0.1.0.beta4)
+
+* Use .env.gitlab and ~/.env.gitlab instead of .env [!8](https://gitlab.com/sue445/gitlab_awesome_release/merge_requests/8) *@sue445*
+
 ## v0.1.0.beta3
 [full changelog](https://gitlab.com/sue445/gitlab_awesome_release/compare/v0.1.0.beta2...v0.1.0.beta3)
 

data/gitlab_awesome_release.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-temp_dir"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"

data/lib/gitlab_awesome_release/cli.rb

@@ -5,8 +5,8 @@ require "dotenv"
 module GitlabAwesomeRelease
   class CLI < Thor
     DEFAULT_VERSION_FORMAT = "^v?[\\d.]+"
-
     GITLAB_ENV_FILES = %w(.env.gitlab ~/.env.gitlab)
+    LOG_LEVEL_DESCRIPTION = "Log level (debug|info|warn|error|fatal|unknown)"
 
     desc "version", "Show gitlab_awesome_release version"
     def version
@@ -15,38 +15,21 @@ module GitlabAwesomeRelease
 
     desc "create_note", "generate changelog"
     option :filename
-    option :from
-    option :to
+    option :from_tag
+    option :to_tag
     option :gitlab_api_endpoint
     option :gitlab_api_private_token
     option :gitlab_project_name
-    option :allow_tag_format, desc: "Regular expression of tag format", default: "^v?[\\d.]+"
-    option :log_level, desc: "Log level (debug|info|warn|error|fatal|unknown)", default: "info"
+    option :allow_tag_format, desc: "Regular expression of tag format", default: DEFAULT_VERSION_FORMAT
+    option :log_level, desc: LOG_LEVEL_DESCRIPTION, default: "info"
     def create_note
       Dotenv.load(*GITLAB_ENV_FILES)
 
-      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}] #{message}\n"
-      }
-
-      project = 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,
-      )
+      project = create_project
 
       tag_names = project.release_tag_names
-      oldest_tag = option_or_env(:from) || tag_names.first
-      newest_tag = option_or_env(:to)   || tag_names.last
+      oldest_tag = option_or_env(:from_tag) || tag_names.first
+      newest_tag = option_or_env(:to_tag)   || tag_names.last
 
       changelog = project.generate_change_log(oldest_tag, newest_tag)
 
@@ -54,6 +37,30 @@ module GitlabAwesomeRelease
       @logger.info "finish!"
     end
 
+    desc "marking", "Add version label to MergeRequests"
+    option :from_tag
+    option :to_tag
+    option :label
+    option :gitlab_api_endpoint
+    option :gitlab_api_private_token
+    option :gitlab_project_name
+    option :log_level, desc: LOG_LEVEL_DESCRIPTION, default: "info"
+    def marking
+      Dotenv.load(*GITLAB_ENV_FILES)
+
+      from_tag  = option_or_env!(:from_tag)
+      to_tag    = option_or_env!(:to_tag)
+      label     = option_or_env(:label) || to_tag
+
+      project = create_project
+
+      project.merge_request_iids_between(from_tag, to_tag).each do |iid|
+        mr = project.merge_request(iid)
+        project.add_merge_request_label(mr, label) if mr
+      end
+      @logger.info "finish!"
+    end
+
     private
 
     def option_or_env(name, default = nil)
@@ -69,6 +76,27 @@ module GitlabAwesomeRelease
       exit!
     end
 
+    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}] #{message}\n"
+      }
+
+      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

data/lib/gitlab_awesome_release/project.rb

@@ -94,13 +94,22 @@ module GitlabAwesomeRelease
     # @param iid [Integer] MergeRequest iid
     # @return [String] markdown text
     def merge_request_summary(iid)
-      mr = Gitlab.merge_requests(escaped_project_name, iid: iid).first
+      mr = merge_request(iid)
       return nil unless mr
 
       mr_url = "#{web_url}/merge_requests/#{iid}"
       "* #{mr.title} [!#{iid}](#{mr_url}) *@#{mr.author.username}*"
     end
 
+    def merge_request(iid)
+      Gitlab.merge_requests(escaped_project_name, iid: iid).first
+    end
+
+    def add_merge_request_label(mr, label)
+      Gitlab.update_merge_request(escaped_project_name, mr.id, labels: label)
+      @logger.info "Add [#{label}] to !#{mr.iid}"
+    end
+
     private
 
     def escaped_project_name

data/lib/gitlab_awesome_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabAwesomeRelease
-  VERSION = "0.1.0.beta4"
+  VERSION = "0.1.0.beta5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_awesome_release
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta4
+  version: 0.1.0.beta5
 platform: ruby
 authors:
 - sue445
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-temp_dir
+  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