code_statistics 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/code_statistics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code_statistics}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
-  s.date = %q{2010-02-05}
+  s.date = %q{2010-02-15}
   s.default_executable = %q{code_statistics}
   s.description = %q{"This is a port of the rails 'rake stats' method so it can be made more robust and work for non rails projects. New features may eventually be added as well."}
   s.email = %q{dan@devver.net}

data/lib/code_statistics/code_statistics.rb

@@ -24,7 +24,7 @@ module CodeStatistics
         add_test_type(key) if dir_path.match(/^test/) || dir_path.match(/^spec/) || dir_path.match(/^features/) || 
           dir_path.match(/test$/) || dir_path.match(/spec$/) || dir_path.match(/features$/)
       end
-
+      
       @statistics  = calculate_statistics
       @total       = calculate_total if pairs.length > 1
     end
@@ -50,8 +50,9 @@ module CodeStatistics
             @pairs << [entry_path, entry_path]
             has_directories = true
           else
-            has_directories = add_sub_directory(Dir.entries(entry_path), entry_path)
-            if has_directories == false && Dir.entries(entry_path).select{|path| path.match(FILTER)}.length > 0
+            sub_has_directories = add_sub_directory(Dir.entries(entry_path), entry_path)
+            has_directories = true if sub_has_directories
+            if sub_has_directories == false && Dir.entries(entry_path).select{|path| path.match(FILTER)}.length > 0
               @pairs << [entry_path, entry_path]
               has_directories = true
             end

data/test/code_statistics_test.rb

@@ -15,6 +15,18 @@ class CodeStatisticsTest < Test::Unit::TestCase
       assert code_stats.to_s.match(/Code LOC: 6/)
     end
   end
+
+  should "not duplicate passed in directories with same paths with slashes" do
+    within_construct do |construct|
+      dir             = construct.directory("lib")
+      file            = dir.file("real.rb", "this\nis\n\lame\n")
+      controllers_dir = dir.directory("controllers")
+      file            = controllers_dir.file("fake.rb", "this\nis\n\lame\n")
+      code_stats      = CodeStatistics::CodeStatistics.new([["Libraries", 'lib'], ["libs", 'lib/']])
+      assert code_stats.to_s.match(/Libraries/)
+      assert code_stats.to_s.match(/Code LOC: 6/)
+    end
+  end
   
   should "find app controllers directory" do
     within_construct do |construct|
@@ -27,6 +39,18 @@ class CodeStatisticsTest < Test::Unit::TestCase
     end
   end
 
+  should "don't double count app directory when empty sub directories directory" do
+    within_construct do |construct|
+      dir             = construct.directory("app")
+      controllers_dir = dir.directory("controllers")
+      file            = controllers_dir.file("fake.rb", "this\nis\n\lame\n")
+      empty_sub_dir = dir.directory("zfolder")
+      code_stats      = CodeStatistics::CodeStatistics.new([])
+      assert code_stats.to_s.match(/app\/controllers/)
+      assert code_stats.to_s.match(/Code LOC: 3/)
+    end
+  end
+
   should "find app non rails directory" do
     within_construct do |construct|
       dir             = construct.directory("app")
@@ -111,6 +135,16 @@ class CodeStatisticsTest < Test::Unit::TestCase
     end
   end
 
+  should "count test directory even if passed in as full path" do
+    within_construct do |construct|
+      dir             = construct.directory("test")
+      file            = dir.file("fake.rb", "this\nis\n\lame\n")
+      code_stats      = CodeStatistics::CodeStatistics.new([["test", dir.to_s]])
+      assert code_stats.to_s.match(/Test/)
+      assert code_stats.to_s.match(/Test LOC: 3/)
+    end
+  end
+
   should "calculate correct test to code ratio" do
     within_construct do |construct|
       dir             = construct.directory("app")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: code_statistics
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors: 
 - Dan Mayer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -05:00
+date: 2010-02-15 00:00:00 -05:00
 default_executable: code_statistics
 dependencies: 
 - !ruby/object:Gem::Dependency