github_changes 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f3629bd64337c85dc3643aa3108fe8be5029e9
-  data.tar.gz: 1fd0c2e78cb38ef694586c24e8c445ed7da7857e
+  metadata.gz: 94912ce0c80830df446d4c1f4f208cd95fbce796
+  data.tar.gz: f042745d4af0080470e14265c2054c3e1838817c
 SHA512:
-  metadata.gz: ec7c4a1ee1b2b3165c97cde0bdf26792a527e8052b438f0f8504b7673373662ea463f094f597ad983326d52b36a031f2d08119956f15e2bfcba634c94f6c6818
-  data.tar.gz: bb4dfcbb8802ae9670329659dfb3a5d458b3d8f54b502137e59d80226f3b605b06c1a05a151c04aa7b5409f89bacd19b10daa78bfe8186071894fc0cf4114d44
+  metadata.gz: 52f0250a50a59ae3ddf098e08627bf1b124b09fb00807011588b7279e2ddd295d648d6f0f0832d5c64b6563403db6e53b338be25bc11582822e6a9043c1d03e2
+  data.tar.gz: 1e5fe29d5ea2b09e16673fe20d64fa5e0ed8a9f045b4da89f7e2b1f37a26a5126b425e821cacc26090dd78ff170fcdce1509842515ba408875f1572589ba3dd3

data/lib/changelog_generator/generator.rb

@@ -28,47 +28,91 @@ module ChangelogGenerator
     end
 
     def changelog
-      generate_changelog(user, repo_name, from_ref, to_ref, label_filter, nil)
+      generate_changelog(user, repo_name, from_ref, to_ref, label_filter)
     end
 
     private
 
-    def generate_changelog(user, repo, start_ref, end_ref, label_filter = nil, exclude_sha = nil, changelog)
-      unless check_github_response() { github.pull_requests.list(user, repo) }
+    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
         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
-      start_date, end_date = *date_range_for_references(start_ref, end_ref)
-      # puts "Start: #{start_ref}, End: #{end_ref}"
-      unless start_date
+
+      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_date
+      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
-      pulls = pull_requests_for_date_range(start_date, end_date)
-      pull_nums = pulls.map { |p| p['number'] }
 
-      if pull_nums.empty?
-        abort "No PRs found matching criteria"
-      else
-        # puts "  PRs: #{pull_nums}"
-        # puts
-      end
+      return start_sha, end_sha
+    end
 
-      if label_filter && !label_filter.empty?
-        # puts "Filtering PRs on label #{label_filter}:"
-        pull_nums = 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
-        # puts "  PRs: #{pull_nums}"
-        # puts
-      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
 
-      if pull_nums.empty?
-        abort "No PRs found matching criteria"
+    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 = Dir.tmpdir + "/#{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
+      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) }
@@ -137,80 +181,5 @@ module ChangelogGenerator
 
       body.scan(/((connect|connects|fix|fixes|address|addresses):?\s*(to)?:?\s*#(?<number>\d+))/im).reject(&:nil?).map(&:last).flatten
     end
-
-    def date_from_commit(commit)
-      return nil unless commit
-      date = commit["committer"]["date"]
-      date = Chronic.parse(date)
-    end
-
-    def find_commit_for_reference(ref)
-      return nil unless ref && ref["object"] && ref["object"]["sha"]
-      sha = ref["object"]["sha"]
-      commit = check_github_response() { github.git_data.commits.get user, repo_name, URI::encode(sha) }
-      unless commit
-        tag = check_github_response() { github.git_data.tags.get user, repo_name, URI::encode(sha) }
-        sha = (tag && tag.object) ? tag.object.sha : nil
-        commit = check_github_response() { github.git_data.commits.get user, repo_name, URI::encode(sha) } if sha
-      end
-      commit
-    end
-
-    def find_reference_for_string(ref)
-      reference = check_github_response() { github.git_data.references.get user, repo_name, URI::encode("heads/#{ref}") }
-      reference ||= check_github_response() { github.git_data.references.get user, repo_name, URI::encode("tags/#{ref}") }
-      reference
-    end
-
-    def find_commit_for_string(string)
-      reference = find_reference_for_string(string)
-      return find_commit_for_reference(reference) if reference
-      check_github_response() { github.git_data.commits.get user, repo_name, URI::encode(string) }
-    end
-
-    def date_range_for_references(ref_one, ref_two)
-      return [date_for_string(ref_one), date_for_string(ref_two)]
-    end
-
-    def date_for_string(string)
-      date_from_commit(find_commit_for_string(string)) || parse_string_as_date(string)
-    end
-
-    def parse_string_as_date(string)
-      Chronic.parse(string)
-    end
-
-    # Page through all pulls grabbing only those merged in date range
-    def pull_requests_for_date_range(start_date, end_date)
-      page = 1
-      pulls = []
-
-      # There is a chance that the commit is created slightly earlier than the PR is merged.
-      # Example: merged_at: 2015-11-25T17:31:24+00:00, commit_date: 2015-11-25T17:31:23+00:00
-      end_date += 5
-      start_date += 5
-
-      loop do
-        response_wrapper = check_github_response() { github.pull_requests.list user, repo_name, state: 'closed', sort: 'updated', direction: 'desc', base: 'master', page: page }
-        found_pulls = response_wrapper.to_a
-        found_pulls.select! { |p| p['merged_at'] }
-        break if found_pulls.count == 0
-        stop = false
-        found_pulls.each do |pull|
-          date = Chronic.parse(pull['merged_at'])
-          # puts "PR: #{pull.number} Date: #{date}, Start Date: #{start_date}, End Date: #{end_date}"
-          next if date > end_date
-          if date <= start_date
-            stop = true
-            break
-          end
-          pulls << pull
-        end
-        break if stop
-        page += 1
-      end    
-
-      pulls
-    end
   end
 end

data/lib/changelog_generator/version.rb

@@ -1,3 +1,3 @@
 module ChangelogGenerator
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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