committer-tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1affe04dad34132bc8fced2cb164ced45c2fb0b6
-  data.tar.gz: 8851d93082f8e38ba7768688bd643973fecefdea
+  metadata.gz: 4f27491ec9dd9013f8a904670616d75b24104ed0
+  data.tar.gz: 0abe91d59fad9d7bf04198a39a89bdaa9ad612b7
 SHA512:
-  metadata.gz: 19aac12185440f7b6e37b3dfad50b5e00ee25857edef54aa51e3570f3d723571bf471c88c8cfe43347aece26ae30350a102436851c324df3037cf80bc12784f2
-  data.tar.gz: fabb7fe46b238a98ea169a9255036dcd45a252e740f34950f779034c98544579ee651f052340349db6bc41dc60e03a8feb94688d1a4b71d7573ebfddfac994d9
+  metadata.gz: a2d65c2d115afcb9b730523dee35d2b5abc2683c06efa9499097b12a4f2bf519392cd58623117e7531b838085c7d8217a64a3d41271c69b9cc43b1ae523dd94d
+  data.tar.gz: 8c19598e5de009b554f6cf655e76954e85f4a8c1a6cf58155f61292cde40827cf8187d0027ba7152d0ca07df8c254845a32849942c729f0580590923854ab743

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'minitest'
 gem 'pry'
 gem 'rake'
 gem 'rb-readline'

data/Gemfile.lock

@@ -10,6 +10,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    minitest (5.10.3)
     netrc (0.11.0)
     pry (0.11.2)
       coderay (~> 1.1.0)
@@ -28,6 +29,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest
   pry
   rake
   rb-readline

data/Rakefile

@@ -1,3 +1,11 @@
 require 'rubygems'
 require 'bundler'
 require 'bundler/gem_tasks'
+
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end

data/committer-tools.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'committer-tools'
-  spec.version       = '0.1.1'
+  spec.version       = '0.1.2'
   spec.authors       = 'Jon Moss'
   spec.email         = 'me@jonathanmoss.me'
 

data/lib/committer-tools.rb

@@ -1,8 +1,19 @@
 require 'json'
 require 'rest-client'
 
+class HTTPHelper
+  def self.get(url)
+    RestClient.get(url, { params: { access_token: ENV['GH_TOKEN'] } }).body
+  end
+
+  def self.get_json(url)
+    JSON.parse(get(url))
+  end
+end
+
 class Lander
-  def run(pr, metadata)
+  def run(pr, github_pr, metadata)
+    check_to_land(github_pr, metadata)
     introduce_commit(pr, metadata)
 
     puts "[\u{2714}] Commit(s) applied locally. Please update to your liking, and then type 'continue'."
@@ -27,6 +38,24 @@ class Lander
     `git commit --amend -m '#{msg}'`
   end
 
+  def check_to_land(github_pr, metadata)
+    # At least 48 hours of review time
+    if Time.parse(github_pr['created_at']) > (Date.today - 2).to_time
+      puts "[✘] PR must remain open for at least 48 hours"
+    end
+
+    # At least two approvals
+    if (metadata[:reviewers].length < 2)
+      puts "[✘] PR must have at least two reviewers"
+    end
+
+    # No failing CI builds
+    failing_statuses = metadata[:ci_statuses].select { |job| job[:status] == 'failure' }
+    if (failing_statuses.length > 0)
+      puts "[✘] Failing builds on #{failing_statuses.map { |s| s[:name] }.join(', ')}"
+    end
+  end
+
   def introduce_commit(pr, metadata)
     # Clear current status
     `git am --abort`
@@ -47,125 +76,91 @@ class Lander
   end
 end
 
-class Preparer
-  class MetadataCollector
-    NODE_README_URL = 'https://raw.githubusercontent.com/nodejs/node/master/README.md'
-    REVIEWER_REGEX = /\* \[(.+?)\]\(.+?\) -\s\*\*(.+?)\*\* &lt;(.+?)&gt;/m
-
-    def initialize(github_pr)
-      @github_pr = github_pr
-    end
+class MetadataCollector
+  NODE_README_URL = 'https://raw.githubusercontent.com/nodejs/node/master/README.md'
+  REVIEWER_REGEX = /\* \[(.+?)\]\(.+?\) -\s\*\*(.+?)\*\* &lt;(.+?)&gt;/m
 
-    def collect
-      {
-        pr_url: collect_pr_url,
-        reviewers: collect_reviewers,
-        ci_statuses: collect_ci_statuses
-      }
-    end
+  def collect(github_pr)
+    {
+      pr_url: collect_pr_url(github_pr),
+      reviewers: collect_reviewers(github_pr),
+      ci_statuses: collect_ci_statuses(github_pr)
+    }
+  end
 
-    private
+  private
 
-    def collect_ci_statuses
-      JSON.parse(
-        RestClient.get(
-          @github_pr['statuses_url'],
-          { params: { access_token: ENV['GH_TOKEN'] } }
-        )
-      ).map do |status|
-        { name: status['context'], status: status['state'] }
-      end
+  def collect_ci_statuses(github_pr)
+    HTTPHelper.get_json(github_pr['statuses_url']).map do |status|
+      { name: status['context'], status: status['state'] }
     end
+  end
 
-    def collect_pr_url
-      "PR-URL: #{@github_pr['html_url']}"
-    end
+  def collect_pr_url(github_pr)
+    "PR-URL: #{github_pr['html_url']}"
+  end
 
-    def collect_reviewers
-      # Collect a list of all possible reviewers
-      possible_reviewers = {}
-      readme = RestClient.get(NODE_README_URL, { params: { access_token: ENV['GH_TOKEN'] } }).body
-
-      # GitHub being stupid...
-      # Treat every two lines as one...
-      readme.split("\n").each_slice(2).to_a.each do |a, b|
-        if (m = REVIEWER_REGEX.match("#{a} #{b}"))
-          possible_reviewers[m[1]] = {
-            name: m[2],
-            email: m[3]
-          }
-        end
+  def collect_reviewers(github_pr)
+    # Collect a list of all possible reviewers
+    possible_reviewers = {}
+    readme = HTTPHelper.get(NODE_README_URL)
+
+    # GitHub being stupid...
+    # Treat every two lines as one...
+    readme.split("\n").each_slice(2).to_a.each do |a, b|
+      if (m = REVIEWER_REGEX.match("#{a} #{b}"))
+        possible_reviewers[m[1]] = {
+          name: m[2],
+          email: m[3]
+        }
       end
+    end
 
-      # Use this list to identify reviewers for the current PR!
-      reviewer_usernames = JSON.parse(RestClient.get("#{@github_pr['url']}/reviews", { params: { access_token: ENV['GH_TOKEN'] } })).map do |review|
-        next unless review['state'] == 'APPROVED'
-        review['user']['login']
-      end.compact.uniq
+    # Use this list to identify reviewers for the current PR!
+    reviewer_usernames = HTTPHelper.get_json("#{github_pr['url']}/reviews").map do |review|
+      next unless review['state'] == 'APPROVED'
+      review['user']['login']
+    end.compact.uniq
 
-      reviewer_usernames.map do |reviewer_username|
-        user = possible_reviewers[reviewer_username]
+    reviewer_usernames.map do |reviewer_username|
+      user = possible_reviewers[reviewer_username]
 
-        "Reviewed-By: #{user[:name]} <#{user[:email]}>"
-      end
+      "Reviewed-By: #{user[:name]} <#{user[:email]}>"
     end
   end
+end
 
-  def initialize
-    @pr = {}
-    @github_pr = {}
-    @metadata = {}
-  end
-
+class Preparer
   def run
-    @pr = get_pr()
-    @github_pr = get_github_pr(@pr)
-    @metadata = get_metadata(@github_pr)
-    check_to_land(@github_pr, @metadata)
+    pr = get_pr()
+    github_pr = get_github_pr(pr)
+    metadata = get_metadata(github_pr)
 
-    Lander.new.run(@pr, @metadata)
+    Lander.new.run(pr, github_pr, metadata)
   end
 
   private
 
-  def check_to_land(github_pr, metadata)
-    # At least 48 hours of review time
-    if Time.parse(github_pr['created_at']) > (Date.today - 2).to_time
-      puts "[✘] PR must remain open for at least 48 hours"
-    end
-
-    # At least two approvals
-    if (metadata[:reviewers].length < 2)
-      puts "[✘] PR must have at least two reviewers"
-    end
-
-    # No failing CI builds
-    failing_statuses = metadata[:ci_statuses].select { |job| job[:status] == 'failure' }
-    if (failing_statuses.length > 0)
-      puts "[✘] Failing builds on #{failing_statuses.map { |s| s[:name] }.join(', ')}"
-    end
-  end
-
   def get_github_pr(pr)
-    JSON.parse(
-      RestClient.get(
-        "https://api.github.com/repos/#{pr[:org]}/#{pr[:repo]}/pulls/#{pr[:id]}",
-        { params: { access_token: ENV['GH_TOKEN'] } }
-      )
+    HTTPHelper.get_json(
+      "https://api.github.com/repos/#{pr[:org]}/#{pr[:repo]}/pulls/#{pr[:id]}"
     )
   end
 
   def get_metadata(github_pr)
-    MetadataCollector.new(github_pr).collect
+    MetadataCollector.new.collect(github_pr)
   end
 
   def get_pr
     puts "Please enter PR ID:"
     pr_id = gets.strip!
 
-    org, repo_and_id = pr_id.split('/')
-    repo, id = repo_and_id.split('#')
-
-    { org: org, repo: repo, id: id }
+    begin
+      org, repo_and_id = pr_id.split('/')
+      repo, id = repo_and_id.split('#')
+      { org: org, repo: repo, id: id }
+    rescue
+      raise "Invalid PR ID: #{pr_id}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: committer-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jon Moss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client