code_statistics 0.2.6 → 0.2.7

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.homepage = "http://github.com/danmayer/code_statistics"
     gem.authors = ["Dan Mayer"]
     gem.add_development_dependency "thoughtbot-shoulda" 
-    gem.add_development_dependency "devver-construct"
+    gem.add_development_dependency "test-construct"
     gem.executables = ['code_statistics']
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/code_statistics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code_statistics}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-01-25}
   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}
@@ -49,13 +49,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_development_dependency(%q<devver-construct>, [">= 0"])
+      s.add_development_dependency(%q<test-construct>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-      s.add_dependency(%q<devver-construct>, [">= 0"])
+      s.add_dependency(%q<test-construct>, [">= 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    s.add_dependency(%q<devver-construct>, [">= 0"])
+    s.add_dependency(%q<test-construct>, [">= 0"])
   end
 end

data/lib/code_statistics/code_statistics.rb

@@ -28,19 +28,31 @@ module CodeStatistics
         if File.directory?(dir)
           entries = Dir.entries(dir)
           entries = entries.reject{ |entry| entry=='.' || entry=='..' }
-          has_directories = false
-          entries.each do |entry|
-            entry_path = File.join(dir,entry)
-            if File.directory?(entry_path) 
-              if Dir.entries(entry_path).select{|path| path.match(FILTER)}.length > 0
-                @pairs << [entry_path, entry_path]
-                has_directories = true
-              end
+          has_directories = add_sub_directory(entries, dir)
+          @pairs << [dir, dir] unless has_directories
+        end
+      end
+    end
+
+    def add_sub_directory(entries, dir)
+      has_directories = false
+      entries = entries.reject{ |entry| entry=='.' || entry=='..' }
+      entries.each do |entry|
+        entry_path = File.join(dir,entry)
+        if File.directory?(entry_path) 
+          if Dir.entries(entry_path).select{|path| path.match(FILTER)}.length > 0
+            @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
+              @pairs << [entry_path, entry_path]
+              has_directories = true
             end
           end
-          @pairs << [dir, dir] unless has_directories
         end
       end
+      has_directories
     end
 
     def collect_files_to_ignore(ignore_file_globs)

data/test/code_statistics_test.rb

@@ -52,6 +52,31 @@ class CodeStatisticsTest < Test::Unit::TestCase
     end
   end
 
+  should "add spec sub sub directories and count as test code" do
+    within_construct do |construct|
+      dir             = construct.directory("spec")
+      sub_dir         = dir.directory("models")
+      sub_dir2        = sub_dir.directory("controllers")
+      file            = sub_dir2.file("fake.rb", "this\nis\n\lame\n")
+      code_stats      = CodeStatistics::CodeStatistics.new([])
+      assert code_stats.to_s.match(/spec\/models\/controllers/)
+      assert code_stats.to_s.match(/Test LOC: 3/)
+    end
+  end
+
+  should "add spec sub sub directories but add highest level directory with test files and count as test code" do
+    within_construct do |construct|
+      dir             = construct.directory("spec")
+      sub_dir         = dir.directory("models")
+      file            = sub_dir.file("top_fake.rb", "this\nis\n\lame\n")
+      sub_dir2        = sub_dir.directory("controllers")
+      file            = sub_dir2.file("fake.rb", "this\nis\n\lame\n")
+      code_stats      = CodeStatistics::CodeStatistics.new([])
+      assert code_stats.to_s.match(/spec\/models/)
+      assert code_stats.to_s.match(/Test LOC: 6/)
+    end
+  end
+
   should "add spec root directory and count as test code" do
     within_construct do |construct|
       dir             = construct.directory("spec")
@@ -126,5 +151,4 @@ class CodeStatisticsTest < Test::Unit::TestCase
     end
   end
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: code_statistics
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Dan Mayer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -05:00
+date: 2010-01-25 00:00:00 -05:00
 default_executable: code_statistics
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: devver-construct
+  name: test-construct
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement