github_changes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e338d415d8597cc4d26affc9f90edee506b5a8
-  data.tar.gz: f161536c7da8b87c25d208ed3f313b7bf6100f35
+  metadata.gz: 271f7ac2411a473f933f57f6abd6e15bc7a1915a
+  data.tar.gz: 8c9d02ba79d7903207688464906477dcb7c9e193
 SHA512:
-  metadata.gz: 12ad2188c031f14f1b028d12d02702d0adee8c714d4646240d9bc539ef7eeb89394adff81bfbf7f350d43d8515b5713a61a6e504c4640168501f8ae4f46176e2
-  data.tar.gz: 218d4597fde0c6c4d62ac0c351ff69f188593f9985cce98dc732ddabd9fd96ae5bfc4744fff13fdecd32ee902d60fb6755811cd0221ed107a36aa70f987121bb
+  metadata.gz: 3e13751f86e772d8dc7c7a3dc072cea73817f68445d2b4cf4515da0f6175c88281b2f2546de920f179c0afcba528a3a1bad782224baa31df5ef93174d41c73d0
+  data.tar.gz: 587767b2d9f9be65232b0ba416706ab0196b40f2b6a55540e236b8f2bb890c61a7188d6e9a7989d78be1363eafe55725f51a06fff58475bae788c35287aad461

data/lib/changelog_generator/cli.rb

@@ -3,6 +3,10 @@ $thor_runner = false
 
 module ChangelogGenerator
   class CLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
     desc "hello NAME", "This will greet you"
     long_desc <<-EOS
     `hello NAME` will print out a message to the person of your choosing.
@@ -26,12 +30,15 @@ module ChangelogGenerator
     method_option :label_filter, :aliases => "-l", :type => :string
     def generate()
       generator = Generator.new(options[:user], options[:repo], options[:from_ref], options[:to_ref], options[:label_filter])
-      puts generator.description
       begin
-        puts generator.changelog
+        output = generator.description + "\n\n"
+        output << generator.changelog
+        puts output
       rescue Exception => e
+        puts e.message
         STDERR.puts "#{e}"
         STDERR.puts e.backtrace
+        throw e
       end
     end
   end

data/lib/changelog_generator/generator.rb

@@ -20,9 +20,9 @@ module ChangelogGenerator
     end
 
     def description
-      description = "Changes for #{user}/#{repo_name} from #{from_ref} to #{to_ref}"
+      description = "Changes for `#{user}/#{repo_name}` from `#{from_ref}` to `#{to_ref}`"
       if label_filter
-        description << " with label '#{label_filter}'"
+        description << " with label `#{label_filter}`"
       end
       description
     end
@@ -37,13 +37,13 @@ module ChangelogGenerator
       start_date, end_date = *date_range_for_references(start_ref, end_ref)
       # puts "Start: #{start_ref}, End: #{end_ref}"
       unless start_date && end_date
-        return "Failed to acquire date range from references"
+        abort "Failed to acquire date range from references"
       end
       pulls = pull_requests_for_date_range(start_date, end_date)
       pull_nums = pulls.map { |p| p['number'] }
 
       if pull_nums.empty?
-        return "No PRs found matching criteria"
+        abort "No PRs found matching criteria"
       else
         # puts "  PRs: #{pull_nums}"
         # puts
@@ -61,7 +61,7 @@ module ChangelogGenerator
       end
 
       if pull_nums.empty?
-        return "No PRs found matching criteria"
+        abort "No PRs found matching criteria"
       end
 
       pulls = pull_nums.map { |p| github.pull_requests.get(user, repo, p) }
@@ -83,20 +83,17 @@ module ChangelogGenerator
       logs = pulls.map { |p| p.changelog_text }
       logs = logs.reject(&:empty?)
       
-      string = "```\n"
-      string << logs.join("\n")
-      string << "\n```"
-      string << "\n\n"
+      string = logs.join("\n") << "\n\n"
 
-      # string << "<https://github.com/#{user}/#{repo}/pulls?q=is%3Apr+#{commits.join("+")}|PRs> | "
-      # string << "<https://github.com/#{user}/#{repo}/issues?q=is%3Aissue+#{connected_issue_nums.join("+")}|Issues> | "
-      # string << "<https://github.com/#{user}/#{repo}/issues?q=#{commits.join("+")}+#{connected_issue_nums.join("+")}|Both>"
+      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)
 
-      string << "PRs: https://github.com/#{user}/#{repo}/pulls?q=is%3Apr+#{commits.join("+")}\n"
-      string << "Issues: https://github.com/#{user}/#{repo}/issues?q=is%3Aissue+#{connected_issue_nums.join("+")}\n"
-      string << "Both: https://github.com/#{user}/#{repo}/issues?q=#{commits.join("+")}+#{connected_issue_nums.join("+")}\n"
+      string << "<https://github.com/#{user}/#{repo}/pulls?q=is%3Apr+#{commits.join("+")}|PRs>" if show_prs
+      string << " | <https://github.com/#{user}/#{repo}/issues?q=is%3Aissue+#{connected_issue_nums.join("+")}|Issues>" if show_issues
+      string << " | <https://github.com/#{user}/#{repo}/issues?q=#{commits.join("+")}+#{connected_issue_nums.join("+")}|Both>" if show_both
 
-      string << "\n"
+      string
     end
 
     def github

data/lib/changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module ChangelogGenerator
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

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