code_statistics 0.2.7 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/code_statistics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code_statistics}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-02-02}
   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

@@ -13,6 +13,7 @@ module CodeStatistics
       @ignore_files = collect_files_to_ignore(ignore_file_globs)
 
       directories_to_search = ['app','test','spec','merb','features', 'bin']
+      directories_to_search = remove_included_pairs(directories_to_search, @pairs)
       recursively_add_directories(directories_to_search)
 
       @pairs.each do |key, dir_path|
@@ -79,10 +80,16 @@ module CodeStatistics
     end
     
     private
+
     def calculate_statistics
       @pairs.inject({}) { |stats, pair| stats[pair.first] = calculate_directory_statistics(pair.last); stats }
     end
 
+    def remove_included_pairs(directories_to_search, pairs)
+      #if the user explicitly said to index the directory index it at the level specified not recursively
+      directories_to_search.reject{|dir| @pairs.map{|pair| pair.first}.include?(dir)}
+    end
+
     def local_file_exists?(dir,filename)
       File.exist?(File.join(dir,filename))
     end
@@ -132,17 +139,19 @@ module CodeStatistics
     end
     
     def calculate_code
-      code_loc = 0
-      @statistics.each { |k, v| code_loc += v['codelines'] unless test_types.include? k }
-      code_loc
+      calculate_type(false)
     end
     
     def calculate_tests
-      test_loc = 0
-      @statistics.each { |k, v| test_loc += v['codelines'] if test_types.include? k }
-      test_loc
+      calculate_type(true)
     end
     
+    def calculate_type(test_match)
+      type_loc = 0
+      @statistics.each { |k, v| type_loc += v['codelines'] if test_types.include?(k)==test_match }
+      type_loc
+    end
+
     def print_header
       print_splitter
       @print_buffer << "| Name".ljust(22)+" "+
@@ -159,10 +168,14 @@ module CodeStatistics
     def print_splitter
       @print_buffer << "+----------------------+-------+-------+---------+---------+-----+-------+\n"
     end
+
+    def x_over_y(top, bottom)
+      result = (top / bottom) rescue result = 0
+    end
     
     def print_line(name, statistics)
-      m_over_c = (statistics["methods"] / statistics["classes"]) rescue m_over_c = 0
-      loc_over_m = (statistics["codelines"] / statistics["methods"]) rescue loc_over_m = 0
+      m_over_c = x_over_y(statistics["methods"], statistics["classes"])
+      loc_over_m = x_over_y(statistics["codelines"], statistics["methods"])
       loc_over_m = loc_over_m - 2 if loc_over_m >= 2
 
       start = if test_types.include? name

metadata

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