churn 0.0.25 → 0.0.26

data/.gitignore

@@ -0,0 +1,9 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+tmp
+.rvmrc
+.bundle
+specs

data/Gemfile

@@ -1,3 +1,3 @@
 source :rubygems
 
-#gemspec
+gemspec

data/Gemfile.lock

@@ -1,43 +1,53 @@
 PATH
   remote: .
   specs:
-    churn (0.0.24)
+    churn (0.0.26)
       chronic (>= 0.2.3)
       hirb
       json_pure
       main
-      ruby_parser (~> 2.3)
-      sexp_processor (~> 3.0)
+      ruby_parser (~> 3.1.0)
+      sexp_processor (~> 4.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.10)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     arrayfields (4.7.4)
-    chronic (0.7.0)
+    chronic (0.9.0)
     fattr (2.2.1)
     git (1.2.5)
     hirb (0.7.0)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
-    json_pure (1.7.5)
-    main (5.1.0)
+    json (1.7.6)
+    json_pure (1.7.6)
+    main (5.1.1)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
     map (6.2.0)
     mocha (0.9.12)
-    rake (0.9.2.2)
+    multi_json (1.5.0)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.2.0)
-    shoulda (2.11.3)
+    ruby_parser (3.1.1)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.1.3)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.2)
+    shoulda-matchers (1.4.1)
+      activesupport (>= 3.0.0)
     test-construct (1.2.0)
 
 PLATFORMS

data/Rakefile

@@ -2,70 +2,6 @@ require 'rubygems'
 require 'rake'
 require File.join(File.dirname(__FILE__), 'lib', 'tasks', 'churn_tasks')
 
-begin
-  #Bug in jeweler or bundler to make jeweler
-  #create a proper gemspec that doesn't have a circular dependancy
-  # on itself uninstall churn
-  # Then comment this line out of the Gemfile 'gemspec'
-  # then rake gemspec
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "churn"
-    gem.summary = %Q{Providing additional churn metrics over the original metric_fu churn}
-    gem.description = %Q{High method and class churn has been shown to have increased bug and error rates. This gem helps you know what is changing a lot so you can do additional testing, code review, or refactoring to try to tame the volatile code. }
-    gem.email = "dan@mayerdan.com"
-    gem.homepage = "http://github.com/danmayer/churn"
-    gem.authors = ["Dan Mayer"]
-    gem.executables = ['churn']
-
-    gem.add_development_dependency "shoulda"
-    gem.add_development_dependency "jeweler"
-    gem.add_development_dependency "test-construct"
-    gem.add_development_dependency "rake"
-    gem.add_development_dependency "mocha", '~> 0.9.5'
-    gem.add_dependency "main"
-    gem.add_dependency "json_pure"
-    gem.add_dependency "chronic", '>= 0.2.3'
-    gem.add_dependency "sexp_processor", '~> 3.0'
-    gem.add_dependency "ruby_parser", '~> 2.3'
-    gem.add_dependency 'hirb'
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-begin
-  #for additional metrics, mostly Rcov which caliper doesn't do
-  require 'metric_fu'
-
-  MetricFu::Configuration.run do |config|
-    config.metrics  = [:churn, :saikuro, :roodi, :flog, :flay, :reek, :roodi, :rcov, :hotspots]
-    config.graphs   = [:roodi, :flog, :flay, :reek, :roodi, :rcov]
-
-    config.flay     = { :dirs_to_flay => ['lib']  }
-    config.flog     = { :dirs_to_flog => ['lib']  }
-    config.reek     = { :dirs_to_reek => ['lib']  }
-    config.roodi    = { :dirs_to_roodi => ['lib'] }
-    config.saikuro  = { :output_directory => 'tmp/tmp_saikuro',
-      :input_directory => ['lib'],
-      :cyclo => "",
-      :filter_cyclo => "0",
-      :warn_cyclo => "5",
-      :error_cyclo => "7",
-      :formater => "text"} #this needs to be set to "text"
-    config.churn    = { :start_date => "3 months ago", :minimum_churn_count => 10}
-    config.rcov     = { :test_files => ['test/unit/**/*_test.rb'],
-      :rcov_opts => ["--sort coverage",
-                     "--no-html",
-                     "--text-coverage",
-                     "--no-color",
-                     "--profile",
-                     "--exclude /gems/,spec"]}
-  end
-rescue Exception
-  puts "metric_fu not working install it"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -88,7 +24,13 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+desc "Build Gem"
+task :build_gem do
+  `gem build churn.gemspec`
+  `mv churn*.gem pkg/`
+end
+
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')

data/churn.gemspec

@@ -1,101 +1,41 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "churn/version"
 
 Gem::Specification.new do |s|
   s.name = "churn"
-  s.version = "0.0.25"
+  s.version = Churn::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Mayer"]
   s.date = "2012-12-17"
+  s.summary = "Providing additional churn metrics over the original metric_fu churn"
   s.description = "High method and class churn has been shown to have increased bug and error rates. This gem helps you know what is changing a lot so you can do additional testing, code review, or refactoring to try to tame the volatile code. "
   s.email = "dan@mayerdan.com"
-  s.executables = ["churn"]
+  s.homepage = "http://github.com/danmayer/churn"
+  s.rubyforge_project = "churn"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
-  s.files = [
-    ".deferred_server",
-    ".document",
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/churn",
-    "churn.gemspec",
-    "lib/churn.rb",
-    "lib/churn/bzr_analyzer.rb",
-    "lib/churn/churn_calculator.rb",
-    "lib/churn/churn_history.rb",
-    "lib/churn/git_analyzer.rb",
-    "lib/churn/hg_analyzer.rb",
-    "lib/churn/location_mapping.rb",
-    "lib/churn/source_control.rb",
-    "lib/churn/svn_analyzer.rb",
-    "lib/tasks/churn_tasks.rb",
-    "man/churn.1",
-    "man/churn.html",
-    "test/data/churn_calculator.rb",
-    "test/data/test_helper.rb",
-    "test/test_helper.rb",
-    "test/unit/bzr_analyzer_test.rb",
-    "test/unit/churn_calculator_test.rb",
-    "test/unit/churn_history_test.rb",
-    "test/unit/git_analyzer_test.rb",
-    "test/unit/hg_analyzer_test.rb",
-    "test/unit/location_mapping_test.rb"
-  ]
-  s.homepage = "http://github.com/danmayer/churn"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Providing additional churn metrics over the original metric_fu churn"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_development_dependency(%q<shoulda>, [">= 0"])
+  s.add_development_dependency(%q<jeweler>, [">= 0"])
+  s.add_development_dependency(%q<test-construct>, [">= 0"])
+  s.add_development_dependency(%q<rake>, [">= 0"])
+  s.add_development_dependency(%q<mocha>, ["~> 0.9.5"])
+  #s.add_development_dependency(%q<ruby-debug>, ["~> 0.10.4"])
+  s.add_runtime_dependency(%q<main>, [">= 0"])
+  s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+  s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
+  s.add_runtime_dependency(%q<sexp_processor>, ["~> 4.1.0"])
+  s.add_runtime_dependency(%q<ruby_parser>, ["~> 3.1.0"])
+  s.add_runtime_dependency(%q<hirb>, [">= 0"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<test-construct>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.5"])
-      s.add_runtime_dependency(%q<main>, [">= 0"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
-      s.add_runtime_dependency(%q<sexp_processor>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<ruby_parser>, ["~> 2.3"])
-      s.add_runtime_dependency(%q<hirb>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<test-construct>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.5"])
-      s.add_dependency(%q<main>, [">= 0"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<chronic>, [">= 0.2.3"])
-      s.add_dependency(%q<sexp_processor>, ["~> 3.0"])
-      s.add_dependency(%q<ruby_parser>, ["~> 2.3"])
-      s.add_dependency(%q<hirb>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<test-construct>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.5"])
-    s.add_dependency(%q<main>, [">= 0"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<chronic>, [">= 0.2.3"])
-    s.add_dependency(%q<sexp_processor>, ["~> 3.0"])
-    s.add_dependency(%q<ruby_parser>, ["~> 2.3"])
-    s.add_dependency(%q<hirb>, [">= 0"])
-  end
 end
-

data/lib/churn/location_mapping.rb

@@ -1,29 +1,33 @@
 module Churn
-  
+
   # Given a ruby file, map the klass and methods to a range of line numbers
   # The klass and method to line numbers mappings, are stored in
   # @klasses_collection and @methods_collection
+  # this is based off https://github.com/seattlerb/ruby_parser which seems to have some known line number bugs
+  # perhaps look at and move more to the style of line numbers from metric_fu
+  # https://github.com/metricfu/metric_fu/blob/master/lib/data_structures/line_numbers.rb
   class LocationMapping < SexpProcessor
-    
+
     attr_reader :klasses_collection, :methods_collection
-    
+
     def initialize()
       super
       @klasses_collection  = {}
       @methods_collection  = {}
       @parser              = RubyParser.new
       self.auto_shift_type = true
+      self.require_empty = false
     end
-    
+
     def get_info(file)
       ast = @parser.process(File.read(file), file)
       process ast
     end
-    
+
     def process_class(exp)
       name           = exp.shift
       start_line     = exp.line
-      last_line      = exp.last.line
+      last_line      = deep_last_line(exp)
       name           = name if name.is_a?(Symbol)
       name           = name.values.value if name.is_a?(Sexp) #deals with cases like class Test::Unit::TestCase
       @current_class = name
@@ -32,15 +36,22 @@ module Churn
       analyze_list exp
       s()
     end
-    
+
+    def deep_last_line(exp)
+      lines = []
+      exp.deep_each{|x| lines << x.line }
+      lines.max + 1
+    end
+
     def analyze_list exp
       process exp.shift until exp.empty?
+      exp
     end
-    
+
     def process_defn(exp)
       name        = exp.shift
       start_line  = exp.line
-      last_line   = exp.last.line
+      last_line   = deep_last_line(exp)
       full_name   = "#{@current_class}##{name}"
       @methods_collection[full_name] = [] unless @methods_collection.include?(full_name)
       @methods_collection[full_name] << (start_line..last_line)

data/lib/churn/version.rb

@@ -0,0 +1,3 @@
+module Churn
+  VERSION = "0.0.26"
+end

data/test/unit/location_mapping_test.rb

@@ -1,17 +1,17 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class LocationMappingTest < Test::Unit::TestCase
-  
+
   #todo unfortunately it looks like ruby parser can't handle construct tmp dirs
   #<Pathname:/private/var/folders/gl/glhHkYYSGgG5nb6+4OG0yU+++TI/-Tmp-/construct_container-56784-851001101/fake_class.rb>
   #(rdb:1) p locationmapping.get_info(file.to_s)
   #RegexpError Exception: invalid regular expression; there's no previous pattern, to which '+' would define cardinality at 2: /^+++/
 
-  should "location_mapping gets correct classes info" do
+  should "location_mapping gets correct file classes info" do
     file = 'test/data/churn_calculator.rb'
     locationmapping = Churn::LocationMapping.new
     locationmapping.get_info(file.to_s)
-    klass_hash = {"ChurnCalculator"=>[14..215]}
+    klass_hash = {"ChurnCalculator"=>[14..213]}
     assert_equal klass_hash, locationmapping.klasses_collection
   end
 
@@ -19,17 +19,17 @@ class LocationMappingTest < Test::Unit::TestCase
     file = 'test/data/churn_calculator.rb'
     locationmapping = Churn::LocationMapping.new
     locationmapping.get_info(file.to_s)
-    methods_hash = {"ChurnCalculator#report"=>[32..36], "ChurnCalculator#emit"=>[38..41], "ChurnCalculator#changes_for_type"=>[139..155], "ChurnCalculator#get_klass_for"=>[135..137], "ChurnCalculator#calculate_changes!"=>[109..116], "ChurnCalculator#analyze"=>[43..53], "ChurnCalculator#calculate_revision_data"=>[95..107], "ChurnCalculator#calculate_revision_changes"=>[78..93], "ChurnCalculator#parse_logs_for_updated_files"=>[171..213], "ChurnCalculator#to_h"=>[55..70], "ChurnCalculator#parse_log_for_revision_changes"=>[167..169], "ChurnCalculator#get_changes"=>[118..133], "ChurnCalculator#parse_log_for_changes"=>[157..165], "ChurnCalculator#initialize"=>[16..30]}
-    assert_equal methods_hash, locationmapping.methods_collection
+    methods_hash = {"ChurnCalculator#report"=>[32..36], "ChurnCalculator#emit"=>[38..41], "ChurnCalculator#changes_for_type"=>[139..155], "ChurnCalculator#get_klass_for"=>[135..137], "ChurnCalculator#calculate_changes!"=>[109..116], "ChurnCalculator#analyze"=>[43..53], "ChurnCalculator#calculate_revision_data"=>[95..107], "ChurnCalculator#calculate_revision_changes"=>[78..92], "ChurnCalculator#parse_logs_for_updated_files"=>[171..213], "ChurnCalculator#to_h"=>[55..70], "ChurnCalculator#parse_log_for_revision_changes"=>[167..169], "ChurnCalculator#get_changes"=>[118..133], "ChurnCalculator#parse_log_for_changes"=>[157..165], "ChurnCalculator#initialize"=>[16..30]}
+    assert_equal methods_hash.sort, locationmapping.methods_collection.sort
   end
-  
+
   should "location_mapping gets correct classes info for test helper files" do
     file = 'test/data/test_helper.rb'
     locationmapping = Churn::LocationMapping.new
     locationmapping.get_info(file.to_s)
-    klass_hash = {"TestCase"=>[12..14]}
-    assert_equal klass_hash, locationmapping.klasses_collection
+    klass_hash = {"TestCase"=>[12..15]}
+    assert_equal klass_hash.sort, locationmapping.klasses_collection.sort
   end
-  
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: churn
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Dan Mayer
@@ -139,11 +139,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 59
         segments: 
-        - 3
+        - 4
+        - 1
         - 0
-        version: "3.0"
+        version: 4.1.0
   requirement: *id009
   prerelease: false
   name: sexp_processor
@@ -154,11 +155,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
-        - 2
         - 3
-        version: "2.3"
+        - 1
+        - 0
+        version: 3.1.0
   requirement: *id010
   prerelease: false
   name: ruby_parser
@@ -189,6 +191,7 @@ extra_rdoc_files:
 files: 
 - .deferred_server
 - .document
+- .gitignore
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -207,6 +210,7 @@ files:
 - lib/churn/location_mapping.rb
 - lib/churn/source_control.rb
 - lib/churn/svn_analyzer.rb
+- lib/churn/version.rb
 - lib/tasks/churn_tasks.rb
 - man/churn.1
 - man/churn.html
@@ -247,10 +251,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: churn
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Providing additional churn metrics over the original metric_fu churn
-test_files: []
-
+test_files: 
+- test/data/churn_calculator.rb
+- test/data/test_helper.rb
+- test/test_helper.rb
+- test/unit/bzr_analyzer_test.rb
+- test/unit/churn_calculator_test.rb
+- test/unit/churn_history_test.rb
+- test/unit/git_analyzer_test.rb
+- test/unit/hg_analyzer_test.rb
+- test/unit/location_mapping_test.rb