codeclimate 0.21.4 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b329407638f3b54a00bcc636137904f07408347
-  data.tar.gz: 1175f9c6024527406665a57ff871da6d44379b19
+  metadata.gz: 14dc3c071f79797549bcd4f338e36c83985288ce
+  data.tar.gz: 5730c60a8f84089a56c6f9ccf714a74201a10a20
 SHA512:
-  metadata.gz: fab08d9ff4015d4353f11a5ff74b2aef2fef9c15bacd4b9d7d2155e235531efb6424e780d5acd12a4fac89f7edde925fcc55c261219998fc7b98c1f86db6ae02
-  data.tar.gz: d09c2a7eca7d67d0c29cb8af86f32499be7768e3ea071c8e56f186dd0bbd52989e671b3e416c47f6a917548b293d30ff0b1d6309fa1fb668c538cc6fa4e488f3
+  metadata.gz: 088c6804de298c0f39ea06b0455ece2dd4d1d36260b02813958b5c3fc5c86da4646478e3069b315639bcd753640925c42c0e80493322c99c52c8b4b698692637
+  data.tar.gz: 47ebfa3e91348de4a1da2a4c4b55dbbe8120e47dd644d1e456657665e5f0c53c2f5ed31f05a16c7e5ff4d5756b1e306a3b9814ebb8c37940dc87e4a63334bf95

data/bin/codeclimate

@@ -3,7 +3,4 @@ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require "cc/cli"
 
-ENV["FILESYSTEM_DIR"] ||= "."
-ENV["CODE_PATH"] ||= ENV["PWD"]
-
 CC::CLI::Runner.run(ARGV)

data/bin/codeclimate-init

@@ -3,6 +3,4 @@ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 
 require "cc/cli"
 
-ENV["FILESYSTEM_DIR"] ||= "."
-
 CC::CLI::Init.new(ARGV).execute

data/bin/release

@@ -23,6 +23,7 @@ docker tag codeclimate/codeclimate "codeclimate/codeclimate:$version"
 docker push "codeclimate/codeclimate:$version"
 
 (cd ../homebrew-formulae/ && bin/release "$version")
+(cd ../marketingsite/ && bin/set-cli-version "$version" && bin/deploy)
 
 echo "Be sure to update release notes:"
 echo ""

data/lib/cc/analyzer.rb

@@ -16,6 +16,7 @@ module CC
     autoload :IssueSorter, "cc/analyzer/issue_sorter"
     autoload :LocationDescription, "cc/analyzer/location_description"
     autoload :LoggingContainerListener, "cc/analyzer/logging_container_listener"
+    autoload :MountedPath, "cc/analyzer/mounted_path"
     autoload :RaisingContainerListener, "cc/analyzer/raising_container_listener"
     autoload :SourceBuffer, "cc/analyzer/source_buffer"
     autoload :StatsdContainerListener, "cc/analyzer/statsd_container_listener"

data/lib/cc/analyzer/engine.rb

@@ -43,7 +43,7 @@ module CC
         end
 
         write_config_file
-        CLI.debug "engine config: #{File.read(config_file).inspect}"
+        CLI.debug "engine config: #{config_file.read.inspect}"
         container.run(container_options)
       ensure
         delete_config_file
@@ -60,7 +60,7 @@ module CC
           "--net", "none",
           "--rm",
           "--volume", "#{@code_path}:/code:ro",
-          "--volume", "#{config_file}:/config.json:ro",
+          "--volume", "#{config_file.host_path}:/config.json:ro",
           "--user", "9000:9000"
         ]
       end
@@ -70,16 +70,15 @@ module CC
       end
 
       def write_config_file
-        FileUtils.mkdir_p(File.dirname(config_file))
-        File.write(config_file, @config.to_json)
+        config_file.write(@config.to_json)
       end
 
       def delete_config_file
-        File.delete(config_file) if File.file?(config_file)
+        config_file.delete if config_file.file?
       end
 
       def config_file
-        @config_file ||= File.join("/tmp/cc", SecureRandom.uuid)
+        @config_file ||= MountedPath.tmp.join(SecureRandom.uuid)
       end
 
       def output_filter

data/lib/cc/analyzer/mounted_path.rb

@@ -0,0 +1,80 @@
+module CC
+  module Analyzer
+    class MountedPath
+      DEFAULT_CODECLIMATE_TMP = "/tmp/cc".freeze
+
+      def self.code
+        host_prefix = ENV["CODECLIMATE_CODE"]
+        host_prefix ||= ENV["CODE_PATH"] # deprecated
+
+        if ENV["CODECLIMATE_DOCKER"]
+          new(host_prefix, "/code")
+        else
+          host_prefix ||= Dir.pwd
+
+          new(host_prefix, host_prefix)
+        end
+      end
+
+      def self.tmp
+        host_prefix = ENV["CODECLIMATE_TMP"]
+        host_prefix ||= DEFAULT_CODECLIMATE_TMP
+
+        if ENV["CODECLIMATE_DOCKER"]
+          new(host_prefix, "/tmp/cc")
+        else
+          new(host_prefix, host_prefix)
+        end
+      end
+
+      def initialize(host_prefix, container_prefix, path = nil)
+        @host_prefix = host_prefix
+        @container_prefix = container_prefix
+        @path = path
+      end
+
+      def host_path
+        if path
+          File.join(host_prefix, path)
+        else
+          host_prefix
+        end
+      end
+
+      def container_path
+        if path
+          File.join(container_prefix, path)
+        else
+          container_prefix
+        end
+      end
+
+      def join(path)
+        @path = path
+
+        self
+      end
+
+      def file?
+        File.file?(container_path)
+      end
+
+      def read
+        File.read(container_path)
+      end
+
+      def write(content)
+        FileUtils.mkdir_p(File.dirname(container_path))
+        File.write(container_path, content)
+      end
+
+      def delete
+        File.delete(container_path)
+      end
+
+      private
+
+      attr_reader :host_prefix, :container_prefix, :path
+    end
+  end
+end

data/lib/cc/cli/analyze.rb

@@ -15,7 +15,7 @@ module CC
       def run
         require_codeclimate_yml
 
-        Dir.chdir(ENV["FILESYSTEM_DIR"]) do
+        Dir.chdir(MountedPath.code.container_path) do
           runner = EnginesRunner.new(registry, formatter, source_dir, config, path_options)
           runner.run
         end
@@ -57,7 +57,7 @@ module CC
       end
 
       def source_dir
-        ENV["CODE_PATH"]
+        MountedPath.code.host_path
       end
 
       def config

data/lib/cc/cli/command.rb

@@ -58,7 +58,9 @@ module CC
       end
 
       def filesystem
-        @filesystem ||= CC::Analyzer::Filesystem.new(ENV["FILESYSTEM_DIR"])
+        @filesystem ||= CC::Analyzer::Filesystem.new(
+          CC::Analyzer::MountedPath.code.container_path
+        )
       end
 
       def terminal

data/lib/cc/cli/config_generator.rb

@@ -73,7 +73,7 @@ module CC
         @non_excluded_paths ||= begin
           excludes = exclude_paths.map { |path| path.chomp("/") }
           filesystem.ls.reject do |path|
-            path.starts_with?(".") || excludes.include?(path)
+            path.starts_with?("-") || path.starts_with?(".") || excludes.include?(path)
           end
         end
       end

data/lib/cc/cli/test.rb

@@ -1,4 +1,3 @@
-require "shellwords"
 require "cc/yaml"
 
 module CC
@@ -89,14 +88,8 @@ module CC
         remove_null_container
       end
 
-      def within_tempdir
-        tmpdir = create_tmpdir
-
-        Dir.chdir(tmpdir) do
-          yield
-        end
-      ensure
-        FileUtils.rm_rf(tmpdir)
+      def within_tempdir(&block)
+        Dir.mktmpdir { |tmp| Dir.chdir(tmp, &block) }
       end
 
       def unpack_tests
@@ -187,15 +180,12 @@ module CC
       def codeclimate_analyze(relative_path)
         codeclimate_path = File.expand_path(File.join(File.dirname(__FILE__), "../../../bin/codeclimate"))
 
-        system([
-          "unset CODE_PATH &&",
-          "unset FILESYSTEM_DIR &&",
-          Shellwords.escape(codeclimate_path),
-          "analyze",
-          "--engine", Shellwords.escape(@engine_name),
+        system(
+          codeclimate_path, "analyze",
+          "--engine", @engine_name,
           "-f", "json",
-          Shellwords.escape(relative_path)
-        ].join(" "))
+          relative_path
+        )
       end
 
       def prepare_working_dir
@@ -221,12 +211,6 @@ module CC
         end
       end
 
-      def create_tmpdir
-        tmpdir = File.join("/tmp/cc", SecureRandom.uuid)
-        FileUtils.mkdir_p(tmpdir)
-        tmpdir
-      end
-
       def unpack(path)
         system("docker cp #{null_container_id}:#{path} .")
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.22.0
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,7 @@ files:
 - lib/cc/analyzer/issue_sorter.rb
 - lib/cc/analyzer/location_description.rb
 - lib/cc/analyzer/logging_container_listener.rb
+- lib/cc/analyzer/mounted_path.rb
 - lib/cc/analyzer/raising_container_listener.rb
 - lib/cc/analyzer/source_buffer.rb
 - lib/cc/analyzer/statsd_container_listener.rb