codeclimate 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce793849717e9b985e8ee1719aaa29c117cdcdd
-  data.tar.gz: 719f5995d03467749a03bfe2492324aee17cd756
+  metadata.gz: 0bccbea964c2e9fbbfeb2b1155ef0bac717572d3
+  data.tar.gz: 90cad595d54c5f785c3690a5a7a110c346d07a26
 SHA512:
-  metadata.gz: 55cea2c7b96317fe760a002fe108366fa6b426732e09edfca689fdd264f4d54d90fe0b472b1d7cda10c1b0e6208330a8bf5cd87468cdf397a4dde4675a9c5d5f
-  data.tar.gz: 98a707499fb985b2846800036c9f7267c246bdd4caf2873ad4d5657c9a6fd3c232e88e5aa1d9ee8e2dfb781a2517637353c510384141d266a4ce255606b9d412
+  metadata.gz: 99471f9cbc7508d2a13316093ec28151b97bc0b0a9ed0d2bf5c6f88dbb2eb7f867c3fdb534ef39824bd7c992c087bde4a1be13074178fa2bfb007cfc9ff7bbde
+  data.tar.gz: 29763fbda32cad04ed2c4b0b32d79ceb3f97ec4a3968d7bdb46fc6ff9d50ab574b0fa16da71363363ebb428fdabec8eebf055a69d18aa53c5c9d09d8f8549100

data/lib/cc/workspace.rb

@@ -3,7 +3,7 @@ module CC
     autoload :Exclusion, "cc/workspace/exclusion"
     autoload :PathTree, "cc/workspace/path_tree"
 
-    def initialize(path_tree = PathTree.new("."))
+    def initialize(path_tree = PathTree.for_path("."))
       @path_tree = path_tree
     end
 

data/lib/cc/workspace/path_tree.rb

@@ -4,107 +4,46 @@ require "set"
 module CC
   class Workspace
     class PathTree
-      def self.create(pathname)
+      autoload :DirNode, "cc/workspace/path_tree/dir_node"
+      autoload :FileNode, "cc/workspace/path_tree/file_node"
+
+      def self.node_for_pathname(pathname)
         if pathname.directory?
-          new(pathname.to_s)
+          DirNode.new(pathname.to_s)
         else
           FileNode.new(pathname.to_s)
         end
       end
 
-      def initialize(root_path, children = {})
-        @root_path = root_path.dup.freeze
-        @children = children
+      def self.for_path(path)
+        new(node_for_pathname(Pathname.new(path)))
+      end
+
+      def initialize(root_node)
+        @root_node = root_node
       end
 
       def clone
-        self.class.new(root_path, children.dup)
+        self.class.new(root_node.clone)
       end
 
       def exclude_paths(paths)
-        paths.each { |path| remove(*normalized_path_pieces(path)) }
+        paths.each { |path| root_node.remove(*normalized_path_pieces(path)) }
       end
 
       def include_paths(paths)
-        paths.each { |path| add(*normalized_path_pieces(path)) }
-      end
-
-      def all_paths
-        if populated?
-          children.values.flat_map(&:all_paths)
-        else
-          [File.join(root_path, File::SEPARATOR)]
-        end
-      end
-
-      protected
-
-      def populated?
-        children.present?
-      end
-
-      def remove(head = nil, *tail)
-        return if head.nil? && tail.empty?
-        populate_direct_children
-
-        if (child = children[head])
-          child.remove(*tail)
-          children.delete(head) unless child.populated?
-        end
+        paths.each { |path| root_node.add(*normalized_path_pieces(path)) }
       end
 
-      def add(head = nil, *tail)
-        return if head.nil? && tail.empty?
-
-        if (entry = find_direct_child(head))
-          children[entry.basename.to_s] = self.class.create(entry)
-          children[entry.basename.to_s].add(*tail)
-        else
-          CLI.debug("Couldn't include because part of path doesn't exist.", path: File.join(root_path, head))
-        end
-      end
+      delegate :all_paths, to: :root_node
 
       private
 
-      attr_reader :children, :root_path
-
-      def populate_direct_children
-        return if populated?
-
-        Pathname.new(root_path).each_child do |child_path|
-          children[child_path.basename.to_s] = self.class.create(child_path)
-        end
-      end
-
-      def find_direct_child(name)
-        Pathname.new(root_path).children.detect { |c| c.basename.to_s == name }
-      end
+      attr_reader :root_node
 
       def normalized_path_pieces(path)
         Pathname.new(path).cleanpath.to_s.split(File::SEPARATOR).reject(&:blank?)
       end
-
-      class FileNode
-        def initialize(root_path)
-          @root_path = root_path.dup.freeze
-        end
-
-        def all_paths
-          [@root_path]
-        end
-
-        def populated?
-          false
-        end
-
-        def remove(*)
-          # this space intentionally left blank
-        end
-
-        def add(*)
-          # this space intentionally left blank
-        end
-      end
     end
   end
 end

data/lib/cc/workspace/path_tree/dir_node.rb

@@ -0,0 +1,65 @@
+module CC
+  class Workspace
+    class PathTree
+      class DirNode
+        def initialize(root_path, children = {})
+          @root_path = root_path.dup.freeze
+          @children = children
+        end
+
+        def clone
+          self.class.new(root_path, children.dup)
+        end
+
+        def all_paths
+          if populated?
+            children.values.flat_map(&:all_paths)
+          else
+            [File.join(root_path, File::SEPARATOR)]
+          end
+        end
+
+        def populated?
+          children.present?
+        end
+
+        def remove(head = nil, *tail)
+          return if head.nil? && tail.empty?
+          populate_direct_children
+
+          if (child = children[head])
+            child.remove(*tail)
+            children.delete(head) if !child.populated? || tail.empty?
+          end
+        end
+
+        def add(head = nil, *tail)
+          return if head.nil? && tail.empty?
+
+          if (entry = find_direct_child(head))
+            children[entry.basename.to_s] = PathTree.node_for_pathname(entry)
+            children[entry.basename.to_s].add(*tail)
+          else
+            CLI.debug("Couldn't include because part of path doesn't exist.", path: File.join(root_path, head))
+          end
+        end
+
+        private
+
+        attr_reader :children, :root_path
+
+        def populate_direct_children
+          return if populated?
+
+          Pathname.new(root_path).each_child do |child_path|
+            children[child_path.basename.to_s] = PathTree.node_for_pathname(child_path)
+          end
+        end
+
+        def find_direct_child(name)
+          Pathname.new(root_path).children.detect { |c| c.basename.to_s == name }
+        end
+      end
+    end
+  end
+end

data/lib/cc/workspace/path_tree/file_node.rb

@@ -0,0 +1,31 @@
+module CC
+  class Workspace
+    class PathTree
+      class FileNode
+        def initialize(root_path)
+          @root_path = root_path.dup.freeze
+        end
+
+        def all_paths
+          [root_path]
+        end
+
+        def populated?
+          false
+        end
+
+        def remove(*)
+          # this space intentionally left blank
+        end
+
+        def add(*)
+          # this space intentionally left blank
+        end
+
+        private
+
+        attr_reader :root_path
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -246,6 +246,8 @@ files:
 - lib/cc/workspace.rb
 - lib/cc/workspace/exclusion.rb
 - lib/cc/workspace/path_tree.rb
+- lib/cc/workspace/path_tree/dir_node.rb
+- lib/cc/workspace/path_tree/file_node.rb
 homepage: https://codeclimate.com
 licenses:
 - MIT
@@ -271,4 +273,3 @@ signing_key:
 specification_version: 4
 summary: Code Climate CLI
 test_files: []
-has_rdoc: