codeclimate 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d81ae107229801a3f5752e7ef948a3b0b56db80d
-  data.tar.gz: 789f4ed9e51c32f62be863c5403bf8ef09b325b7
+  metadata.gz: dacbb140292d61911f693eddf47566cca79a8971
+  data.tar.gz: e3a2d03b2f9114d6e68a199461492ed5e1bcf380
 SHA512:
-  metadata.gz: bf48b0890ed9325ac0ab5d73c5c8b3642f6b7b39bb90d5f576d0e0f367d6cdc20d29a567f21bbad394e97070b676164f1c18f0477b095950b5fa0c857e0e195d
-  data.tar.gz: dfbf3f35fbbbae9f4bc7d6fa84cfa011b4b94d85e4ffeaed171dd901c8df12257d05b57c2a7ca91f2a008e85d0a0e3ef8ca9b5c515d7aa267d040efb69471ed7
+  metadata.gz: 22f87e0b1980085a4b5a7db3471aa73bad2b7db36f88216ea33f79e15eeb32d33db8a743ed916213cf68bcd235955806a0be34a197033a5d8de7ee580ed91474
+  data.tar.gz: b1605896bb70d332f30da3c503ec0d57977ce7dd0d5565133368dc3596067c92833288a75f24c142957476c049550244170a50f0206484aa75f00b8b7e369012

data/lib/cc/analyzer.rb

@@ -5,6 +5,7 @@ module CC
     autoload :Container, "cc/analyzer/container"
     autoload :ContainerListener, "cc/analyzer/container_listener"
     autoload :Engine, "cc/analyzer/engine"
+    autoload :Engines, "cc/analyzer/engines"
     autoload :EngineOutputFilter, "cc/analyzer/engine_output_filter"
     autoload :EngineRegistry, "cc/analyzer/engine_registry"
     autoload :EnginesRunner, "cc/analyzer/engines_runner"

data/lib/cc/analyzer/engines.rb

@@ -0,0 +1,73 @@
+require "securerandom"
+
+module CC
+  module Analyzer
+    class Engines < Array
+      def initialize(registry:, config:, container_label:, source_dir:, requested_paths:)
+        super()
+        @registry = registry
+        @config = config
+        @container_label = container_label
+        @requested_paths = requested_paths
+        @source_dir = source_dir
+        names_and_raw_engine_configs.each do |name, raw_engine_config|
+          self << build_engine(name, raw_engine_config)
+        end
+      end
+
+      private
+
+      def build_engine(name, raw_engine_config)
+        label = @container_label || SecureRandom.uuid
+        engine_config = engine_config(raw_engine_config)
+        Engine.new(
+          name, @registry[name], @source_dir, engine_config, label
+        )
+      end
+
+      def engine_config(raw_engine_config)
+        config = raw_engine_config.merge(
+          exclude_paths: exclude_paths,
+          include_paths: include_paths
+        )
+        # The yaml gem turns a config file string into a hash, but engines
+        # expect the string. So we (for now) need to turn it into a string in
+        # that one scenario.
+        # TODO: update the engines to expect the hash and then remove this.
+        if config.fetch("config", {}).keys.size == 1 && config["config"].key?("file")
+          config["config"] = config["config"]["file"]
+        end
+        config
+      end
+
+      def names_and_raw_engine_configs
+        {}.tap do |ret|
+          @config.engines.each do |name, raw_engine_config|
+            if raw_engine_config.enabled? && @registry.key?(name)
+              ret[name] = raw_engine_config
+            end
+          end
+        end
+      end
+
+      def include_paths
+        IncludePathsBuilder.new(
+          @config.exclude_paths || [], @requested_paths
+        ).build
+      end
+
+      def exclude_paths
+        PathPatterns.new(@config.exclude_paths || []).expanded +
+          gitignore_paths
+      end
+
+      def gitignore_paths
+        if File.exist?(".gitignore")
+          `git ls-files --others -i -z --exclude-from .gitignore`.split("\0")
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/cc/analyzer/engines_runner.rb

@@ -31,63 +31,19 @@ module CC
 
       attr_reader :requested_paths
 
-      def run_engine(engine, container_listener)
-        @formatter.engine_running(engine) do
-          engine.run(@formatter, container_listener)
-        end
-      end
-
       def engines
-        @engines ||= enabled_engines.map do |name, config|
-          label = @container_label || SecureRandom.uuid
-
-          Engine.new(name, metadata(name), @source_dir, engine_config(config), label)
-        end
-      end
-
-      def engine_config(config)
-        config = config.merge(
-          exclude_paths: exclude_paths,
-          include_paths: include_paths
+        @engines ||= Engines.new(
+          registry: @registry,
+          config: @config,
+          container_label: @container_label,
+          source_dir: @source_dir,
+          requested_paths: @requested_paths
         )
-
-        # The yaml gem turns a config file string into a hash, but engines expect the string
-        # So we (for now) need to turn it into a string in that one scenario.
-        # TODO: update the engines to expect the hash and then remove this.
-        if config.fetch("config", {}).keys.size == 1 && config["config"].key?("file")
-          config["config"] = config["config"]["file"]
-        end
-
-        config
       end
 
-      def enabled_engines
-        {}.tap do |ret|
-          @config.engines.each do |name, config|
-            if config.enabled? && @registry.key?(name)
-              ret[name] = config
-            end
-          end
-        end
-      end
-
-      def metadata(engine_name)
-        @registry[engine_name]
-      end
-
-      def include_paths
-        IncludePathsBuilder.new(@config.exclude_paths || [], requested_paths).build
-      end
-
-      def exclude_paths
-        PathPatterns.new(@config.exclude_paths || []).expanded + gitignore_paths
-      end
-
-      def gitignore_paths
-        if File.exist?(".gitignore")
-          `git ls-files --others -i -z --exclude-from .gitignore`.split("\0")
-        else
-          []
+      def run_engine(engine, container_listener)
+        @formatter.engine_running(engine) do
+          engine.run(@formatter, container_listener)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -201,6 +201,7 @@ files:
 - lib/cc/analyzer/engine.rb
 - lib/cc/analyzer/engine_output_filter.rb
 - lib/cc/analyzer/engine_registry.rb
+- lib/cc/analyzer/engines.rb
 - lib/cc/analyzer/engines_runner.rb
 - lib/cc/analyzer/filesystem.rb
 - lib/cc/analyzer/formatters.rb
@@ -256,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Code Climate CLI