code_statistics 0.2.10 → 0.2.11

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/bin/code_statistics

@@ -4,6 +4,7 @@ stats_directories = [
   %w(Libraries lib/),
   %w(Source source/),
   %w(Src src/),
+  %w(Features features/),
 ].collect { |name, dir| [ name, "#{Dir.pwd}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 
 if ENV['DIRECTORIES_TO_CALCULATE']

data/code_statistics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code_statistics}
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-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}
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/danmayer/code_statistics}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Making a gem of the normal rails rake stats method, to make it more robust and work on non rails projects}
   s.test_files = [
     "test/code_statistics_test.rb",

data/lib/code_statistics/code_statistics.rb

@@ -3,7 +3,7 @@ require 'pathname'
 module CodeStatistics
   class CodeStatistics #:nodoc:
 
-    FILTER = /.*\.rb$/
+    FILTER = /.*\.(rb|feature)$/
 
     attr_reader :print_buffer
 
@@ -16,14 +16,10 @@ module CodeStatistics
 
       @pairs = remove_duplicate_pairs(@pairs)
 
-      directories_to_search = ['app','test','spec','merb','features', 'bin']
+      directories_to_search = ['app','test','spec','merb', 'bin']
       directories_to_search = remove_included_pairs(directories_to_search, @pairs)
       recursively_add_directories(directories_to_search)
-
-      @pairs.each do |key, dir_path|
-        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
+      add_test_types(@pairs)
       
       @statistics  = calculate_statistics
       @total       = calculate_total if pairs.length > 1
@@ -87,7 +83,7 @@ module CodeStatistics
     
     private
 
-    #user suplied paths and set paths might slight differ like path/name and path/name/ this filters those out
+    #user supplied paths and set paths might slight differ like path/name and path/name/ this filters those out
     def remove_duplicate_pairs(pairs)
       unique_pairs = []
       paths = pairs.map{|pair| [pair.first, Pathname.new(pair.last).realpath.to_s] }
@@ -95,8 +91,11 @@ module CodeStatistics
       unique_pairs
     end
 
-    def calculate_statistics
-      @pairs.inject({}) { |stats, pair| stats[pair.first] = calculate_directory_statistics(pair.last); stats }
+    def add_test_types(pairs)
+      pairs.each do |key, dir_path|
+        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
     end
 
     def remove_included_pairs(directories_to_search, pairs)
@@ -108,6 +107,10 @@ module CodeStatistics
       File.exist?(File.join(dir,filename))
     end
 
+    def calculate_statistics
+      @pairs.inject({}) { |stats, pair| stats[pair.first] = calculate_directory_statistics(pair.last); stats }
+    end
+
     def test_types
       @test_types.uniq
     end
@@ -138,7 +141,7 @@ module CodeStatistics
         while line = f.gets
           stats["lines"] += 1
           stats["classes"] += 1 if line =~ /class [A-Z]/
-          stats["methods"] += 1 if line =~ /def [a-z]/
+          stats["methods"] += 1 if line =~ /(def [a-z]|should .* do|test .* do|it .* do)/
           stats["codelines"] += 1 unless line =~ /^\s*$/ || line =~ /^\s*#/
         end
       end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: code_statistics
 version: !ruby/object:Gem::Version 
-  version: 0.2.10
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Dan Mayer
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: code_statistics
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: test-construct
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "\"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.\""
 email: dan@devver.net
 executables: 
@@ -68,18 +77,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Making a gem of the normal rails rake stats method, to make it more robust and work on non rails projects