codeclimate 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc6ca1d893dcb67f0b02f559ceba2d3f23a82559
-  data.tar.gz: c5c70423501554cf8afe0b6e9703c19c8b88d571
+  metadata.gz: 7300c9980cfc0656f7d9f8db4bfdbca3072557e8
+  data.tar.gz: 538ebb98fdd24c8936f39616c30885bbf2cefcb5
 SHA512:
-  metadata.gz: d9c89e8532d8a50ece6c96e75f42fc870016d5a5cd2aa2b0540a931e4e580337f6900bb0264dc01b4748114f4b110e196dd522982b88a7afefa4096d03746d4e
-  data.tar.gz: 2035afdfe59e893be959e1e2668d848a02982fd5606b4403360bf1f509af9cc7fff467b824ddb35a593c12792bdabde2b2909c0bfcd7ce2bf4e7eb8dae7f2753
+  metadata.gz: 6b0283c0100f8165089aa96b6247beca715ede60c72175f43e8801b1abd80084eca7526865bbfd60a2c3fb37f0de995583a78f6a9e91e73ef2417c5d47fe9f2c
+  data.tar.gz: f8ed6d3cad1a68b3d8a6284d1cffb7094e6906776c997ce8f51a2f8990568862a01e5cb567a859f675cfd6705a085bcd09ac017e19a885695dc66d0f18919735

data/bin/check

@@ -10,7 +10,11 @@ docker version | grep -q "Server version\|Server:" || {
   if command -v boot2docker > /dev/null 2>&1; then
     echo "Please ensure \`boot2docker up\` succeeds and you've run \`eval \$(boot2docker shellinit)\` in this shell" >&2
   else
-    echo "Please ensure \`docker version' succeeds and try again"
+    if [ $UID -eq 0 ]; then
+      echo "Please ensure \`sudo docker version' succeeds and try again" >&2
+    else
+      echo "Please ensure \`docker version' succeeds and try again" >&2
+    fi
   fi
 
   exit 1

data/lib/cc/analyzer/engines_runner.rb

@@ -6,11 +6,12 @@ module CC
       InvalidEngineName = Class.new(StandardError)
       NoEnabledEngines = Class.new(StandardError)
 
-      def initialize(registry, formatter, source_dir, config, container_label = nil)
+      def initialize(registry, formatter, source_dir, config, requested_paths = [], container_label = nil)
         @registry = registry
         @formatter = formatter
         @source_dir = source_dir
         @config = config
+        @requested_paths = requested_paths
         @container_label = container_label
       end
 
@@ -28,6 +29,8 @@ module CC
 
       private
 
+      attr_reader :requested_paths
+
       def run_engine(engine, container_listener)
         @formatter.engine_running(engine) do
           engine.run(@formatter, container_listener)
@@ -72,12 +75,12 @@ module CC
         @registry[engine_name]
       end
 
-      def exclude_paths
-        PathPatterns.new(@config.exclude_paths || []).expanded + gitignore_paths
+      def include_paths
+        IncludePathsBuilder.new(@config.exclude_paths || [], requested_paths).build
       end
 
-      def include_paths
-        IncludePathsBuilder.new(@config.exclude_paths || []).build
+      def exclude_paths
+        PathPatterns.new(@config.exclude_paths || []).expanded + gitignore_paths
       end
 
       def gitignore_paths

data/lib/cc/analyzer/include_paths_builder.rb

@@ -9,13 +9,21 @@ module CC
         end
       end
 
-      def initialize(cc_exclude_paths)
+      attr_reader :cc_include_paths
+
+      def initialize(cc_exclude_paths, cc_include_paths = [])
         @cc_exclude_paths = cc_exclude_paths
+        @cc_include_paths = cc_include_paths
       end
 
       def build
-        root = Directory.new('.', ignored_files)
-        paths = root.included_paths
+        if cc_include_paths.any?
+          paths = filter_by_cc_includes
+        else
+          root = Directory.new(".", ignored_files)
+          paths = root.included_paths
+        end
+
         paths.each do |path|
           raise_on_unreadable_files(path)
         end
@@ -23,6 +31,19 @@ module CC
 
       protected
 
+      def filter_by_cc_includes
+        paths = []
+        cc_include_paths.each do |path|
+          if File.directory?(path)
+            root = Directory.new(path, ignored_files)
+            paths += root.included_paths
+          elsif !ignored_files.include?(path)
+            paths << path
+          end
+        end
+        paths.uniq
+      end
+
       def ignored_files
         Tempfile.open(".cc_gitignore") do |tmp|
           tmp.write(File.read(".gitignore")) if File.exist?(".gitignore")

data/lib/cc/cli/analyze.rb

@@ -5,15 +5,18 @@ module CC
 
       def initialize(_args = [])
         super
+        @engine_options = []
+        @path_options = []
 
         process_args
+        apply_config_options
       end
 
       def run
         require_codeclimate_yml
 
         Dir.chdir(ENV['FILESYSTEM_DIR']) do
-          runner = EnginesRunner.new(registry, formatter, source_dir, config)
+          runner = EnginesRunner.new(registry, formatter, source_dir, config, path_options)
           runner.run
         end
 
@@ -25,13 +28,20 @@ module CC
 
       private
 
+      attr_accessor :config
+      attr_reader :engine_options, :path_options
+
       def process_args
         while arg = @args.shift
           case arg
           when '-f'
             @formatter = Formatters.resolve(@args.shift)
+          when '-e', '--engine'
+            @engine_options << @args.shift
           when '--dev'
             @dev_mode = true
+          else
+            @path_options << arg
           end
         end
       rescue Formatters::Formatter::InvalidFormatterError => e
@@ -51,7 +61,34 @@ module CC
       end
 
       def config
-        CC::Yaml.parse(filesystem.read_path(CODECLIMATE_YAML))
+        @config ||= CC::Yaml.parse(filesystem.read_path(CODECLIMATE_YAML))
+      end
+
+      def apply_config_options
+        if engine_options.any? && config.engines?
+          filter_by_engine_options
+        elsif engine_options.any?
+          config["engines"] = CC::Yaml::Nodes::EngineList.new(config).with_value({})
+        end
+        add_engine_options
+      end
+
+      def filter_by_engine_options
+        config.engines.keys.each do |engine|
+          unless engine_options.include?(engine)
+            config.engines.delete(engine)
+          end
+        end
+      end
+
+      def add_engine_options
+        engine_options.each do |engine|
+          if config.engines.include?(engine)
+            config.engines[engine].enabled = true
+          else
+            config.engines[engine] = CC::Yaml::Nodes::Engine.new(config.engines).with_value({ "enabled" => true })
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Code Climate CLI