gplan 0.0.8 → 0.0.9

data/bin/gplan

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 #
 # This script is used to find all of the planbox story numbers from the git log
-# For lesson-player it is dependent on lesson-player being in the directory name for the repo
 
+# This is just a neat way to require everything in the lib path
 require 'pathname'
 bin_path = Pathname.new(__FILE__).realpath
 $:.unshift File.expand_path('../../lib', bin_path)
-require 'planbox'
-require 'github'
+Dir[bin_path + '../../lib/*.rb'].each {|file| require file }
+
+include Printer
 
 PB_STORY_REGEX=/\[(?:fixes)? *#*([0-9]*)\]/i
 GH_PR_REGEX=/Merge pull request #(\d*)/i
@@ -62,38 +63,6 @@ def pull_dependency(story)
   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
-
 def setup_repository
   if ARGV[0]  # allow you to pass in a SHA or remote/branch to target against. This can be useful when generating release notes after a deployment
     @target = ARGV[0]
@@ -124,9 +93,9 @@ 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
+@gh_release_array = Github.new.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
+Printer.print @combined

data/lib/github.rb

@@ -1,62 +1,65 @@
 require 'httparty'
+require 'pry'
 
 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
+class Github
 
-  @repo_name
-  @app_name
-
-  def self.check_environment
+  def check_environment
     if GITHUB_USERNAME == nil || GITHUB_TOKEN == nil
       raise "environment variables not set. Please check that you have the following set...\
       \nGITHUB_USERNAME\nGITHUB_TOKEN"
     end
   end
 
-  def self.set_repo_info
+  def get_repo_name
     cmd = "git remote -v |grep origin"
     repo_info = `#{cmd}`
-    @repo_name = repo_info.scan(/\:(.*)\//).uniq.flatten.first
-    @app_name = repo_info.scan(/\/(.*)\.git/).uniq.flatten.first
+    repo_info.scan(/\:(.*\/.*)\.git/).uniq.flatten.first
   end
 
-  def self.get_release_notes gh_pr_ids
+  def get_release_notes gh_pr_ids
     stories = get_release_notes_array gh_pr_ids
     result_string = format stories
   end
 
-  def self.get_release_notes_array gh_pr_ids
+  def get_release_notes_array gh_pr_ids
     check_environment
-    set_repo_info
-    get_stories gh_pr_ids
+    repo_name = get_repo_name
+    get_stories repo_name, gh_pr_ids
   end
 
-  def self.pulls_url(pr_id)
-    "#{GITHUB_BASE_URL}/repos/#{@repo_name}/#{@app_name}/issues/#{pr_id}?access_token=#{GITHUB_TOKEN}"
+  def pulls_url(repo_name, pr_id)
+    "#{GITHUB_BASE_URL}/repos/#{repo_name}/issues/#{pr_id}?access_token=#{GITHUB_TOKEN}"
   end
 
-  def self.get_story(pr_id)
-    pr = self.get( pulls_url(pr_id), HEADERS ).parsed_response
+  def get_story(repo_name, pr_id = false)
+    # if story url like "user/repo_name#123"
+    unless pr_id
+      story = repo_name.split '#'
+      repo_name = story[0]
+      pr_id = story[1]
+    end
+    pr = HTTParty.get( pulls_url(repo_name, pr_id), HEADERS ).parsed_response
     return {"id" => story_id, "name" => "PR not found in github"} if pr.nil? || pr["code"] == "error"
+    pr = extract_linked_issues pr
     pr = extract_blocks pr
   end
 
-  def self.get_stories(array_of_pr_ids)
+  def get_stories(repo_name, array_of_pr_ids)
     stories = []
     return [] unless array_of_pr_ids
     array_of_pr_ids.each do |id|
-      stories<< get_story(id)
+      stories<< get_story(repo_name, id)
     end
     stories
   end
 
   # used to extract blocks of information from a PR body
-  def self.extract_blocks(pr)
+  def extract_blocks(pr)
     body = pr['body']
     blocks = body.scan(/## ?((?:(?!##).)*)/m)
     return if blocks.nil?
@@ -68,8 +71,22 @@ module Github
     pr
   end
 
+  # used to extract linked issues from the description follow githubs linking issue linking matchers
+  def extract_linked_issues(pr)
+    body = pr['body']
+    regex = /(close|close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)(\s)+((\w*\/\w*)?#(\d+))/im
+    linked_issues = body.scan(regex)
+    return if linked_issues.nil?
+
+    pr['linked_issues'] = []
+    linked_issues.each do |linked_issue|
+      pr['linked_issues'] << get_story(linked_issue[2]) unless linked_issue[2].nil?
+    end
+    pr
+  end
+
   # formats the output of stories
-  def self.format(stories)
+  def format(stories)
     result_string = ""
     stories.each do |story|
       result_string += "#{story['number']}:"

data/lib/printer.rb

@@ -0,0 +1,62 @@
+module Printer
+  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
+
+      dependency = pull_dependency(story)
+      dependencies << dependency unless dependency.nil?
+
+      line = ""
+      line += planbox_info story unless end_of_pbs
+      line += github_pr_info story unless story['number'].nil?
+
+      release_notes += line + "\n"
+    end
+
+    # print dependency blocks
+    unless dependencies.empty?
+      release_notes += include_dependencies dependencies
+    end
+
+    puts release_notes
+  end
+
+  def planbox_info story
+    "#{story['id']}:#{story['status']}:#{story['name']}:#{story['project_name']}:#{story['project_alias']}"
+  end
+
+  def github_pr_info story
+    line = ":#{story['number']}:#{story['title']}"
+    line += github_issue_info story if story['linked_issues']
+    line
+  end
+
+  def github_issue_info story
+    line = ""
+    story['linked_issues'].each do |issue|
+      line += ":ISSUE##{issue['number']}"
+      line +=":Milestone #{issue['milestone']['title']}" if issue['milestone']['title']
+    end
+    line
+  end
+
+  def include_dependencies dependencies
+      release_notes = title "Dependencies"
+      dependencies.each do |dependency|
+        release_notes += dependency
+        release_notes += "\n"
+      end
+      release_notes
+  end
+
+  def title text
+    "\n---- #{text} ----\n\n"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gplan
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -37,7 +37,8 @@ files:
 - bin/gplan
 - lib/github.rb
 - lib/planbox.rb
-homepage: https://github.com/jkoenig311/gplan
+- lib/printer.rb
+homepage: https://github.com/el-jefe-/gplan
 licenses: []
 post_install_message: 
 rdoc_options: []