Merge pull request #3 from codeclimate/gd-location

Handle alternate location class

Author: gdiggs

Gemfile

@@ -4,6 +4,7 @@ gem "rubocop", require: false
 gem "pry", require: false
 
 group :test do
+  gem "mocha"
   gem "rake"
   gem "minitest"
   gem "minitest-reporters"

Gemfile.lock

@@ -7,13 +7,16 @@ GEM
       parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
     coderay (1.1.0)
+    metaclass (0.0.4)
     method_source (0.8.2)
     minitest (5.6.0)
     minitest-reporters (1.0.11)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
     parser (2.2.2.5)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
@@ -38,6 +41,7 @@ PLATFORMS
 DEPENDENCIES
   minitest
   minitest-reporters
+  mocha
   pry
   rake
   rubocop

circle.yml

@@ -10,15 +10,16 @@ dependencies:
     - echo $gcloud_json_key_base64 | sed 's/ //g' | base64 -d > /tmp/gcloud_key.json
     - curl https://sdk.cloud.google.com | bash
     - gcloud auth activate-service-account $gcloud_account_email --key-file /tmp/gcloud_key.json
+    - gcloud docker -a
 
 test:
   override:
     - bundle exec rake
+    - docker build -t=$registry_root/$image_name:b$CIRCLE_BUILD_NUM .
 
 deployment:
   registry:
     branch: master
     commands:
-      - gcloud preview docker -a
-      - docker build -t=$registry_root/$image_name:b$CIRCLE_BUILD_NUM .
       - docker push $registry_root/$image_name:b$CIRCLE_BUILD_NUM
+

lib/cc/engine/rubocop.rb

@@ -64,6 +64,31 @@ def rubocop_team_for_path(path)
         RuboCop::Cop::Team.new(RuboCop::Cop::Cop.all, rubocop_config)
       end
 
+      def violation_positions(location)
+        if location.is_a?(RuboCop::Cop::Lint::Syntax::PseudoSourceRange)
+          first_line = location.line
+          last_line = location.line
+          first_column = location.column
+          last_column = location.column
+        else
+          first_line = location.first_line
+          last_line = location.last_line
+          first_column = location.column
+          last_column = location.last_column
+        end
+
+        {
+          begin:  {
+            column: first_column + 1, # columns are 0-based in Parser
+            line: first_line,
+          },
+          end: {
+            column: last_column + 1,
+            line: last_line,
+          }
+        }
+      end
+
       def violation_json(violation, local_path)
         {
           type: "Issue",
@@ -73,16 +98,7 @@ def violation_json(violation, local_path)
           remediation_points: 50_000,
           location: {
             path: local_path,
-            positions: {
-              begin:  {
-                column: violation.location.column + 1, # columns are 0-based in Parser
-                line: violation.location.first_line,
-              },
-              end: {
-                column: violation.location.last_column + 1,
-                line: violation.location.last_line,
-              }
-            },
+            positions: violation_positions(violation.location),
           },
         }.to_json
       end

spec/cc/engine/rubocop_spec.rb

@@ -112,6 +112,35 @@ def method
         assert !includes_check?(output, "Lint/UselessAssignment")
       end
 
+      it "handles different locations properly" do
+        RuboCop::Cop::Team.any_instance.expects(:inspect_file).returns([OpenStruct.new(
+          location: RuboCop::Cop::Lint::Syntax::PseudoSourceRange.new(1, 0, ''),
+          cop_name: "fake",
+          message: "message"
+        )])
+        create_source_file("my_script.rb", <<-EORUBY)
+          #!/usr/bin/env ruby
+
+          def method
+            unused = "x"
+
+            return false
+          end
+        EORUBY
+        output = run_engine
+        json = output.split("\u0000")
+
+        result = JSON.parse(json.first)
+        location = {
+          "path" => "my_script.rb",
+          "positions" => {
+            "begin" => { "column"=>1, "line"=>1 },
+            "end" => { "column"=>1, "line"=>1 }
+          }
+        }
+        assert_equal location, result["location"]
+      end
+
       def includes_check?(output, cop_name)
         issues = output.split("\0").map { |x| JSON.parse(x) }
 

spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'minitest/spec'
 require 'minitest/autorun'
 require "minitest/reporters"
+require "mocha/mini_test"
 Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new