github_changes 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6efe100e42e7b22b1a822f0c6ec5101d7302a12
-  data.tar.gz: e884307d5dd06f4c5e6b4a8d55504b15093f709a
+  metadata.gz: c7eed4d44163ee873a8bd9f54545c684bf198e0f
+  data.tar.gz: 906288c0ad3c375f17600004a0ad4fa03beac063
 SHA512:
-  metadata.gz: 80b94dc8517386aae094f0f22e1f0400ac48d0b90b1a7091bac2ad98e045eb479accadb8460700cb96254703b823618170d834676c823d0970f672e1e3691abb
-  data.tar.gz: ef99918ed9f5e454780aaedc0bcb5d81809df2cde327257546967ac8265f033bf9674a4c89c7d99664920885979ba5f388d2fd92f92a1e9846985e8144da37b5
+  metadata.gz: 4f31590bde945802712fe14e6e6d9034bf2bfac72f0733bf371940f595ca222c437b12cfe9c65aaa97a324077a238cb66c36e2a4b4f7684c858b2ed94d9de7b9
+  data.tar.gz: 3d3d0c25c8b89f3bd800416c1448084af4459c0c1aed78a95b53d2f4376bd33a7563dd70af7e5b8dfb49545e6e65c8a4f2715fdaed8f3174ded879191b1a38f7

data/lib/changelog_generator/generator.rb

@@ -15,7 +15,7 @@ module ChangelogGenerator
       self.user = user
       self.repo_name = repo
       self.from_ref = from_ref
-      self.to_ref = to_ref || "master"
+      self.to_ref = to_ref || "now"
       self.label_filter = label_filter
     end
 
@@ -33,92 +33,20 @@ module ChangelogGenerator
 
     private
 
-    def run(cmd)
-      # puts "Running: #{cmd}"
-      `#{cmd}`
-    end
-
-    def clone_or_fetch_repo(user, repo, path)
-      output = nil
-
-      if Dir.exist? path
-        output = run "cd #{path} && git fetch"
-      else
-        output = run "git clone --bare \"https://#{ENV['GITHUB_TOKEN']}@github.com/#{user}/#{repo}.git\" \"#{path}\""
-      end
-
-      unless $?.exitstatus == 0
+    def generate_changelog(user, repo, start_ref, end_ref, label_filter = nil)
+      unless check_github_response() { github.repos.get(user, repo) }
         abort "Unable to access repo `#{user}/#{repo}`. Please ensure correct spelling. If this repo is private you must ensure to configure me with a suitable GitHub oath token."
       end
 
-      output
-    end
-
-    def is_ref?(ref)
-      return false unless ref !~ /^\s*$/
-      run "git show \"#{ref}\""
-      $?.exitstatus == 0
-    end
-
-    def ref_before(date_string)
-      output = run("git rev-list -1 --all --before=\"#{date_string}\"").chomp
-      $?.exitstatus == 0 ? output : nil
-    end
-
-    def ref_after(date_string)
-      output = run("git rev-list --all --after=\"#{date_string}\" | tail -1").chomp
-      $?.exitstatus == 0 ? output : nil
-    end
-
-    def find_ref(string)
-      return string if is_ref? string
-      string = yield(string)
-      is_ref?(string) ? string : nil
-    end
-
-    def find_shas_or_abort(start_ref, end_ref)
-      start_sha = find_ref(start_ref) { |s| ref_after(s) }
-      end_sha = find_ref(end_ref) { |s| ref_before(s) }
-
-      unless start_sha
-        abort "Unable to parse `#{start_ref}` as a reference or date. Please specify a git tag, branch, or SHA. You can also specify a date like `last week` or `5 days ago`"
-      end
-      unless end_sha
-        abort "Unable to parse `#{end_ref}` as a reference or date. Please specify a git tag, branch, or SHA. You can also specify a date like `last week` or `5 days ago` or `January 1, 1999`"
-      end
-
-      return start_sha, end_sha
-    end
-
-    def pull_request_numbers(start_sha, end_sha)
-      log_command = "git log #{start_sha}..#{end_sha}"
-      log = `#{log_command} --grep "Merge pull" --reverse | grep "Merge pull request #"`
-      pull_nums = log.split("\n").map { |p| p.match(/.*#(\d+) .*/)[1].to_i }
-    end
-
-    def filter_prs_by_label(github, user, repo, pull_nums, label_filter)
-      pull_nums.select do |n|
-        issue = github.issues.get user, repo, n
-        label_names = issue.labels.map { |l| l.name }
-        label_names.include?(label_filter)
-      end
-    end
-
-    def generate_changelog(user, repo, start_ref, end_ref, label_filter = nil)
-      path = "clones/#{user}/#{repo}.git"
-
-      clone_or_fetch_repo(user, repo, path)
-      FileUtils.cd(path) # Below methods assuming we are in git repo
-      start_sha, end_sha = find_shas_or_abort(start_ref, end_ref)
-      pull_nums = pull_request_numbers(start_sha, end_sha)
-      pull_nums = filter_prs_by_label(github, user, repo, pull_nums, label_filter) if label_filter
+      start_sha, start_time, end_sha = parse_references(start_ref, end_ref)
+      pull_nums = pull_request_numbers(start_sha, start_time, end_sha)
+      pull_nums = filter_prs_by_label(pull_nums)
       abort "No PRs found matching criteria" if pull_nums.empty?
 
       pulls = pull_nums.map { |p| github.pull_requests.get(user, repo, p) }
       pulls = pulls.map { |p| PullRequest.from_github_pr(p) }
       # puts JSON.pretty_generate(pulls.first.body.to_hash)
 
-      # puts "Finding connected issues:"
       pulls.each do |pull|
         issue_nums = connected_issues_from_pr(pull)
         github_issues = issue_nums.map { |n| github.issues.get(user, repo, n) }
@@ -163,6 +91,87 @@ module ChangelogGenerator
       value
     end
 
+    def run(cmd)
+      # puts "Running: #{cmd}"
+      `#{cmd}`
+    end
+
+    def find_ref_for_string(string)
+      ref = check_github_response() { github.git_data.references.get user, repo_name, URI::encode("heads/#{string}") }
+      ref ||= check_github_response() { github.git_data.references.get user, repo_name, URI::encode("tags/#{string}") }
+      return ref
+    end
+
+    def find_commit_sha_for_ref_string(string)
+      ref = find_ref_for_string string
+      return nil unless ref && ref.object && ref.object.type && ref.object.sha
+
+      case ref.object.type
+      when "commit"
+        ref.object.sha
+      when "tag"
+        tag = check_github_response() { github.git_data.tags.get user, repo_name, URI::encode(ref.object.sha) }
+        tag ? tag.object.sha : nil
+      end
+    end
+
+    def find_commit_sha_for_string(string)
+      return nil unless string && string.strip.length > 0
+
+      # Search references first becomes branches/tags seem more likely than commit SHA
+      sha = find_commit_sha_for_ref_string string
+      return sha if sha
+
+      # Maybe it is a commit SHA?
+      commit = check_github_response() { github.repos.commits.get user, repo_name, URI::encode(string) }
+      return commit.sha if commit 
+    end
+
+    def parse_string_as_time(string)
+      Chronic.parse(string)
+    end
+
+    def commit_before(date)
+      response = check_github_response() { github.repos.commits.list user, repo_name, until: date.iso8601, :per_page => 1 }
+      return nil unless response
+      return response.first.sha
+    end
+
+    def end_sha(end_string)
+      ref = find_commit_sha_for_string(end_string)
+      return ref if ref
+
+      time = parse_string_as_time(end_string)
+      return nil unless time
+
+      commit_before(time)
+    end
+
+    def parse_references(start_ref, end_ref)
+      end_sha = end_sha(end_ref)
+      # We can start on a SHA or Time
+      start_sha = find_commit_sha_for_string(start_ref)
+      start_time = parse_string_as_time(start_ref)
+
+      unless start_sha || start_time
+        abort "Unable to parse `#{start_ref}` as a reference or date. Please specify a git tag, branch, or SHA. You can also specify a date like `last week` or `5 days ago`"
+      end
+      unless end_sha
+        abort "Unable to parse `#{end_ref}` as a reference or date. Please specify a git tag, branch, or SHA. You can also specify a date like `last week` or `5 days ago` or `January 1, 1999`"
+      end
+
+      return start_sha, start_time, end_sha
+    end
+
+    def filter_prs_by_label(pull_nums)
+      return pull_nums unless label_filter && label_filter.strip.length > 0
+      pull_nums.select do |n|
+        issue = github.issues.get user, repo_name, n
+        label_names = issue.labels.map { |l| l.name }
+        label_names.include?(label_filter)
+      end
+    end
+
     def changelog_from_pr(pr)
       default = "- #{pr['title']}"
 
@@ -175,11 +184,66 @@ module ChangelogGenerator
       matcher['changes'].strip
     end
 
+    def pull_num_from_commit(commit)
+      message = commit.commit.message
+      match = message.match(/merge pull request #(\d+)/i)
+      return nil unless match
+      match[1]
+    end
+
     def connected_issues_from_pr(pr)
       body = pr.body
       return [] unless body
 
       body.scan(/((connect|connects|fix|fixes|address|addresses):?\s*(to)?:?\s*#(?<number>\d+))/im).reject(&:nil?).map(&:last).flatten
     end
+
+     # Page through all commits in the range collecting PR numbers
+     def pull_request_numbers(start_sha, start_time, end_sha)
+      pull_nums = []
+
+      if start_sha
+        # First we do a compare
+        response = check_github_response() { github.repos.commits.compare user, repo_name, start_sha, end_sha }
+        abort "Unable to compare from #{from_ref} to #{to_ref}. Tried `#{start_sha}..#{end_sha}`" unless response
+        if response
+          commits = response.commits
+          if response.total_commits < 250 # This API won't return more than 250 - we have to go pagination mode below for that
+            return commits.reduce([]) do |memo, commit|
+              pull_num = pull_num_from_commit(commit)
+              memo << pull_num if pull_num
+              memo
+            end
+          end
+        end
+      end
+
+      response = check_github_response() { github.repos.commits.list user, repo_name, sha: end_sha, :per_page => 100 }
+      abort "Something went wrong fetching commit information" unless response
+      pull_nums = []
+      loop do
+        done = false
+        commits = response.body
+        commits.each do |commit|
+          if (!start_sha && start_time) && start_time > Chronic.parse(commit.commit.committer.date)
+            done = true
+            break
+          end
+
+          pull_num = pull_num_from_commit(commit)
+          pull_nums << pull_num if pull_num
+
+          if start_sha && commit.sha == start_sha
+            done = true
+            break
+          end
+        end
+        break if done
+        break unless response.has_next_page?
+        response = response.next_page
+      end
+
+      pull_nums
+    end
   end
 end

data/lib/changelog_generator/version.rb

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

metadata

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