gergich 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8af2aab61e1b5c93269e3d9e2e6d4fb5dd01201
-  data.tar.gz: 88a33e274c6a36ec65be8e32a05c151ef747f4d1
+  metadata.gz: 9d8fc46682dc58246a154bd7f4d9861c90ae7e75
+  data.tar.gz: 06842c81c83193794006287f4453cc51a32ad126
 SHA512:
-  metadata.gz: dc12a8e5761990be3b1de20fa15dfd9392e83dcdb2c6a72553d859b9e88787550129fe48006674e4f4594f3170fd39037dfa8cb17440860d766634556a0a576f
-  data.tar.gz: 9da9a59b35a715a688d7e9f3e700a011ccfa4ee027b8454c60fb70ef694faa9a80d5834e83458392947f38b26a322e0e7f99805c93e0ae642cdfcfd8261349a8
+  metadata.gz: 96245df392240a42e96f860d2541c8388d86b1a325dbc9193a1f491796de21d1df097e1ef4fe6a185950570a919b6ebe803ee068e6418ee4310cac847ff9580d
+  data.tar.gz: c47545b246cfb3416b4fecec3341d993f3a1bf4622270a2e0ede3b03338deb80765a0e52b51ec3c2119ec1be6d97c662b649d88a0b31966d8b0af9a6cfcef696

data/README.md

@@ -45,6 +45,12 @@ Additionally, Gergich needs to know where your Gerrit installation
 lives, so be sure to set `GERRIT_BASE_URL` (e.g.
 `https://gerrit.example.com`) or `GERRIT_HOST` (e.g. `gerrit.example.com`).
 
+Lastly, if you have no .git directory in CI land (say if you are building
+in docker and want to keep your images small), you also need to set
+`GERRIT_CHANGE_ID` and `GERRIT_PATCHSET_REVISION`. If you use Jenkins and
+the gerrit-trigger plugin, typcially all `GERRIT_*` vars will already be
+set, it's just a matter of plumbing them down to docker.
+
 ## Usage
 
 Run `gergich help` for detailed information about all supported commands.

data/bin/gergich

@@ -2,7 +2,7 @@
 
 if ENV["COVERAGE"]
   require "simplecov"
-  SimpleCov.command_name "cli:#{ARGV.join(' ')}"
+  SimpleCov.command_name "cli:#{ARGV[0, 2].join(':')}:#{rand(1_000_000_000)}"
 end
 
 require_relative "../lib/gergich/cli/gergich"

data/bin/master_bouncer

@@ -3,7 +3,7 @@
 
 if ENV["COVERAGE"]
   require "simplecov"
-  SimpleCov.command_name "master_bouncer:#{ARGV.join(' ')}"
+  SimpleCov.command_name "master_bouncer:#{ARGV[0, 2].join(':')}:#{rand(1_000_000_000)}"
 end
 
 require_relative "../lib/gergich/cli/master_bouncer"

data/bin/run_tests.sh

@@ -39,6 +39,10 @@ run_command bin/gergich citest
 run_command bin/master_bouncer check
 DRY_RUN=1 run_command bin/master_bouncer check_all
 
+# ensure gergich works without .git directories
+rm -rf .git
+run_command bin/gergich status
+
 run_command bin/check_coverage
 
 if [[ $GEMNASIUM_TOKEN && $GEMNASIUM_ENABLED ]]; then

data/lib/gergich.rb

@@ -2,6 +2,7 @@ require "sqlite3"
 require "json"
 require "fileutils"
 require "httparty"
+require "base64"
 
 GERGICH_REVIEW_LABEL = ENV.fetch("GERGICH_REVIEW_LABEL", "Code-Review")
 GERGICH_USER = ENV.fetch("GERGICH_USER", "gergich")
@@ -10,6 +11,12 @@ GERGICH_GIT_PATH = ENV.fetch("GERGICH_GIT_PATH", ".")
 GergichError = Class.new(StandardError)
 
 module Gergich
+  def self.use_git?
+    Dir.chdir(GERGICH_GIT_PATH) do
+      system "git rev-parse --show-toplevel >/dev/null 2>&1"
+    end
+  end
+
   def self.git(args)
     Dir.chdir(GERGICH_GIT_PATH) do
       `git #{args} 2>/dev/null`
@@ -26,14 +33,30 @@ module Gergich
 
     def info
       @info ||= begin
-        output = Gergich.git("log -1 #{ref}")
-        /\Acommit (?<revision_id>[0-9a-f]+).*^\s*Change-Id: (?<change_id>\w+)/m =~ output
+        if Gergich.use_git?
+          output = Gergich.git("log -1 #{ref}")
+          /\Acommit (?<revision_id>[0-9a-f]+).*^\s*Change-Id: (?<change_id>\w+)/m =~ output
+        else
+          revision_id = ENV["GERRIT_PATCHSET_REVISION"] \
+            || raise(GergichError, "No .git directory, and GERRIT_PATCHSET_REVISION not set")
+          change_id = ENV["GERRIT_CHANGE_ID"] \
+            || raise(GergichError, "No .git directory, and GERRIT_CHANGE_ID not set")
+        end
         { revision_id: revision_id, change_id: change_id }
       end
     end
 
     def files
-      @files ||= Gergich.git("diff-tree --no-commit-id --name-only -r #{ref}").split
+      @files ||= begin
+        if Gergich.use_git?
+          Gergich.git("diff-tree --no-commit-id --name-only -r #{ref}").split
+        else
+          raw = API.get("/changes/#{change_id}/revisions/#{revision_id}/patch", { raw: true })
+          Base64.decode64(raw)
+            .scan(%r{^diff --git a/.*? b/(.*?)$})
+            .flatten
+        end
+      end
     end
 
     def revision_id
@@ -100,6 +123,8 @@ module Gergich
 
       puts "ChangeId: #{commit.change_id}"
       puts "Revision: #{commit.revision_id}"
+      puts "Files:"
+      puts "  #{commit.files.join("\n  ")}"
 
       puts
       review_info[:labels].each do |name, score|
@@ -174,27 +199,25 @@ module Gergich
 
   class API
     class << self
-      def get(url)
-        perform(:get, url)
+      def get(url, options = {})
+        perform(:get, url, options)
       end
 
-      def post(url, body)
-        perform(:post, url, body)
+      def post(url, body, options = {})
+        perform(:post, url, options.merge({ body: body }))
       end
 
-      def put(url, body)
-        perform(:put, url, body)
+      def put(url, body, options = {})
+        perform(:put, url, options.merge({ body: body }))
       end
 
       private
 
-      def perform(method, url, body = nil)
-        options = base_options
-        if body
-          options[:headers] = { "Content-Type" => "application/json" }
-          options[:body] = body
-        end
+      def perform(method, url, options)
+        options = prepare_options(options)
         ret = HTTParty.send(method, url, options).body
+        return ret if options[:raw]
+
         if ret.sub!(/\A\)\]\}'\n/, "") && ret =~ /\A("|\[|\{)/
           JSON.parse("[#{ret}]")[0] # array hack so we can parse a string literal
         elsif ret =~ /Not Found: (?<change_id>.*)/
@@ -216,14 +239,19 @@ module Gergich
           raise(GergichError, "need to set GERRIT_BASE_URL or GERRIT_HOST")
       end
 
-      def base_options
-        {
+      def prepare_options(options)
+        options = {
           base_uri: base_uri + "/a",
           digest_auth: {
             username: GERGICH_USER,
             password: ENV.fetch("GERGICH_KEY")
           }
-        }
+        }.merge(options)
+        if options[:body]
+          options[:headers] ||= {}
+          options[:headers]["Content-Type"] ||= "application/json"
+        end
+        options
       end
     end
   end

data/lib/gergich/capture/androidlint_capture.rb

@@ -0,0 +1,40 @@
+module Gergich
+  module Capture
+    class AndroidlintCapture < BaseCapture
+      # See http://tools.android.com/tips/lint-checks
+      SEVERITY_MAP = {
+        "Warning" => "warn",
+        "Error" => "error",
+        "Fatal" => "error"
+      }.freeze
+
+      def run(output)
+        # rubocop:disable Metrics/LineLength
+        #
+        # Example:
+        # /path/to/some.xml:27: Warning: Consider adding android:drawableStart="@drawable/a_media" to better support right-to-left layouts [RtlHardcoded]
+        #     android:drawableLeft="@drawable/ic_cv_media"/>
+        #     ~~~~~~~~~~~~~~~~~~~~
+        #
+        # /path/to/AndroidManifest.xml: Warning: The project references RTL attributes, but does not explicitly enable or disable RTL support with android:supportsRtl in the manifest [RtlEnabled]
+        #
+        # /path/to/library/0.0.2: Error: No .class files were found in project "0.0.2", so none of the classfile based checks could be run. Does the project need to be built first? [LintError]
+        #
+        # /path/to/values.xml:5: Warning: For language "fr" (French) the following quantities are not relevant: few, zero [UnusedQuantity]
+        #    <plurals name="number">
+        #    ^
+        pattern = /
+          ^([^:\n]+):(\d+)?:?\s(\w+):\s(.*?)\n
+          ([^\n]+\n
+           [\s~\^]+\n)?
+        /mx
+
+        output.scan(pattern).map { |file, line, severity, error, context|
+          context = "\n\n" + context if context
+          { path: file, message: "[androidlint] #{error}#{context}".strip,
+            position: (line || 0).to_i, severity: SEVERITY_MAP[severity] }
+        }.compact
+      end
+    end
+  end
+end

data/lib/gergich/capture/swiftlint_capture.rb

@@ -0,0 +1,29 @@
+module Gergich
+  module Capture
+    class SwiftlintCapture < BaseCapture
+      # See SeverityLevelsConfiguration.swift
+      SEVERITY_MAP = {
+        "error" => "error",  # console description
+        "warning" => "warn",
+        "w" => "warn",       # short console description
+        "w/e" => "error"
+      }.freeze
+
+      def run(output)
+        # rubocop:disable Metrics/LineLength
+        #
+        # Example:
+        # /path/to/My.swift:13:22: warning: Colon Violation: Colons should be next to the identifier when specifying a type. (colon)
+        # /path/to/Fail.swift:80: warning: Line Length Violation: Line should be 100 characters or less: currently 108 characters (line_length)
+        pattern = /
+          ^([^:\n]+):(\d+)(?::\d+)?:\s(\w+):\s(.*?)\n
+        /mx
+
+        output.scan(pattern).map { |file, line, severity, error, _context|
+          { path: file, message: "[swiftlint] #{error}",
+            position: line.to_i, severity: SEVERITY_MAP[severity] }
+        }.compact
+      end
+    end
+  end
+end

data/spec/gergich/capture_spec.rb

@@ -1,4 +1,5 @@
 require_relative "../../lib/gergich/capture"
+require_relative "../../lib/gergich"
 
 RSpec.describe Gergich::Capture do
   let!(:draft) { double }
@@ -39,6 +40,87 @@ OUTPUT
     end
   end
 
+  # rubocop:disable Metrics/LineLength
+  context "swiftlint" do
+    it "should catch errors" do
+      colon_violation = "Colon Violation: Colons should be next to the identifier when specifying a type. (colon)"
+      line_length_violation = "Line Length Violation: Line should be 100 characters or less: currently 129 characters (line_length)"
+      force_cast_violation = "Force Cast Violation: Force casts should be avoided. (force_cast)"
+      allow(described_class).to receive(:run_command).and_return([0, <<-OUTPUT])
+/path/to/My.swift:13:22: warning: #{colon_violation}
+/path/to/Fail.swift:76: warning: #{line_length_violation}
+/path/to/Cast.swift:15:9: error: #{force_cast_violation}
+      OUTPUT
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/My.swift",
+        13,
+        "[swiftlint] #{colon_violation}",
+        "warn"
+      )
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/Fail.swift",
+        76,
+        "[swiftlint] #{line_length_violation}",
+        "warn"
+      )
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/Cast.swift",
+        15,
+        "[swiftlint] #{force_cast_violation}",
+        "error"
+      )
+      described_class.run("swiftlint", "false")
+    end
+  end
+
+  context "androidlint" do
+    it "should catch errors" do
+      rtl_hardcoded = 'Consider adding android:drawableStart="@drawable/a_media" to better support right-to-left layouts [RtlHardcoded]'
+      rtl_enabled = "The project references RTL attributes, but does not explicitly enable or disable RTL support with android:supportsRtl in the manifest [RtlEnabled]"
+      lint_error = 'No .class files were found in project "0.0.2", so none of the classfile based checks could be run. Does the project need to be built first? [LintError]'
+      unused_quantity = 'For language "fr" (French) the following quantities are not relevant: few, zero [UnusedQuantity]'
+      allow(described_class).to receive(:run_command).and_return([0, <<-OUTPUT])
+/path/to/some.xml:27: Warning: #{rtl_hardcoded}
+    android:drawableLeft="@drawable/ic_cv_media"/>
+    ~~~~~~~~~~~~~~~~~~~~
+
+/path/to/AndroidManifest.xml: Warning: #{rtl_enabled}
+
+/path/to/library/0.0.2: Error: #{lint_error}
+
+/path/to/values.xml:5: Warning: #{unused_quantity}
+    <plurals name="number">
+    ^
+
+      OUTPUT
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/some.xml",
+        27,
+        "[androidlint] #{rtl_hardcoded}\n\n    android:drawableLeft=\"@drawable/ic_cv_media\"/>\n    ~~~~~~~~~~~~~~~~~~~~",
+        "warn"
+      )
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/AndroidManifest.xml",
+        0,
+        "[androidlint] #{rtl_enabled}",
+        "warn"
+      )
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/library/0.0.2",
+        0,
+        "[androidlint] #{lint_error}",
+        "error"
+      )
+      expect(draft).to receive(:add_comment).with(
+        "/path/to/values.xml",
+        5,
+        "[androidlint] #{unused_quantity}\n\n    <plurals name=\"number\">\n    ^",
+        "warn"
+      )
+      described_class.run("androidlint", "false")
+    end
+  end
+
   context "eslint" do
     it "should catch errors" do
       allow(described_class).to receive(:run_command).and_return([0, <<-OUTPUT])

data/spec/gergich_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Gergich::API do
 
   before :each do
     allow(HTTParty).to receive(:send).and_return(result)
-    allow(described_class).to receive(:base_options).and_return({})
+    allow(described_class).to receive(:prepare_options).and_return({})
   end
 
   it "provides helpful error when Change-Id not found" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gergich
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -55,9 +55,11 @@ files:
 - bin/run_tests.sh
 - lib/gergich.rb
 - lib/gergich/capture.rb
+- lib/gergich/capture/androidlint_capture.rb
 - lib/gergich/capture/eslint_capture.rb
 - lib/gergich/capture/i18nliner_capture.rb
 - lib/gergich/capture/rubocop_capture.rb
+- lib/gergich/capture/swiftlint_capture.rb
 - lib/gergich/cli.rb
 - lib/gergich/cli/gergich.rb
 - lib/gergich/cli/master_bouncer.rb