Pronto integration

Gemfile

@@ -47,15 +47,20 @@ gem 'travis',         '~> 1.7.6'
 
 gem 'awesome_spawn',        '>= 1.4.1'
 gem 'default_value_for'
-gem 'haml_lint',            '~> 0.20.0', :require => false
+gem 'haml_lint',            '~> 0.23.0', :require => false
 gem 'more_core_extensions', '~> 2.0.0',  :require => 'more_core_extensions/all'
 gem 'rubocop',              '~> 0.52.0', :require => false
 gem 'rugged',                            :require => false
 
-gem 'octokit', '~> 4.6.0', :require => false
+gem 'octokit', '~> 4.7.0', :require => false
 gem 'faraday', '~> 0.9.1'
 gem 'faraday-http-cache', '~> 2.0.0'
 
+gem 'pronto', '~> 0.9.5',          :require => false
+gem 'pronto-haml', '~> 0.9.0',     :require => false
+gem 'pronto-rubocop',              :require => false
+gem 'pronto-yamllint',             :require => false
+
 group :development, :test do
   gem 'rspec'
   gem 'rspec-rails'

Gemfile.lock

@@ -125,19 +125,26 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (~> 2.9)
       net-http-pipeline
+    gitlab (4.3.0)
+      httparty
+      terminal-table
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    haml (4.0.7)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    haml_lint (0.20.0)
-      haml (~> 4.0)
+    haml_lint (0.23.2)
+      haml (>= 4.0, < 5.1)
+      rainbow
       rake (>= 10, < 13)
       rubocop (>= 0.47.0)
       sysexits (~> 1.1)
     hashdiff (0.3.6)
     highline (1.7.8)
     hike (1.2.3)
     hitimes (1.2.6)
+    httparty (0.16.0)
+      multi_xml (>= 0.5.2)
     i18n (0.8.6)
     ice_cube (0.14.0)
     ice_nine (0.11.2)
@@ -171,18 +178,34 @@ GEM
     more_core_extensions (2.0.0)
       activesupport (> 3.2)
     multi_json (1.12.2)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
     pg (0.21.0)
     powerpack (0.1.1)
+    pronto (0.9.5)
+      gitlab (~> 4.0, >= 4.0.0)
+      httparty (>= 0.13.7)
+      octokit (~> 4.7, >= 4.7.0)
+      rainbow (~> 2.1)
+      rugged (~> 0.24, >= 0.23.0)
+      thor (~> 0.19.0)
+    pronto-haml (0.9.0)
+      haml_lint (~> 0.23)
+      pronto (~> 0.9.0)
+    pronto-rubocop (0.9.0)
+      pronto (~> 0.9.0)
+      rubocop (~> 0.38, >= 0.35.0)
+    pronto-yamllint (0.1.0)
+      pronto (~> 0.9.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -299,14 +322,16 @@ GEM
       sprockets (>= 2.8, < 4.0)
     sysexits (1.2.0)
     temple (0.8.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.20.0)
+    thor (0.19.4)
     thread_safe (0.3.6)
     tilt (1.4.1)
     timecop (0.9.1)
@@ -368,14 +393,18 @@ DEPENDENCIES
   faraday (~> 0.9.1)
   faraday-http-cache (~> 2.0.0)
   foreman (~> 0.64.0)
-  haml_lint (~> 0.20.0)
+  haml_lint (~> 0.23.0)
   influxdb (~> 0.3.13)
   jquery-rails
   listen
   minigit (~> 0.0.4)
   more_core_extensions (~> 2.0.0)
-  octokit (~> 4.6.0)
+  octokit (~> 4.7.0)
   pg
+  pronto (~> 0.9.5)
+  pronto-haml (~> 0.9.0)
+  pronto-rubocop
+  pronto-yamllint
   rails (~> 4.2.4)
   rspec
   rspec-rails
@@ -396,4 +425,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

app/workers/concerns/code_analysis_mixin.rb

@@ -1,3 +1,15 @@
+require 'pronto/runners'
+require 'pronto/rubocop'
+require 'pronto/yamllint'
+require 'pronto/haml'
+require 'pronto/git/repository'
+require 'pronto/git/patches'
+require 'pronto/git/patch'
+require 'pronto/git/line'
+
+require 'fileutils'
+require 'tmpdir'
+
 module CodeAnalysisMixin
   def merged_linter_results
     results = {
@@ -19,11 +31,64 @@ def merged_linter_results
     results
   end
 
+  # run linters via pronto and return the pronto result
+  def pronto_result
+    p_result = nil
+
+    # temporary solution for: download repo, obtain changes, get pronto result about changes
+    Dir.mktmpdir do |dir|
+      FileUtils.copy_entry(@branch.repo.path.to_s, dir)
+      repo = Pronto::Git::Repository.new(dir)
+      rg = repo.instance_variable_get(:@repo)
+      rg.fetch('origin', @branch.name.sub(/^prs/, 'pull'))
+      rg.checkout('FETCH_HEAD')
+      rg.reset('HEAD', :hard)
+      patches = repo.diff(@branch.merge_target)
+      p_result = Pronto::Runners.new.run(patches)
+    end
+
+    p_result
+  end
+
   def run_all_linters
-    unmerged_results = []
-    unmerged_results << Linter::Rubocop.new(branch).run
-    unmerged_results << Linter::Haml.new(branch).run
-    unmerged_results << Linter::Yaml.new(branch).run
-    unmerged_results.tap(&:compact!)
+    pronto_result.group_by(&:runner).values.map do |linted| # group by linter
+      output = {}
+      if linted.first.runner.name == "Pronto::Rubocop"
+        output["metadata"] = {
+          "rubocop_version" => ::RuboCop::Version.version,
+          "ruby_engine"     => RUBY_ENGINE,
+          "ruby_version"    => RUBY_VERSION,
+          "ruby_patchlevel" => RUBY_PATCHLEVEL.to_s,
+          "ruby_platform"   => RUBY_PLATFORM
+        }
+      end
+
+      output["files"] = linted.group_by(&:path).map do |path, value| # group by file in linter
+        {
+          "path" => path,
+          "offenses" => value.map do |msg| # put offenses of file in linter into an array
+            {
+              "severity"  => msg.level.to_s,
+              "message"   => msg.msg,
+              "cop_name"  => msg.runner,
+              "corrected" => false,
+              "location"  => {
+                "line"   => msg.line.position,
+                "column" => 0, # TODO
+                "length" => 0  # TODO
+              }
+            }
+          end
+        }
+      end
+
+      output["summary"] = {
+        "offense_count"        => output["files"].reduce(0) { |sum, item| sum + item['offenses'].length },
+        "target_file_count"    => output["files"].length,
+        "inspected_file_count" => 0 # TODO
+      }
+
+      output
+    end
   end
 end

spec/workers/concerns/code_analysis_mixin_spec.rb

@@ -1,3 +1,4 @@
+require 'pry'
 describe CodeAnalysisMixin do
   let(:example_rubocop_result) { {"metadata"=>{"rubocop_version"=>"0.47.1", "ruby_engine"=>"ruby", "ruby_version"=>"2.3.3", "ruby_patchlevel"=>"222", "ruby_platform"=>"x86_64-linux"}, "files"=>[{"path"=>"app/helpers/application_helper/button/mixins/discovery_mixin.rb", "offenses"=>[]}, {"path"=>"app/helpers/application_helper/button/button_new_discover.rb", "offenses"=>[{"severity"=>"warning", "message"=>"Method `ApplicationHelper::Button::ButtonNewDiscover#visible?` is defined at both /tmp/d20171201-9050-1m4n90/app/helpers/application_helper/button/button_new_discover.rb:5 and /tmp/d20171201-9050-1m4n90/app/helpers/application_helper/button/button_new_discover.rb:9.", "cop_name"=>"Lint/DuplicateMethods", "corrected"=>nil, "location"=>{"line"=>9, "column"=>3, "length"=>3}}]}], "summary"=>{"offense_count"=>1, "target_file_count"=>2, "inspected_file_count"=>2}} }
   let(:test_class) do
@@ -8,34 +9,37 @@
   end
   subject { test_class.new }
 
-  context "#merged_linter_results" do
+  describe "#merged_linter_results" do
     it "should always return a hash with a 'files' and 'summary' key, even with no cops running" do
-      expect(Linter::Rubocop).to receive(:new).and_return(double(:run => nil))
-      expect(Linter::Haml).to receive(:new).and_return(double(:run => nil))
-      expect(Linter::Yaml).to receive(:new).and_return(double(:run => nil))
-
+      allow(subject).to receive(:pronto_result).and_return([])
       expect(subject.merged_linter_results).to eq("files"=>[], "summary"=>{"inspected_file_count"=>0, "offense_count"=>0, "target_file_count"=>0})
     end
+  end
 
-    it "merges together with one result" do
-      expect(Linter::Rubocop).to receive(:new).and_return(double(:run => example_rubocop_result))
-      expect(Linter::Haml).to receive(:new).and_return(double(:run => nil))
-      expect(Linter::Yaml).to receive(:new).and_return(double(:run => nil))
-
-      expect(subject.merged_linter_results).to eq(
-        "files" => example_rubocop_result["files"],
-        "summary" => {"inspected_file_count"=>2, "offense_count"=>1, "target_file_count"=>2}
-      )
+=begin
+  describe "#run_all_linters" do
+    let(:item_rubocop) { dup }
+    let(:item_haml) { dup }
+    let(:item_yaml) { dup }
+    before do
+      allow(subject).to receive(:pronto_result).and_return(input)
+      allow(item_rubocop).to receive(:runner).and_return("Pronto::Rubocop")
+      allow(item_haml).to receive(:runner).and_return("haml")
+      allow(item_yaml).to receive(:runner).and_return("yaml")
     end
 
-    it "merges together with one result" do
-      expect(Linter::Rubocop).to receive(:new).and_return(double(:run => example_rubocop_result))
-      expect(Linter::Haml).to receive(:new).and_return(double(:run => example_rubocop_result))
-      expect(Linter::Yaml).to receive(:new).and_return(double(:run => nil))
-
-      results = subject.merged_linter_results
-      expect(results["files"]).to include(*example_rubocop_result["files"])
-      expect(results["summary"]).to eq("inspected_file_count"=>4, "offense_count"=>2, "target_file_count"=>4)
+    context "input is array of items" do
+      let(:input) { [item_rubocop,item_rubocop,item_haml,item_haml,item_yaml,item_yaml] }
+      it "returns empty array" do
+        expect(subject.run_all_linters).to eq(
+          {
+            "Pronto::Rubocop"=>[item_rubocop,item_rubocop],
+            "haml"=>[item_haml,item_haml],
+            "yaml"=>[item_yaml,item_yaml]
+          }
+        )
+      end
     end
   end
+=end
 end