gergich 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb586bf1a73532571ecb8cf4b34679a8f1f3e71
-  data.tar.gz: 02530fba1d33d28ca675a7c63273949f9ee88030
+  metadata.gz: 0f0688286ddfbfdcc686368378288bfb25914eb4
+  data.tar.gz: 3343039cccc137106652aed7061be6ecd6096995
 SHA512:
-  metadata.gz: 8b8371b9cc0109757c2e83fe9e9bdf89cbc20730352fd72b761002258cce61501bdb81d56f2707d266cdfcf465b3e148653ea9f12cbe68c80f3cc072c3f3ef13
-  data.tar.gz: 51b2ed7c6a62ddfaa72062dfb039f8b2d5f21a23647c6d68557b1380e255bbe050836302c37dde74f57aa572ec58a9a8cf912f0a7f0e8e91dcc7e8fa9f9577de
+  metadata.gz: 10294cd73ad93b2e289aa7f68b5bc08bed49fb3b6aaa30d6912ad1b61fd0e7f2dc550a335e0487da9149582a29bbb14754f9e7e28d21f4ec5fe88e0d86a6e308
+  data.tar.gz: 29b71a28a0ca12b710cbd00bb232fa9100d516d16c4d0a8883783c0476016beb8cb04c7d8e5784e7881edcae5ca32e7a90b202ea9b15f0066c56a4643b797882

data/README.md

@@ -1,5 +1,9 @@
 # Gergich
 
+[![Gem Version](https://badge.fury.io/rb/gergich.svg)](https://rubygems.org/gems/gergich)
+[![Dependency Status](https://gemnasium.com/badges/a2946a7849cd94f5ec0f4c3173a968f4.svg)](https://gemnasium.com/cc6fb44edee9fcf855cec82d3b6aed0f)
+[![Build Status](https://travis-ci.org/instructure/gergich.svg?branch=master)](https://travis-ci.org/instructure/gergich)
+
 Gergich is a command-line tool (and ruby lib) for easily posting comments
 on a [Gerrit](https://www.gerritcodereview.com/) review from a CI
 environment. It can be wired up to linters (rubocop, eslint, etc.) so that

data/bin/master_bouncer

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 # encoding=utf-8
 
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.command_name "master_bouncer:#{ARGV.join(' ')}"
+end
+
 require_relative "../lib/gergich/cli/master_bouncer"

data/bin/run_tests.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+set -e
+
+function run_command {
+  echo -e "\n[$@] STARTING $(date)"
+  last_status=0
+  "$@" || last_status=$?
+  if [[ $last_status == 0 ]]; then
+    echo -e "[$@] \033[32mOK\033[0m"
+  else
+    echo -e "[$@] \033[31mFAILED!\033[0m"
+  fi
+  echo -e "[$@] FINISHED $(date)\n"
+
+  [[ $last_status == 0 ]] || clean_up_and_exit
+}
+
+function clean_up_and_exit {
+  end_timestamp=$(date +%s)
+  duration=$((end_timestamp-start_timestamp))
+
+  if [[ $last_status != 0 ]]; then
+    echo -e "\033[31mBUILD FAILED\033[0m in $duration seconds\n"
+  else
+    echo "BUILD PASSED in $duration seconds"
+  fi
+  exit $last_status
+}
+
+start_timestamp=$(date +%s)
+
+run_command bundle exec rubocop
+
+export COVERAGE=1
+
+run_command bundle exec rspec
+run_command bin/gergich citest
+run_command bin/master_bouncer check
+DRY_RUN=1 run_command bin/master_bouncer check_all
+
+run_command bin/check_coverage
+
+if [[ $GEMNASIUM_TOKEN && $GEMNASIUM_ENABLED ]]; then
+  # Push our dependency specification files to gemnasium for analysis
+  run_command gemnasium dependency_files push -f=gergich.gemspec
+fi
+
+clean_up_and_exit

data/lib/gergich.rb

@@ -73,13 +73,17 @@ module Gergich
       API.post(generate_url, generate_payload)
 
       # because why not
-      if rand < 0.01 && GERGICH_USER == "gergich"
+      if change_name?
         API.put("/accounts/self/name", { name: whats_his_face }.to_json)
       end
 
       review_info
     end
 
+    def change_name?
+      ENV["GERGICH_CHANGE_NAME"] != "0" && rand < 0.01 && GERGICH_USER == "gergich"
+    end
+
     def anything_to_publish?
       !review_info[:comments].empty? ||
         !review_info[:cover_message].empty? ||
@@ -202,7 +206,7 @@ module Gergich
         @base_url ||= \
           ENV["GERRIT_BASE_URL"] ||
           ENV.key?("GERRIT_HOST") && "https://#{ENV['GERRIT_HOST']}" ||
-          raise("need to set GERRIT_BASE_URL or GERRIT_HOST")
+          raise(GergichError, "need to set GERRIT_BASE_URL or GERRIT_HOST")
       end
 
       def base_options
@@ -281,8 +285,8 @@ module Gergich
     # a higher score set here.
     def add_label(name, score)
       score = score.to_i
-      raise "invalid score" if score < -2 || score > 1
-      raise "can't set #{name}" if %w[Verified].include?(name)
+      raise GergichError, "invalid score" if score < -2 || score > 1
+      raise GergichError, "can't set #{name}" if %w[Verified].include?(name)
 
       db.execute "INSERT INTO labels (name, score) VALUES (?, ?)",
                  [name, score]
@@ -311,10 +315,10 @@ module Gergich
     #            severe comment will be used to determine the overall
     #            Code-Review score (0, -1, or -2 respectively)
     def add_comment(path, position, message, severity)
-      raise "invalid position `#{position}`" unless valid_position?(position)
+      raise GergichError, "invalid position `#{position}`" unless valid_position?(position)
       position = position.to_json if position.is_a?(Hash)
-      raise "invalid severity `#{severity}`" unless SEVERITY_MAP.key?(severity)
-      raise "no message specified" unless message.is_a?(String) && !message.empty?
+      raise GergichError, "invalid severity `#{severity}`" unless SEVERITY_MAP.key?(severity)
+      raise GergichError, "no message specified" unless message.is_a?(String) && !message.empty?
 
       db.execute "INSERT INTO comments (path, position, message, severity) VALUES (?, ?, ?, ?)",
                  [path, position, message, severity]

data/lib/gergich/capture.rb

@@ -49,7 +49,7 @@ module Gergich
       def wiretap(io)
         output = ""
         io.each do |line|
-          puts line
+          $stdout.puts line
           output << line
         end
         output

data/lib/gergich/capture/eslint_capture.rb

@@ -1,17 +1,20 @@
 module Gergich
   module Capture
     class EslintCapture < BaseCapture
+      SEVERITY_MAP = { "error" => "error", "warning" => "warn" }.freeze
+
       def run(output)
         # e.g. "  4:21  error  Missing semicolon  semi"
-        error_pattern = /\s\s+(\d+):\d+\s+\w+\s+(.*?)\s+[\w-]+\n/
+        error_pattern = /\s\s+(\d+):\d+\s+(\w+)\s+(.*?)\s+[\w-]+\n/
         pattern = %r{            # Example:
           ^([^\n]+)\n            #   jsapp/models/user.js
           ((#{error_pattern})+)  #     4:21  error  Missing semicolon  semi
         }mx
 
         output.scan(pattern).map { |file, errors|
-          errors.scan(error_pattern).map { |line, error|
-            { path: file, message: "[eslint] #{error}", position: line.to_i, severity: "error" }
+          errors.scan(error_pattern).map { |line, severity, error|
+            severity = SEVERITY_MAP[severity]
+            { path: file, message: "[eslint] #{error}", position: line.to_i, severity: severity }
           }
         }.compact.flatten
       end

data/lib/gergich/cli/gergich.rb

@@ -22,6 +22,7 @@ OUTPUT
 }.freeze
 
 def run_ci_test!(all_commands)
+  ENV["GERGICH_CHANGE_NAME"] = "0"
   commands_to_test = all_commands - %w[citest reset publish status]
   commands_to_test << "status" # put it at the end, so we maximize the stuff it tests
 

data/lib/gergich/cli/master_bouncer.rb

@@ -66,7 +66,7 @@ commands = {}
 
 commands["check"] = {
   summary: "Check the current commit's age",
-  action: ->(_args) {
+  action: ->() {
     maybe_bounce_commit! Gergich::Commit.new
   },
   help: ->() {
@@ -81,17 +81,21 @@ TEXT
 
 commands["check_all"] = {
   summary: "Check the age of all potentially mergeable changes",
-  action: ->(_args) {
+  action: ->() {
     Gergich.git("fetch")
+    gerrit_host = ENV["GERRIT_HOST"] || error("No GERRIT_HOST set")
 
-    potentially_mergeable_changes.each do |change|
-      print "Checking g/#{change['_number']}... "
+    changes = potentially_mergeable_changes
+    next if ENV["DRY_RUN"]
 
+    changes.each do |change|
       sha = change["current_revision"]
       revinfo = change["revisions"][sha]
       refspec = revinfo["ref"]
       number = revinfo["_number"]
-      Gergich.git("fetch ssh://gerrit.instructure.com:29418/#{PROJECT} #{refspec}")
+
+      print "Checking g/#{change['_number']}... "
+      Gergich.git("fetch ssh://#{gerrit_host}:29418/#{PROJECT} #{refspec}")
 
       maybe_bounce_commit! Gergich::Commit.new(sha, number)
       sleep 1

data/spec/gergich/capture_spec.rb

@@ -5,6 +5,11 @@ RSpec.describe Gergich::Capture do
 
   before do
     allow(Gergich::Draft).to receive(:new).and_return(draft)
+    $stdout = StringIO.new
+  end
+
+  after do
+    $stdout = STDOUT
   end
 
   context "rubocop" do
@@ -28,7 +33,8 @@ OUTPUT
     it "should catch errors" do
       allow(described_class).to receive(:run_command).and_return([0, <<-OUTPUT])
 jsapp/models/user.js
-  4:21  error  Missing semicolon  semi
+  4:21  error    Missing semicolon  semi
+  5:1   warning  Too much cowbell   cowbell-overload
 OUTPUT
       expect(draft).to receive(:add_comment).with(
         "jsapp/models/user.js",
@@ -36,6 +42,13 @@ OUTPUT
         "[eslint] Missing semicolon",
         "error"
       )
+
+      expect(draft).to receive(:add_comment).with(
+        "jsapp/models/user.js",
+        5,
+        "[eslint] Too much cowbell",
+        "warn"
+      )
       described_class.run("eslint", "false")
     end
   end
@@ -56,4 +69,61 @@ OUTPUT
       described_class.run("i18nliner", "false")
     end
   end
+
+  context "custom" do
+    class CustomCaptor
+      def run(output)
+        puts output
+        output.scan(/^(.+?):(\d+): (.*)$/).map do |file, line, error|
+          { path: file, message: error, position: line.to_i, severity: "error" }
+        end
+      end
+    end
+
+    it "should catch errors" do
+      allow(described_class).to receive(:run_command).and_return([0, <<-OUTPUT])
+foo.rb:1: you done screwed up
+OUTPUT
+      expect(draft).to receive(:add_comment).with(
+        "foo.rb",
+        1,
+        "you done screwed up",
+        "error"
+      )
+      described_class.run("custom:sqlite3:CustomCaptor", "false")
+    end
+  end
+
+  context "stdin" do
+    let :output do
+      <<-OUTPUT
+jsapp/models/user.js
+  4:21  error  Missing semicolon  semi
+OUTPUT
+    end
+
+    before do
+      $stdin = StringIO.new(output)
+    end
+
+    after do
+      $stdin = STDIN
+    end
+
+    it "should catch errors" do
+      expect(draft).to receive(:add_comment).with(
+        "jsapp/models/user.js",
+        4,
+        "[eslint] Missing semicolon",
+        "error"
+      )
+      described_class.run("eslint", "-")
+    end
+
+    it "shouldn't eat stdin" do
+      allow(draft).to receive(:add_comment)
+      expect($stdout).to receive(:puts).exactly(output.lines.size).times
+      described_class.run("eslint", "-")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gergich
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -52,6 +52,7 @@ files:
 - bin/check_coverage
 - bin/gergich
 - bin/master_bouncer
+- bin/run_tests.sh
 - lib/gergich.rb
 - lib/gergich/capture.rb
 - lib/gergich/capture/eslint_capture.rb