gplan 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54936e7bc0c10f14a2420e46cfebc0a747a35ae4
-  data.tar.gz: 3b0181f9399cd157c784d812e4142b54f847ee50
+  metadata.gz: de28ad83ab2592e113db3b2470609cb9faaf563c
+  data.tar.gz: 733fe4924a1eb36d5245487f9a121b3af5968c26
 SHA512:
-  metadata.gz: a5b4d0438f6f371a318a538fc987084bca1a75303679eb0df24640070156d072f624b096573732c9fd368ffe032d73c4f9742ab53c48ff810d3b12d3f620e28d
-  data.tar.gz: d7dfb55f4f08731c256e4aa3b970ea7bb18c2f5a2abeac52767580ba8e2259da8ec71c9c000b045b0570e9c34726b89eb74598fdf367c3cbd07f510a8c48e542
+  metadata.gz: 178f2ffe2895f74769a12b44f9fdb712a04a387dd7a30bd14bd2952c73b1c015107ccec9196a4675291923a5b67aa88286392c49ef48bd53cd89927f09488d6f
+  data.tar.gz: 0fa6bef00801473df3ae7db55718a33c0506a84ab840f83e933da3afb4fe8cba1ba40faf01d5baf2a1c58590663265ae2496be70462d8bdf064fd2ee52131838

data/lib/planbox.rb

@@ -74,4 +74,15 @@ module Planbox
     result_string.gsub!('`', ' ') || result_string
   end
 
+  def self.has_planbox? object
+    if object.is_a?(Hash)
+      return !object['name'].nil?
+    elsif object.is_a?(Array)
+      object.each do |story|
+        return true if !story['name'].nil?
+      end
+      return false
+    end
+  end
+
 end

data/lib/printer.rb

@@ -11,26 +11,36 @@ class Printer
   end
 
   def print stories
-    end_of_pbs = false
-    release_notes = "ID:STATUS:TITLE:PROJECT_NAME:PROJECT_ALIAS:PR:TITLE\n"
     dependencies = []
-    stories.each do |story|
-      if !end_of_pbs and story['name'].nil?
-        end_of_pbs = true
-        release_notes += title "Unmatched PRs"
-        release_notes += "PR:TITLE\n"
-      end
 
+    # Github stories only
+    release_notes = "PR:TITLE:ISSUES:MILESTONE\n"
+    stories.each do |story|
+      next if Planbox.has_planbox?(story)
       dependency = get_dependency(story)
       dependencies << "PR ##{story['number']}: " + dependency unless dependency.nil?
 
       line = ""
-      line += planbox_info story unless end_of_pbs
-      line += github_pr_info story unless story['number'].nil?
+      line += github_pr_info(story) unless story['number'].nil?
 
       release_notes += line + "\n"
     end
 
+    # Planbox matching stories
+    if Planbox.has_planbox?(stories) 
+      release_notes += title "Matched Planbox Stories"
+      release_notes += "ID:STATUS:TITLE:PROJECT_NAME:PROJECT_ALIAS:PR:TITLE\n"
+      stories.each do |story|
+        next unless Planbox.has_planbox?(story)
+        dependency = get_dependency(story)
+        dependencies << "PR ##{story['number']}: " + dependency unless dependency.nil?
+
+        line = ""
+        line += planbox_info(story)
+        line += github_pr_info(story) unless story['number'].nil?
+      end
+    end
+
     # print dependency blocks
     unless dependencies.empty?
       release_notes += include_dependencies dependencies
@@ -70,7 +80,7 @@ class Printer
 
   def github_pr_info story
     line = ":#{story['number']}:#{story['title']}"
-    line += github_issue_info story if story['linked_issues']
+    line += github_issue_info(story) if story['linked_issues']
     line
   end
 

data/templates/template.html.haml

@@ -1,33 +1,4 @@
 %h2 Release notes
-%table{:border => "1"}
-  %thead
-    %tr
-      %th ID
-      %th STATUS
-      %th DESCRIPTION
-      %th PROJECT NAME
-      %th PROJECT ALIAS
-      %th PR
-      %th PR TITLE
-      %th Dependencies
-  %tbody
-  - $stories.each do |story|
-    %tr
-      - break if story['name'].nil?
-      %td
-        %a{href: story['pb_url']}= story['id']
-      %td= story['status']
-      %td= story['name']
-      %td= story['project_name']
-      %td= story['project_alias']
-      %td
-        %a{href: story['html_url']}= story['number']
-      %td= story['title']
-      - block = Printer.new.get_dependency(story)
-      - next if block.nil?
-      %td= block
-
-%h2 Unmatched PRs
 %table{:border => "1"}
   %thead
     %tr
@@ -37,7 +8,7 @@
       %th Dependencies
   %tbody
   - $stories.each do |story|
-    - next unless story['name'].nil?
+    - next if Planbox.has_planbox?(story)
     %tr
       %td
         %a{href: story['html_url']}= story['number']
@@ -49,7 +20,39 @@
               %tr
                 %td
                   %a{href: issue['html_url']}= issue['number']
-                %td= issue['milestone']['title'] if issue['milestone']
+                %td
+                  - if issue['milestone']
+                    %a{href: issue['milestone']['html_url']}= issue['milestone']['title']
+        - block = Printer.new.get_dependency(story)
+        - next if block.nil?
+        %td= block
+
+- if Planbox.has_planbox?($stories) 
+  %h2 Matched Planbox Stories
+  %table{:border => "1"}
+    %thead
+      %tr
+        %th ID
+        %th STATUS
+        %th DESCRIPTION
+        %th PROJECT NAME
+        %th PROJECT ALIAS
+        %th PR
+        %th PR TITLE
+        %th Dependencies
+    %tbody
+    - $stories.each do |story|
+      %tr
+        - break unless Planbox.has_planbox?(story)
+        %td
+          %a{href: story['pb_url']}= story['id']
+        %td= story['status']
+        %td= story['name']
+        %td= story['project_name']
+        %td= story['project_alias']
+        %td
+          %a{href: story['html_url']}= story['number']
+        %td= story['title']
         - block = Printer.new.get_dependency(story)
         - next if block.nil?
         %td= block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gplan
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jeff Koenig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -53,7 +53,7 @@ files:
 - lib/planbox.rb
 - lib/printer.rb
 - templates/template.html.haml
-homepage: https://github.com/el-jefe-/gplan
+homepage: https://github.com/thejefe/gplan
 licenses: []
 metadata: {}
 post_install_message: