gitlab_mr_release 0.2.0 → 0.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e097e8b3a6fa3ce74183de3146060ca452dc4d
-  data.tar.gz: b773591304833694146b9e60de9a09ad37eb19be
+  metadata.gz: dfd1bd012a6623b07ec88422301e7a903bd27e52
+  data.tar.gz: c210cb149e78a9633a35a6e99a4a88f2058bc40f
 SHA512:
-  metadata.gz: 813dcb7a7f0cfc50f5df943e98eb46c5046f41f4ef89fe0f5fa361a24e831e33397f204b1b65831547fc9bc65a2fb37740b0b55c804102df07d77d1c765cd868
-  data.tar.gz: 50512479fd6a58bf347b3924241d1b9803af96fb3d50fc95ffa0613161130c27b4863c5129e31fe39e73455e87df0fc5c60f8b10277043177eaad1fdc88a8598
+  metadata.gz: b0f883786063a983f7d1e822fa40845835a19b00b71439835ee34c60049f1639e8523fd7928abf06aaa8d2e55a8397b3bd537eb491d1a7bfca5f32b9876e62c6
+  data.tar.gz: f9babb8178923687b0f47b7d5ca066f5efc0bdd04d25b84e86fd2d9450103095c3ce702f40c6ac07a0bfca086c1d5cc6426b425c7c60dd99e7a4ced9d21ecf0a

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
 - 2.1
-- 2.2
-- 2.3
+- 2.2.5
+- 2.3.1
 - ruby-head
 cache: bundler
 sudo: false
@@ -22,4 +22,3 @@ notifications:
 matrix:
   allow_failures:
   - rvm: ruby-head
-  - rvm: 2.3

data/CHANGELOG.md

@@ -1,14 +1,19 @@
 ## Unreleased
-[full changelog](http://github.com/sue445/rubicure/compare/v0.2.0...master)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.2.0...master)
+
+* Support MR labels
+  * https://github.com/sue445/gitlab_mr_release/pull/13
+* Support default params in .env.gitlab
+  * https://github.com/sue445/gitlab_mr_release/pull/14
 
 ## v0.2.0
-[full changelog](http://github.com/sue445/rubicure/compare/v0.1.1...v0.2.0)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.1.1...v0.2.0)
 
 * Support `DEFAULT_TITLE` with erb
   * https://github.com/sue445/gitlab_mr_release/pull/11
 
 ## v0.1.1
-[full changelog](http://github.com/sue445/rubicure/compare/v0.1.0...v0.1.1)
+[full changelog](http://github.com/sue445/gitlab_mr_release/compare/v0.1.0...v0.1.1)
 
 * Enable ERB trim_mode `"-"` (i.g. `<%-` , `-%>`) and tweak default template #10
   * https://github.com/sue445/gitlab_mr_release/pull/10

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gitlab_mr_release.gemspec
 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"
+end

data/README.md

@@ -32,9 +32,11 @@ $ gitlab_mr_release init
       create  gitlab_mr_release.md.erb
 ```
 
+see [lib/templates/](lib/templates/)
+
 ### create
 ```sh
-$ gitlab_mr_release create --source=develop --target=master
+$ gitlab_mr_release create --source=develop --target=master --labels=release
 MergeRequest is created
 
 [Title] Release develop -> master
@@ -56,12 +58,13 @@ detail
 ```sh
 $ gitlab_mr_release help create
 Usage:
-  gitlab_mr_release create -s, --source=SOURCE -t, --target=TARGET
+  gitlab_mr_release create
 
 Options:
-  -s, --source=SOURCE  # Source branch (e.g. develop)
-  -t, --target=TARGET  # Target branch (e.g. master)
-      [--title=TITLE]  # MergeRequest title (default. 'Release :source -> :target')
+  -s, [--source=SOURCE]  # Source branch (e.g. develop)
+  -t, [--target=TARGET]  # Target branch (e.g. master)
+      [--title=TITLE]    # MergeRequest title (default. 'Release :source -> :target')
+  -l, [--labels=LABELS]  # Labels for MR as a comma-separated list  (e.g. 'label1,label2')
 
 Create merge requrst
 ```
@@ -84,6 +87,9 @@ current `.env.gitlab`
 ```
 GITLAB_PROJECT_NAME=group/name
 TEMPLATE_FILE=gitlab_mr_release.md.erb
+DEFAULT_SOURCE_BRANCH=develop
+DEFAULT_TARGET_BRANCH=master
+DEFAULT_LABELS=release
 ```
 
 If defined both `~/.env.gitlab` and current `.env.gitlab`, current `.env.gitlab` is priority

data/lib/gitlab_mr_release/cli.rb

@@ -26,9 +26,10 @@ module GitlabMrRelease
     end
 
     desc "create", "Create merge requrst"
-    option :source, aliases: "-s", required: true, desc: "Source branch (e.g. develop)"
-    option :target, aliases: "-t", required: true, desc: "Target branch (e.g. master)"
+    option :source, aliases: "-s", desc: "Source branch (e.g. develop)"
+    option :target, aliases: "-t", desc: "Target branch (e.g. master)"
     option :title,  desc: "MergeRequest title (default. 'Release :source -> :target')"
+    option :labels, aliases: "-l", desc: "Labels for MR as a comma-separated list  (e.g. 'label1,label2')"
     def create
       Dotenv.load(*GITLAB_ENV_FILES)
 
@@ -36,6 +37,9 @@ module GitlabMrRelease
       assert_env("GITLAB_API_PRIVATE_TOKEN")
       assert_env("GITLAB_PROJECT_NAME")
 
+      assert_option_or_env(:source, "DEFAULT_SOURCE_BRANCH")
+      assert_option_or_env(:target, "DEFAULT_TARGET_BRANCH")
+
       template = File.read(template_file)
 
       project = GitlabMrRelease::Project.new(
@@ -45,8 +49,9 @@ module GitlabMrRelease
       )
 
       mr = project.create_merge_request(
-        source_branch: options[:source],
-        target_branch: options[:target],
+        source_branch: source_branch,
+        target_branch: target_branch,
+        labels:        labels,
         title:         generate_title,
         template:      template,
       )
@@ -70,7 +75,14 @@ MergeRequest is created
     private
 
     def assert_env(name)
-      raise "Error: Environment variable #{name} is required" unless ENV[name]
+      if !ENV[name] || ENV[name].empty?
+        puts "Error: Environment variable #{name} is required"
+        exit!
+      end
+    end
+
+    def assert_option_or_env(option_name, env_name)
+      option_or_env!(option_name, env_name)
     end
 
     def generate_title
@@ -78,8 +90,8 @@ MergeRequest is created
 
       generate_default_title(
         title_template: ENV["DEFAULT_TITLE"],
-        source_branch:  options[:source],
-        target_branch:  options[:target],
+        source_branch:  source_branch,
+        target_branch:  target_branch,
       )
     end
 
@@ -91,5 +103,31 @@ MergeRequest is created
     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 target_branch
+      option_or_env(:target, "DEFAULT_TARGET_BRANCH")
+    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)
+      value = option_or_env(option_name, env_name)
+      return value if value
+
+      puts "Error: --#{option_name} or #{env_name} is either required!"
+      exit!
+    end
   end
 end

data/lib/gitlab_mr_release/project.rb

@@ -41,12 +41,13 @@ module GitlabMrRelease
       ERB.new(template, nil, "-").result(binding).strip
     end
 
-    def create_merge_request(source_branch:, target_branch:, title:, template:)
+    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(escaped_project_name, title, options)
     end

data/lib/gitlab_mr_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabMrRelease
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_mr_release
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.beta1
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -208,12 +208,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Release MergeRequest generator for GitLab