gitlab_mr_release 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a608d0ab003591e98a59236c25878f5c6bab1438
-  data.tar.gz: 8a088a1fe042c9603f4c53afbf89cc8a037b6d99
+  metadata.gz: 9cbe2782d585b794c4e2ea0a87da996aac34fbd1
+  data.tar.gz: 1374b025de7ad9d41e78472f380b44ee5438bb91
 SHA512:
-  metadata.gz: 23e6c973a58871243869d3a0c6735d3251811f584b6309ded732da1361eb3da45bc163871d31fa575dabdce0a8ddf36d3768f3634321baad0babf4e3dbcb3c62
-  data.tar.gz: 6830949e68a38c55aaa88e10381c5d3118e96dfc147862d35dead4a1fbf2405cdf8c3a253118c4647df771b01d221a69d7b59a8c69ac0d67d8c071490dea4144
+  metadata.gz: 292c41f99f975800922865faa983392c0dc1f9c598fa969c8441d473254f598416fb3872253e7818edb825098b7e513ef92693a49b7e15b215d70403752e5c6a
+  data.tar.gz: a54327168775aaf3e955686a38d3cb22f32917a18de1c3dd4272590bdece5a20d5e285d2a1e10601dcb5d49e2875e538170018887697f0393bcc90b81999616c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
-[full changelog](http://github.com/sue445/rubicure/compare/v0.1.0...master)
+[full changelog](http://github.com/sue445/rubicure/compare/v0.1.1...master)
+
+## v0.1.1
+[full changelog](http://github.com/sue445/rubicure/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
 
 ## v0.1.0
 * First release

data/README.md

@@ -90,9 +90,9 @@ If defined both `~/.env.gitlab` and current `.env.gitlab`, current `.env.gitlab`
 ### variables in template
 ```markdown
 # MergeRequests
-<% merge_requests.each do |mr| %>
+<% merge_requests.each do |mr| -%>
 * [ ] !<%= mr.iid %> <%= mr.title %> @<%= mr.author.username %>
-<% end %>
+<% end -%>
 ```
 
 `merge_requests` is array of [MergeRequest](https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/merge_requests.md#get-single-mr)

data/lib/gitlab_mr_release/cli.rb

@@ -8,13 +8,6 @@ module GitlabMrRelease
 
     GITLAB_ENV_FILES = %w(.env.gitlab ~/.env.gitlab)
 
-    DEFAULT_TEMPLATE = <<-MARKDOWN
-# MergeRequests
-<% merge_requests.each do |mr| %>
-* [ ] !<%= mr.iid %> <%= mr.title %> @<%= mr.author.username %>
-<% end %>
-    MARKDOWN
-
     def self.source_root
       "#{__dir__}/../templates"
     end
@@ -43,12 +36,7 @@ module GitlabMrRelease
 
       title = options[:title] || default_title
 
-      template =
-        if ENV["TEMPLATE_FILE"]
-          File.read(ENV["TEMPLATE_FILE"])
-        else
-          DEFAULT_TEMPLATE
-        end
+      template = File.read(template_file)
 
       project = GitlabMrRelease::Project.new(
         api_endpoint:  ENV["GITLAB_API_ENDPOINT"],
@@ -88,5 +76,9 @@ MergeRequest is created
     def default_title
       "Release #{options[:source]} -> #{options[:target]}"
     end
+
+    def template_file
+      ENV["TEMPLATE_FILE"] || "#{__dir__}/../templates/gitlab_mr_release.md.erb"
+    end
   end
 end

data/lib/gitlab_mr_release/project.rb

@@ -38,7 +38,7 @@ module GitlabMrRelease
 
     def generate_description(iids, template)
       merge_requests = iids.map { |iid| merge_request(iid) }
-      ERB.new(template).result(binding).strip
+      ERB.new(template, nil, "-").result(binding).strip
     end
 
     def create_merge_request(source_branch:, target_branch:, title:, template:)

data/lib/gitlab_mr_release/version.rb

@@ -1,3 +1,3 @@
 module GitlabMrRelease
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/templates/gitlab_mr_release.md.erb

@@ -1,4 +1,4 @@
 # MergeRequests
-<% merge_requests.each do |mr| %>
+<% merge_requests.each do |mr| -%>
 * [ ] !<%= mr.iid %> <%= mr.title %> @<%= mr.author.username %>
-<% end %>
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_mr_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-11-15 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv