codeclimate 0.59.0 → 0.59.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd44d5947202badd787f474113ea06889904a15d
-  data.tar.gz: 6bcddcf1f0171efa25c510762547b5e11b43edeb
+  metadata.gz: 47373962a6c4b9694dd53ff15e5763eea2c4bf3e
+  data.tar.gz: 78c315602436913d641dbc942394dd73a6e03fe9
 SHA512:
-  metadata.gz: 6c69fb0758d388309a3a52ab9f196b1fac1cf352100990287f6ad6446d60fb87e7f565edb4b3111052484d5369771a223339272c1d99681759196e2319f98cae
-  data.tar.gz: fb560f47a7979b9d28680ea88be6fd3a6aba55fe42ccecc1d9fb96cd9250a5c86a4f0402013ba4673b33748d21c814eb2a528a5b290139bfca8ebd15fd9ed508
+  metadata.gz: 4659c57c484a151e32740689d8d6e4fa4ff1cb18ce63f7c928445461a5a6950554b4f85b24cdf88b320627ccbe5e44cbbd1d0833fbc362fa50f17754c4ff1428
+  data.tar.gz: 3533af922af47f089a30f0cc4116af36973da0b1a3b099170443a33034264cd3dceab07c86503c22d65d582d034bddb4d3aa7660d33db733af361b59e43b38f2

data/config/engines.yml

@@ -69,7 +69,6 @@ complexity-ruby:
     beta: codeclimate/codeclimate-complexity-ruby:b47
   description: Code Climate Complexity Checks for Ruby
   community: false
-  code_climate_check: true
   default_ratings_paths:
     - "**.rb"
   default_config:

data/lib/cc/analyzer/engines_config_builder.rb

@@ -12,10 +12,7 @@ module CC
         # handling.
         def fetch(name, channel)
           metadata = self[name]
-          metadata.merge(
-            "image" => metadata["channels"][channel.to_s],
-            "code_climate_check" => metadata.fetch("code_climate_check", false),
-          )
+          metadata.merge("image" => metadata["channels"][channel.to_s])
         end
       end
 

data/lib/cc/cli.rb

@@ -13,6 +13,7 @@ require "cc/cli/help"
 require "cc/cli/init"
 require "cc/cli/output"
 require "cc/cli/prepare"
+require "cc/cli/prepare/quality"
 require "cc/cli/runner"
 require "cc/cli/test"
 require "cc/cli/validate_config"

data/lib/cc/cli/config_generator.rb

@@ -37,14 +37,6 @@ module CC
         end
       end
 
-      def codeclimate_checks
-        @codeclimate_checks ||= engine_registry.list.each_with_object({}) do |(name, config), result|
-          if code_climate_check?(config)
-            result[name] = config
-          end
-        end
-      end
-
       def errors
         []
       end
@@ -74,10 +66,6 @@ module CC
           files_exist?(engine)
       end
 
-      def code_climate_check?(engine)
-        engine["code_climate_check"] && ENV["RUN_CODECLIMATE_CHECKS"] == "true"
-      end
-
       def files_exist?(engine)
         workspace_files.any? do |path|
           engine["enable_regexps"].any? { |re| Regexp.new(re).match(path) }

data/lib/cc/cli/init.rb

@@ -19,11 +19,9 @@ module CC
           create_default_engine_configs if engines_enabled?
         elsif upgrade? && engines_enabled?
           warn "Config file .codeclimate.yml already configured for the Platform.\nTry running 'validate-config' to check configuration."
-          create_codeclimate_checks
           create_default_engine_configs
         else
           generate_all_config
-          create_codeclimate_checks
         end
       end
 
@@ -58,20 +56,6 @@ module CC
         filesystem.write_path(CODECLIMATE_YAML, config.to_yaml)
       end
 
-      def create_codeclimate_checks
-        if ENV["RUN_CODECLIMATE_CHECKS"] == "true"
-          say "Generating codeclimate checks..."
-          plain_config_hash = JSON.parse(CC::Yaml::Serializer::Json.serialize(existing_cc_config))
-          config = CC::CLI::Config.new(plain_config_hash)
-
-          config_generator.codeclimate_checks.each do |(engine_name, engine_config)|
-            config.add_engine(engine_name, engine_config)
-          end
-
-          filesystem.write_path(CODECLIMATE_YAML, config.to_yaml)
-        end
-      end
-
       def create_default_engine_configs
         say "Generating default configuration for engines..."
         available_engine_configs.each do |(engine_name, config_paths)|

data/lib/cc/cli/prepare/quality.rb

@@ -0,0 +1,64 @@
+require "safe_yaml/load"
+
+module CC
+  module CLI
+    class Prepare
+      class Quality < Command
+        ENGINES_CONFIG = {
+          "complexity-ruby" => {
+            "enabled" => true,
+            "channel" => "beta",
+          },
+          "duplication" => {
+            "enabled" => true,
+            "channel" => "cronopio",
+            "config" => {
+              "languages" => [
+                "ruby",
+              ],
+            },
+          },
+        }.freeze
+
+        def execute
+          Dir.chdir(CC::Analyzer::MountedPath.code.container_path) do
+            content =
+              if (existing_contents = read_codeclimate_yml)
+                modify(existing_contents)
+              else
+                { "engines" => ENGINES_CONFIG }
+              end
+
+            write_codeclimate_yml(content)
+          end
+        end
+
+        private
+
+        def modify(content)
+          content.delete("ratings")
+          content["engines"] ||= {}
+          content["engines"].merge!(ENGINES_CONFIG)
+          content
+        end
+
+        def read_codeclimate_yml
+          SafeYAML.load_file(CODECLIMATE_YAML)
+        rescue Errno::ENOENT
+          CLI.debug("No .codeclimate.yml present")
+        rescue => ex
+          message = "Error reading existing #{CODECLIMATE_YAML}, overwriting."
+          $stderr.puts(colorize("WARNING: #{message}", :yellow))
+          CLI.debug("error: #{ex.class} - #{ex.message}")
+        end
+
+        def write_codeclimate_yml(content)
+          yaml = YAML.dump(content)
+          CLI.debug("Writing .codeclimate.yml")
+          CLI.debug(yaml)
+          File.write(CODECLIMATE_YAML, yaml)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.59.1
 platform: ruby
 authors:
 - Code Climate
@@ -160,6 +160,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Code Climate command line tool
 email: hello@codeclimate.com
 executables:
@@ -241,6 +255,7 @@ files:
 - lib/cc/cli/init.rb
 - lib/cc/cli/output.rb
 - lib/cc/cli/prepare.rb
+- lib/cc/cli/prepare/quality.rb
 - lib/cc/cli/runner.rb
 - lib/cc/cli/test.rb
 - lib/cc/cli/upgrade_config_generator.rb