Merge pull request #4 from codeclimate/gd-config

Read config from json file

Author: gdiggs

bin/codeclimate-rubocop

@@ -3,4 +3,10 @@ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'cc/engine/rubocop'
 
-CC::Engine::Rubocop.new("/code", ENV["ENGINE_CONFIG"], STDOUT).run
+if File.exists?("/config.json")
+  engine_config = JSON.parse(File.read("/config.json"))
+else
+  engine_config = {}
+end
+
+CC::Engine::Rubocop.new("/code", engine_config, STDOUT).run

lib/cc/engine/rubocop.rb

@@ -6,9 +6,9 @@
 module CC
   module Engine
     class Rubocop
-      def initialize(code, config, io)
+      def initialize(code, engine_config, io)
         @code = code
-        @config = config
+        @engine_config = engine_config || {}
         @io = io
       end
 
@@ -36,23 +36,15 @@ def category(cop_name)
         CategoryParser.new(cop_name).category
       end
 
-      def engine_config
-        if @config
-          @engine_config ||= JSON.parse(@config)
-        else
-          {}
-        end
-      end
-
       def exclude?(local_path)
-        exclusions = engine_config["exclude_paths"] || []
+        exclusions = @engine_config["exclude_paths"] || []
         exclusions.include?(local_path)
       end
 
       def rubocop_config_store
         @rubocop_config_store ||= begin
           config_store = RuboCop::ConfigStore.new
-          if (config_file = engine_config["config"])
+          if (config_file = @engine_config["config"])
             config_store.options_config = config_file
           end
           config_store

spec/cc/engine/rubocop_spec.rb

@@ -26,7 +26,7 @@ def method
           def method
             unused = "x" and "y"
 
-            return false  
+            return false
           end
         EORUBY
 
@@ -35,7 +35,7 @@ def method
           "Lint/UselessAssignment:\n  Enabled: false\n"
         )
 
-        config = { config: "rubocop.yml" }.to_json
+        config = { "config" => "rubocop.yml" }
         output = run_engine(config)
 
         assert includes_check?(output, "Style/AndOr")
@@ -70,7 +70,7 @@ def method
           "rubocop.yml",
           "AllCops:\n  Exclude:\n    - \"my_script\"\n"
         )
-        config = { config: "rubocop.yml" }.to_json
+        config = { "config" => "rubocop.yml" }
         output = run_engine(config)
         assert !includes_check?(output, "Lint/UselessAssignment")
       end
@@ -85,7 +85,7 @@ def method
             return false
           end
         EORUBY
-        config = {exclude_paths: ['my_script']}.to_json
+        config = { "exclude_paths" => ["my_script"] }
         output = run_engine(config)
         assert !includes_check?(output, "Lint/UselessAssignment")
       end
@@ -107,14 +107,14 @@ def method
           "rubocop.yml",
           "AllCops:\n  Exclude:\n    - \"foo.rb\"\n"
         )
-        config = {config: 'rubocop.yml', exclude_paths: ['bar.rb']}.to_json
+        config = { "config" => "rubocop.yml", "exclude_paths" => ["bar.rb"] }
         output = run_engine(config)
         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, ''),
+          location: RuboCop::Cop::Lint::Syntax::PseudoSourceRange.new(1, 0, ""),
           cop_name: "fake",
           message: "message"
         )])
@@ -151,9 +151,9 @@ def create_source_file(path, content)
         File.write(File.join(@code, path), content)
       end
 
-      def run_engine(config_json = nil)
+      def run_engine(config = nil)
         io = StringIO.new
-        rubocop = Rubocop.new(@code, config_json, io)
+        rubocop = Rubocop.new(@code, config, io)
         rubocop.run
 
         io.string