mr_bump 0.3.6 → 0.3.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjQ1YzdhMzBhYTY0YTkyMmYwMDM2YzBjNzY5OWZmN2UzZmE1MTU0Yg==
-  data.tar.gz: !binary |-
-    NjAzZTRkNGNmOWY0MTg1MTQxZWVjMWI3OTk2NjdmYTZhYzhhOGMzYg==
+SHA1:
+  metadata.gz: 6679910a34eb8832cb4be13db633754c68378475
+  data.tar.gz: 91bee513183a14ce630a9fcebb7182701498c3eb
 SHA512:
-  metadata.gz: !binary |-
-    M2Y3ZDVlM2FlMDk4OTQ4NjEwZjk0OTZiMjhjMzlhN2JkZjIzMGI1NGY1YWM2
-    MjdkODhjZDVkMGY3NmU2OWU4N2ZiYTVjZTJkYzczODBmZDgzMTg2N2VjYTI1
-    ODZmMWJiZDk0OWI3NTliN2Q3NWZhN2ZlMDg3ZjM1ZTRmN2MxNWM=
-  data.tar.gz: !binary |-
-    OTg2NmNjNDU4ZDM0MmIwMjk5OWUwZDk4OGNjNjNjMDAzZTY1YTllYjY0NDBh
-    OGYyMGNmNzlkZTI0YmJhYzE4M2FiMzYwZTdjZDY2OGFlYzFmNDYzOTk3Nzlj
-    NjE4NjMwMjQ3YTRjMTNlNjhmMTI2YzZlNTJiNDFiMDE1ODQ1OGY=
+  metadata.gz: 7a2c12c0389a351cded5590159266e51fbb3b97a3c671901b077a868c793ac2ace62974cbab227edea4bdcc114975e724950459ebd11eb60d99d97d0214d91b0
+  data.tar.gz: 274a525cb137f0745cff94764005621de10f62ba4b82cbb74e24065e46f1a84be4f2ef7f887f117b9cf4c8cf811757fcc12500a0620888c642306722bc244c70

data/bin/mr_bump

@@ -171,7 +171,9 @@ if develop
   exit 1 unless user_inp.strip == new_branch
 end
 
-changes = MrBump.change_log_items_for_range(last_release, MrBump.current_branch).map(&:to_md)
+changes = MrBump.change_log_items_for_range(last_release, MrBump.current_branch)
+            .reject(&:has_no_detail?)
+            .map(&:to_md)
 changes = changes.join("\n")
 md_changes = "# #{new_release}\n#{changes}\n\n"
 

data/defaults.yml

@@ -24,7 +24,7 @@
 #   - comment_lines: Array of all lines in commit comment
 #   - first_commit_line: The first line of the commit comment
 #   - comment_body: The rest of the lines in the comment
-markdown_template: " * {{branch_type}} - {{#dev_id}}{{.}} - {{/dev_id}}{{first_comment_line}}{{#comment_body}}\n   {{.}}{{/comment_body}}"
+markdown_template: " * {{branch_type}}{{#dev_id}} - {{.}}{{/dev_id}}{{#first_comment_line}} - {{.}}{{/first_comment_line}}{{#comment_body}}\n   {{.}}{{/comment_body}}"
 
 # Prefix for release branches, this allows arbitrary text to be added before the version number on a release branch
 release_prefix: release/

data/lib/mr_bump.rb

@@ -65,7 +65,7 @@ module MrBump
   def self.latest_release_from_list(branches)
     regex = Regexp.new("^origin/#{release_branch_regex}$")
     branches.map do |branch|
-      matches = regex.match(branch)
+      matches = regex.match(branch.force_encoding("UTF-8"))
       MrBump::Version.new(matches[1]) if matches
     end.compact.max || MrBump::Version.new('0.0.0')
   end

data/lib/mr_bump/change.rb

@@ -39,6 +39,10 @@ module MrBump
       end
     end
 
+    def has_no_detail?
+      comment_lines.empty? && dev_id.nil?
+    end
+
     def first_comment_line
       comment_lines.first
     end

data/spec/change_spec.rb

@@ -8,13 +8,14 @@ require 'mr_bump/change'
 describe MrBump::Change do
   let(:config) do
     {
-      'markdown_template' => ' * {{branch_type}} - {{#dev_id}}{{.}} - {{/dev_id}}' \
-                             "{{first_comment_line}}{{#comment_body}}\n  {{.}}{{/comment_body}}"
+      'markdown_template' => ' * {{branch_type}}{{#dev_id}} - {{.}}{{/dev_id}}' \
+                             "{{#first_comment_line}} - {{.}}{{/first_comment_line}}{{#comment_body}}\n  {{.}}{{/comment_body}}"
     }
   end
 
   context 'when loading from git log message' do
-    let(:change) { described_class.from_gitlog(config, merge_str, ['Line 1', 'Line 2']) }
+    let(:comment_lines) { ['Line 1', 'Line 2'] }
+    subject(:change) { described_class.from_gitlog(config, merge_str, comment_lines) }
 
     context 'when given a merge string in the default PR format for a feature' do
       let(:merge_str) { 'Merge pull request #555 from AGithubUsername/feature/DEV-1_Stuff' }
@@ -34,6 +35,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Feature - DEV-1 - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a feature' do
@@ -54,6 +57,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Feature - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a bugfix' do
@@ -74,6 +79,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Bugfix - DEV-1 - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a bugfix' do
@@ -94,6 +101,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Bugfix - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a hotfix' do
@@ -114,6 +123,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a hotfix' do
@@ -134,6 +145,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Hotfix - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default manual format for a feature' do
@@ -154,6 +167,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Feature - DEV-1 - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a feature' do
@@ -174,6 +189,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Feature - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default manual format for a bugfix' do
@@ -194,6 +211,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Bugfix - DEV-1 - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a bugfix' do
@@ -214,6 +233,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Bugfix - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default manual format for a hotfix' do
@@ -234,6 +255,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Hotfix - DEV-1 - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when given a merge string in the default PR format for a hotfix' do
@@ -254,6 +277,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Hotfix - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'when no merge type given' do
@@ -273,11 +298,104 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(" * Task - Line 1\n  Line 2")
       end
+
+      it { should_not have_no_detail }
+    end
+
+    context 'with no comment' do
+      let(:comment_lines) { [] }
+
+      context 'when given a merge string in the default PR format for a hotfix' do
+        let(:merge_str) { "Merge branch 'hotfix/Stuff'" }
+
+        it 'defaults PR Number to a blank string' do
+          expect(change.pr_number).to eq('')
+        end
+
+        it 'extracts the correct branch type' do
+          expect(change.branch_type).to eq('Hotfix')
+        end
+
+        it 'fails to extract dev ID' do
+          expect(change.dev_id).to be_nil
+        end
+
+        it 'renders to markdown correctly' do
+          expect(change.to_md).to eq(" * Hotfix")
+        end
+
+        it { should have_no_detail }
+      end
+
+      context 'when given a merge string in the default PR format for a bugfix' do
+        let(:merge_str) { "Merge branch 'bugfix/Stuff'" }
+
+        it 'defaults PR Number to a blank string' do
+          expect(change.pr_number).to eq('')
+        end
+
+        it 'extracts the correct branch type' do
+          expect(change.branch_type).to eq('Bugfix')
+        end
+
+        it 'fails to extract dev ID' do
+          expect(change.dev_id).to be_nil
+        end
+
+        it 'renders to markdown correctly' do
+          expect(change.to_md).to eq(" * Bugfix")
+        end
+
+        it { should have_no_detail }
+      end
+
+      context 'when given a merge string in the default PR format for a feature' do
+        let(:merge_str) { "Merge branch 'feature/Stuff'" }
+
+        it 'defaults PR Number to a blank string' do
+          expect(change.pr_number).to eq('')
+        end
+
+        it 'extracts the correct branch type' do
+          expect(change.branch_type).to eq('Feature')
+        end
+
+        it 'fails to extract dev ID' do
+          expect(change.dev_id).to be_nil
+        end
+
+        it 'renders to markdown correctly' do
+          expect(change.to_md).to eq(" * Feature")
+        end
+
+        it { should have_no_detail }
+      end
+
+      context 'when no merge type given' do
+        let(:merge_str) { 'Merge pull request #1224 from Xulaus/gem_bump' }
+        it 'extracts the correct PR Number' do
+          expect(change.pr_number).to eq('1224')
+        end
+
+        it 'defaults the branch type to "Task"' do
+          expect(change.branch_type).to eq('Task')
+        end
+
+        it 'fails to extract dev ID' do
+          expect(change.dev_id).to be_nil
+        end
+
+        it 'renders to markdown correctly' do
+          expect(change.to_md).to eq(" * Task")
+        end
+
+        it { should have_no_detail }
+      end
     end
   end
 
   context 'when loading from markdown' do
-    let(:change) { described_class.from_md(config, md_str) }
+    subject(:change) { described_class.from_md(config, md_str) }
 
     context 'with bugfix and no DevID given' do
       let(:md_str) { " * Bugfix - Line 1\n  Line 2\n  Line 3" }
@@ -293,6 +411,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with feature and no DevID given' do
@@ -309,6 +429,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with hotfix and no DevID given' do
@@ -325,6 +447,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with task and no DevID given' do
@@ -341,6 +465,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with bugfix and no DevID given, and no second line' do
@@ -357,6 +483,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with feature and no DevID given, and no second line' do
@@ -373,6 +501,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with hotfix and no DevID given, and no second line' do
@@ -389,6 +519,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
     context 'with task and no DevID given, and no second line' do
@@ -405,9 +537,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with bugfix and no DevID given' do
+    context 'with bugfix and DevID given' do
       let(:md_str) { " * Bugfix - ASDASD-123123 - Line 1\n  Line 2\n  Line 3" }
 
       it 'extracts the correct branch type' do
@@ -421,9 +555,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with feature and no DevID given' do
+    context 'with feature and DevID given' do
       let(:md_str) { " * Feature - WHUT00 - Line 1\n  Line 2\n  Line 3" }
 
       it 'extracts the correct branch type' do
@@ -437,9 +573,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with hotfix and no DevID given' do
+    context 'with hotfix and DevID given' do
       let(:md_str) { " * Hotfix - WJNASD-123 - Line 1\n  Line 2\n  Line 3" }
 
       it 'extracts the correct branch type' do
@@ -453,9 +591,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with task and no DevID given' do
+    context 'with task and DevID given' do
       let(:md_str) { " * Task - lqiwhuweh213 - Line 1\n  Line 2\n  Line 3" }
 
       it 'defaults the branch type to "Task"' do
@@ -469,9 +609,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with bugfix and no DevID given, and no second line' do
+    context 'with bugfix and DevID given, and no second line' do
       let(:md_str) { " * Bugfix - DEV-123 - Line 1" }
 
       it 'extracts the correct branch type' do
@@ -485,9 +627,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with feature and no DevID given, and no second line' do
+    context 'with feature and DevID given, and no second line' do
       let(:md_str) { " * Feature - SAMBA-123 - Line 1" }
 
       it 'extracts the correct branch type' do
@@ -501,9 +645,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with hotfix and no DevID given, and no second line' do
+    context 'with hotfix and DevID given, and no second line' do
       let(:md_str) { " * Hotfix - asf1 - Line 1" }
 
       it 'extracts the correct branch type' do
@@ -517,9 +663,11 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
 
-    context 'with task and no DevID given, and no second line' do
+    context 'with task and DevID given, and no second line' do
       let(:md_str) { " * Task - JBAJSDB0123 - Line 1" }
 
       it 'defaults the branch type to "Task"' do
@@ -533,6 +681,8 @@ describe MrBump::Change do
       it 'renders to markdown correctly' do
         expect(change.to_md).to eq(md_str)
       end
+
+      it { should_not have_no_detail }
     end
   end
 
@@ -604,7 +754,7 @@ describe MrBump::Change do
     let(:change) { described_class.from_gitlog(config, merge_str, []) }
 
     it 'renders to markdown correctly' do
-      expect(change.to_md).to eq(" * Hotfix - DEV-1 - ")
+      expect(change.to_md).to eq(' * Hotfix - DEV-1')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_bump
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Richard Fitzgerald
@@ -15,180 +15,180 @@ dependencies:
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.99.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.99.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: OptionParser
   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: rspec
   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: pry
   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: rb-readline
   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
     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: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 description: Bump versions
@@ -225,17 +225,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 3
 summary: BUMP!