gplan 0.0.5 → 0.0.6

data/bin/gplan

@@ -45,20 +45,45 @@ def pull_pb_numbers_from_prs
   end
 end
 
+def pull_dependency(story)
+  return if story['blocks'].nil?
+  story['blocks'].each do |block|
+    if block.match(/(dependenc(y|ies|ys))/i)
+      return "PR: ##{story[i'id']}: " + block
+    end
+  end
+  return nil
+end
+
 def print
   end_of_pbs = false
   release_notes = "ID:STATUS:TITLE:PROJECT_NAME:PROJECT_ALIAS:PR:TITLE\n"
+  dependencies = []
   @combined.each do |story|
     if !end_of_pbs and story['name'].nil?
       end_of_pbs = true
       release_notes += "\n---- Unmatched PRs ----\n\n"
       release_notes += "PR:TITLE\n"
     end
+
+    dependency = pull_dependency(story)
+    dependencies << dependency unless dependency.nil?
+
     line = ""
     line += "#{story['id']}:#{story['status']}:#{story['name']}:#{story['project_name']}:#{story['project_alias']}" unless end_of_pbs
     line += ":#{story['number']}:#{story['title']}" unless story['number'].nil?
     release_notes += line + "\n"
   end
+
+  # print dependency blocks
+  unless dependencies.empty?
+    release_notes += "\n---- Dependencies ----\n\n"
+    dependencies.each do |dependency|
+    release_notes += dependency
+    release_notes += "\n"
+    end
+  end
+
   puts release_notes
 end
 
@@ -91,8 +116,10 @@ list= `git log #{@target}..`
 
 pb_story_ids = list.scan(PB_STORY_REGEX).flatten.uniq
 gh_pr_ids = list.scan(GH_PR_REGEX).flatten.uniq
+
 @gh_release_array = Github.get_release_notes_array gh_pr_ids
 @pb_release_array = Planbox.get_release_notes_array pb_story_ids
+
 pull_pb_numbers_from_prs
 combine_results
 print

data/lib/github.rb

@@ -3,6 +3,7 @@ require 'httparty'
 GITHUB_USERNAME=ENV['GITHUB_USERNAME']
 GITHUB_TOKEN=ENV['GITHUB_TOKEN']
 GITHUB_BASE_URL="https://api.github.com"
+HEADERS = {:headers => { 'User-Agent' => GITHUB_USERNAME, 'Content-Type' => 'application/json', 'Accept' => 'application/json'}}
 
 module Github
   include HTTParty
@@ -31,17 +32,18 @@ module Github
 
   def self.get_release_notes_array gh_pr_ids
     check_environment
+    set_repo_info
     get_stories gh_pr_ids
   end
 
+  def self.pulls_url(pr_id)
+    "#{GITHUB_BASE_URL}/repos/#{@repo_name}/#{@app_name}/pulls/#{pr_id}?access_token=#{GITHUB_TOKEN}"
+  end
+
   def self.get_story(pr_id)
-    set_repo_info
-    story_response = self.get("#{GITHUB_BASE_URL}/repos/#{@repo_name}/#{@app_name}/pulls/#{pr_id}?access_token=#{GITHUB_TOKEN}",
-                               {
-                                 :headers => { 'User-Agent' => GITHUB_USERNAME, 'Content-Type' => 'application/json', 'Accept' => 'application/json'}
-                               })
-    return story_response.parsed_response unless story_response.parsed_response.nil? || story_response.parsed_response["code"] == "error"
-    {"id" => story_id, "name" => "PR not found in github"}
+    pr = self.get( pulls_url(pr_id), HEADERS ).parsed_response
+    return {"id" => story_id, "name" => "PR not found in github"} if pr.nil? || pr["code"] == "error"
+    pr = extract_blocks pr
   end
 
   def self.get_stories(array_of_pr_ids)
@@ -53,6 +55,19 @@ module Github
     stories
   end
 
+  # used to extract blocks of information from a PR body
+  def self.extract_blocks(pr)
+    body = pr['body']
+    blocks = body.scan(/## ?((?:(?!##).)*)/m)
+    return if blocks.nil?
+
+    pr['blocks'] = []
+    blocks.each do |block|
+      pr['blocks'] << block.first unless block.first.empty?
+    end
+    pr
+  end
+
   # formats the output of stories
   def self.format(stories)
     result_string = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gplan
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: