gantree 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09441aca3f3edcf71fdda17ddcb33a211bb5626
-  data.tar.gz: ee0db92cf08dc80d4283e03ff45d11c81d2f5fe8
+  metadata.gz: 93c2d862a41d406b2a7db7f3ddfc264d63e15555
+  data.tar.gz: de893109c5638ceca11b57cd01afa3c3ca94aa72
 SHA512:
-  metadata.gz: fae795326dad9be1d7713b45b84a21842f6ab7c1d819df6265daaf72da3fc0267ddd4d03d580e543f3417c29681a2a031ed1c61318394c758ad4d2aa995e2e2e
-  data.tar.gz: b556a99549286699d243004ceccf6cb0ee2cefd48b9ebd79e5d8fc6e2740cb9baf4cdf97c350e4accd5182dabf859ce64759f155532e8149366b9a0bb672a77b
+  metadata.gz: 916e8f901a7874a7bb9ad8c389d814a378b42e7f47676f192bb04a34825ceda9431154446819a1e1cb3d44199f54b55a8d11f161175564d5a1b5870197ca075d
+  data.tar.gz: 302529bb96a5aca54632cc8e8399cba56900203032e8679eef1d4920aa58906bb3716b6152342896ec344d5635c4fae03f06abb248fc957663533fcc870e1ffc

data/lib/gantree/release_notes.rb

@@ -48,18 +48,18 @@ module Gantree
       # Get commits for this release
       commits = git_log
       commits = commits.split("COMMIT_SEPARATOR")
-      commits = commits.collect { |x| x.strip }
-      # only grab the line with the lighthouse info
-      # or the first line if no lighthouse info
-      commits = commits.collect do |x|
-        lines = x.split("\n")
-        lines.select { |y| y =~ /\[#\d+/ }.first || lines.first
-      end.compact
-      # rid of clean up ticket format [#1234 state:xxx]
-      commits = commits.map do |x|
-        x.gsub(/\[#(\d+)(.*)\]/, '\1')
+      commits = commits.collect { |x| x.strip }.reject {|x| x.empty? }
+      tickets = []
+      commits.each do |msg|
+        md = msg.match(/(\w+-\d+)/)
+        if md
+          ticket_id = md[1]
+          tickets << msg unless tickets.detect {|t| t =~ Regexp.new("^#{ticket_id}") }
+        else
+          tickets << msg
+        end
       end
-      @commits = commits.uniq.sort
+      tickets
     end
 
     def commits_list

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/lib/gantree/1_release_notes_spec.rb

@@ -49,4 +49,26 @@ describe Gantree::ReleaseNotes do
     expect(commits).to include("commit 1")
     expect(commits).to include("commit 2")
   end
+
+  it "should dedup the duplicate tickets from notes" do
+    git_log_mock =  <<-EOL
+CMS-296 sortable tweaks
+ COMMIT_SEPARATOR
+CMS-296 tweak test to match implementation
+ COMMIT_SEPARATOR
+CMS-423 Edit Content modal waits for Preview object to be fetched
+ COMMIT_SEPARATOR
+CMS-423 WIP PreviewView area read from/write to area of tracks' embed code
+ COMMIT_SEPARATOR
+EOL
+
+    allow(@rn).to receive(:git_log).and_return(git_log_mock)
+    commits = @rn.commits
+    p commits if ENV['DEBUG']
+    expect(commits).to be_a(Array)
+    expect(commits.size).to eq 2
+    expect(commits).to include("CMS-296 sortable tweaks")
+    expect(commits).to include("CMS-423 Edit Content modal waits for Preview object to be fetched")
+    expect(commits).to_not include("CMS-423 WIP PreviewView area read from/write to area of tracks' embed code")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Felix