github_changes 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7eed4d44163ee873a8bd9f54545c684bf198e0f
-  data.tar.gz: 906288c0ad3c375f17600004a0ad4fa03beac063
+  metadata.gz: 4538692d38079992fb83cdd6298a6eb3ec957bf8
+  data.tar.gz: d5c164b8b758c30849ff72f1bce55762f996dbb5
 SHA512:
-  metadata.gz: 4f31590bde945802712fe14e6e6d9034bf2bfac72f0733bf371940f595ca222c437b12cfe9c65aaa97a324077a238cb66c36e2a4b4f7684c858b2ed94d9de7b9
-  data.tar.gz: 3d3d0c25c8b89f3bd800416c1448084af4459c0c1aed78a95b53d2f4376bd33a7563dd70af7e5b8dfb49545e6e65c8a4f2715fdaed8f3174ded879191b1a38f7
+  metadata.gz: 83622b430339bf958ee60d1f1c91e655ec6ce3545ac408f2ee33999492fc047fe5e6ef4dd2870c401faed086993c6ed56e330878b09ef7c635d80a2fcffe8eca
+  data.tar.gz: 19eb80202cbc5805beeb04b1123fb56c97a50a3bd9d5ee094e8a29cfc7ecf6ccfd3db157beff608322025edb0d8900012d84d70c05b2334a4cb543886247774f

data/lib/changelog_generator/cli.rb

@@ -28,8 +28,10 @@ module ChangelogGenerator
     method_option :from_ref, :aliases => "-f", :type => :string, :required => true
     method_option :to_ref, :aliases => "-t", :type => :string, :default => "master"
     method_option :label_filter, :aliases => "-l", :type => :string
+    method_option :include_pr_links, :type => :boolean
+    method_option :include_issue_links, :type => :boolean
     def generate()
-      generator = Generator.new(options[:user], options[:repo], options[:from_ref], options[:to_ref], options[:label_filter])
+      generator = Generator.new(options[:user], options[:repo], options[:from_ref], options[:to_ref], options[:label_filter], options.include_pr_links?, options.include_issue_links?)
       begin
         output = generator.description + "\n\n"
         output << generator.changelog

data/lib/changelog_generator/generator.rb

@@ -10,13 +10,17 @@ module ChangelogGenerator
     attr_accessor :from_ref
     attr_accessor :to_ref
     attr_accessor :label_filter
+    attr_accessor :include_pr_links
+    attr_accessor :include_issue_links
 
-    def initialize(user, repo, from_ref, to_ref, label_filter = nil)
+    def initialize(user, repo, from_ref, to_ref, label_filter = nil, include_pr_links = false, include_issue_links = false)
       self.user = user
       self.repo_name = repo
       self.from_ref = from_ref
       self.to_ref = to_ref || "now"
       self.label_filter = label_filter
+      self.include_pr_links = include_pr_links
+      self.include_issue_links = include_issue_links
     end
 
     def description
@@ -54,15 +58,23 @@ module ChangelogGenerator
         pull.issues = issues.compact
       end
 
-      commits = pulls.map { |p| p.head_sha[0..7] }
+      string = pulls.reduce("") do |memo, pull|
+        memo << "<https://github.com/#{user}/#{repo}/pull/#{pull.number}|#{pull.number}> " if include_pr_links
+        memo << pull.changelog_text
 
-      connected_issue_nums = pulls.map(&:issues).flatten.map(&:number)
+        if include_issue_links
+          pull.issues.each do |issue|
+            memo << " <https://github.com/#{user}/#{repo}/issues/#{issue.number}|#{issue.number}>"
+          end
+        end
 
-      logs = pulls.map { |p| p.changelog_text }
-      logs = logs.reject(&:empty?)
-      
-      string = logs.join("\n") << "\n\n"
+        memo << "\n"
+      end
+
+      string << "\n\n"
 
+      commits = pulls.map { |p| p.head_sha[0..7] }
+      connected_issue_nums = pulls.map(&:issues).flatten.map(&:number)
       show_prs = commits.count <= 20
       show_issues = show_prs && (connected_issue_nums.count > 0)
       show_both = show_prs && show_issues && (commits.count + connected_issue_nums.count <= 20)

data/lib/changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module ChangelogGenerator
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_changes
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Cody Rayment
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor