churn 0.0.34 → 0.0.35

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1ef198f417e616080e9ada053a19596286c0ceb
+  data.tar.gz: d42960ccea815f89f846123808fd346fb5f5f65b
+SHA512:
+  metadata.gz: e92d32eade6ace59e1ed9b663f12d90ba1d1fe91de7d6675fa4910c4e8bb2e95df14d8cf20f53a1dd574c3ed5ea737c965f72c955188399c86ca41d2442bd376
+  data.tar.gz: 4a69afaa2311f8847089b8e1b28ee820679e790b9795bbfc843554db832b6d5c48c540930529b4c29ee0ba7a30b0d5559f36fc32ddd6cf5b919c59159a04cc2a

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
-  - rbx-18mode
-  - rbx-19mode
-  - 1.8.7
-  - 2.0.0
+  - rbx
+  - 2.0.0
+  - jruby-19mode

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    churn (0.0.34)
+    churn (0.0.35)
       chronic (>= 0.2.3)
       hirb
       json_pure
       main
+      rest-client (>= 1.6.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.1)
 
@@ -15,33 +16,30 @@ GEM
     activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arrayfields (4.7.4)
-    chronic (0.9.0)
+    arrayfields (4.9.0)
+    chronic (0.10.2)
     fattr (2.2.1)
-    git (1.2.5)
     hirb (0.7.1)
     i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.6)
-    json_pure (1.7.6)
-    main (5.1.1)
+    json (1.8.1)
+    json_pure (1.8.0)
+    main (5.2.0)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
-    map (6.2.0)
+    map (6.5.1)
+    mime-types (1.25)
     mocha (0.9.12)
     multi_json (1.5.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (4.0.1)
       json (~> 1.4)
-    ruby_parser (3.1.1)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    ruby_parser (3.2.2)
       sexp_processor (~> 4.1)
-    sexp_processor (4.1.4)
+    sexp_processor (4.3.0)
     shoulda (3.3.2)
       shoulda-context (~> 1.0.1)
       shoulda-matchers (~> 1.4.1)
@@ -59,9 +57,9 @@ PLATFORMS
 
 DEPENDENCIES
   churn!
-  jeweler
   mocha (~> 0.9.5)
   rake
+  rdoc
   shoulda
   simplecov
   test-construct

data/README.md

@@ -4,7 +4,7 @@ Churn
 A Project to give the churn file, class, and method for a project for a given checkin. Over time the tool adds up the history of churns to give the number of times a file, class, or method is changing during the life of a project.
 Churn for files is immediate, but classes and methods requires buildings up a history using churn between revisions. The history is stored in ./tmp
 
-Currently has full Git, Mercurial (hg), and Bazaar (bzr) support, and partial SVN support (supports only file level churn currently)
+Currently has full Git, Mercurial (hg), Bazaar (bzr) support, and partial SVN support (supports only file level churn currently)
 
 File changes can be calculated on any single commit to look at method changes you need to be running churn over time. Using a git post-commit hook, configuring your CI to run churn, or using [churn-site](http://churn.picoappz.com) is the best way to build up your churn history. See the --past_history (-p) option to do a one time run building up past class and method level churn.
 
@@ -38,15 +38,18 @@ The reason you want require false is that when required by default churn is expe
   * then run`rake churn` or `bundle exec rake churn`
   * use environment variables to control churn defaults
 
+      ``` ruby
         ENV['CHURN_MINIMUM_CHURN_COUNT']
         ENV['CHURN_START_DATE']
         ENV['CHURN_IGNORE_FILES']
+      ```
 
 * CLI:
   * on command line run `churn` or `bundle exec churn`
   * need help run `churn -h` to get additional information
   * run the executable passing in options to override defaults
-
+ 
+      ``` bash
         churn -i "churn.gemspec, Gemfile" #ignore files
         churn -y #output yaml format opposed to text
         churn -c 10 #set minimum churn count on a file to 10
@@ -54,7 +57,7 @@ The reason you want require false is that when required by default churn is expe
         churn --start_date "6 months ago" #Start looking at file changes from 6 months ago
         churn -p "4 months ago" #churn the past history to build up data for the last 4 months
         churn --past_history #churn the past history for default 3 months to build up data
-
+      ```
 
 ## Example Output
 
@@ -124,7 +127,7 @@ The reason you want require false is that when required by default churn is expe
     | lib/churn/churn_calculator.rb | ChurnCalculator | ChurnCalculator#to_s                    | 1             |
     +-------------------------------+-----------------+-----------------------------------------+---------------+
 
-## Options
+## CLI Options
 
     [~/projects/churn] churn -h
     NAME
@@ -142,6 +145,23 @@ The reason you want require false is that when required by default churn is expe
       --data_directory=[data_directory], -d (0 ~> string(data_directory=))
       --past_history=[past_history], -p (0 ~> string(past_history=))
       --help, -h
+      
+## Library Options
+
+All the CLI options are parsed and just passed into the library. If you want to run the library directly from other code. The best way to see current options is where the [churn executable](https://github.com/danmayer/churn/blob/master/bin/churn) passes the parsed options into the `ChurnCalculator` class
+    
+    ###
+    # Available options
+    ###
+    options = {:minimum_churn_count => params['minimum_churn_count'].value,
+      :ignore_files => params['ignore_files'].value,
+      :start_date => params['start_date'].value,
+      :data_directory => params['data_directory'].value,
+      :history => params['past_history'].value,
+      :report => params['report'].value,
+      :name => params['name'].value
+    }
+    result = Churn::ChurnCalculator.new(options).report(false)
 
 ## Notes on Patches/Pull Requests
 

data/bin/churn

@@ -1,4 +1,13 @@
 #! /usr/bin/env ruby
+# resolve bin path, ignoring symlinks
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+puts File.expand_path("../../lib", bin_file)
+$:.unshift File.expand_path("../../lib", bin_file)
+
+require 'churn/calculator'
 require 'main'
 require 'yaml'
 
@@ -21,6 +30,19 @@ Main do
     default ''
   end
 
+  option('report', 'r') do
+    cast :string
+    argument :optional
+    default ''
+  end
+
+  option('name', 'n') do
+    cast :string
+    argument :optional
+    default ''
+    description 'name is require if remotely reporting churn results. If available as a github project, pass name in the form of username/project_name'
+  end
+
   option('start_date', 's') do
     cast :string
     argument :optional
@@ -41,12 +63,13 @@ Main do
   end
 
   def report_churn(output_string)
-    require File.join(File.dirname(__FILE__), '..', 'lib', 'churn', 'churn_calculator')
     options = {:minimum_churn_count => params['minimum_churn_count'].value,
       :ignore_files => params['ignore_files'].value,
       :start_date => params['start_date'].value,
       :data_directory => params['data_directory'].value,
-      :history => params['past_history'].value
+      :history => params['past_history'].value,
+      :report => params['report'].value,
+      :name => params['name'].value
     }
     result = Churn::ChurnCalculator.new(options).report(output_string)
     unless output_string

data/churn.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |s|
   ]
 
   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<simplecov>,[">= 0"])
+  s.add_development_dependency(%q<rdoc>,[">= 0"])
   #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"])
@@ -39,5 +39,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<sexp_processor>, ["~> 4.1"])
   s.add_runtime_dependency(%q<ruby_parser>, ["~> 3.0"])
   s.add_runtime_dependency(%q<hirb>, [">= 0"])
-
+  s.add_runtime_dependency(%q<rest-client>, [">= 1.6.0"])
 end

data/lib/churn/{churn_calculator.rb → calculator.rb}

@@ -4,16 +4,18 @@ require 'ruby_parser'
 require 'json'
 require 'hirb'
 require 'fileutils'
+require 'rest_client'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'source_control'
-require 'git_analyzer'
-require 'svn_analyzer'
-require 'hg_analyzer'
-require 'bzr_analyzer'
+require 'scm/source_control'
+require 'scm/git_analyzer'
+require 'scm/svn_analyzer'
+require 'scm/hg_analyzer'
+require 'scm/bzr_analyzer'
+
 require 'location_mapping'
-require 'churn_history'
-require 'churn_options'
+require 'history'
+require 'options'
 
 module Churn
 
@@ -30,8 +32,7 @@ module Churn
       
       @minimum_churn_count = @churn_options.minimum_churn_count
       @ignore_files        = @churn_options.ignore_files
-      start_date           = @churn_options.start_date
-      @source_control      = set_source_control(start_date)
+      @source_control      = SourceControl.set_source_control(@churn_options.start_date)
 
       @changes          = {}
       @revision_changes = {}
@@ -47,12 +48,23 @@ module Churn
       if @churn_options.history
         generate_history
       else
-        self.emit
-        self.analyze
+        emit
+        analyze
+        remote_report
         print ? self.to_s : self.to_h
       end
     end
 
+    def remote_report
+      if @churn_options.report_host
+        puts "posting churn results to #{@churn_options.report_host}"
+        data = {:name => @churn_options.name, :revision => @revisions.first, :data => self.to_h}.to_json        
+        RestClient.post @churn_options.report_host, {"results" => data}, :content_type => :json, :accept => :json
+      end
+    rescue Errno::ECONNREFUSED
+      puts "error posting churn results connection refused to host: #{@churn_options.report_host}"
+    end
+
     # this method generates the past history of a churn project from first commit to current
     # running the report for oldest commits first so they are built up correctly
     def generate_history
@@ -124,23 +136,22 @@ module Churn
       result = seperator
       result +="* Revision Changes \n"
       result += seperator
-      result += "Files: \n"
-      result += display_array(hash[:changed_files], :fields=>[:to_str], :headers=>{:to_str=>'file'})
-      result += "\nClasses: \n"
-      result += display_array(hash[:changed_classes])
-      result += "\nMethods: \n"
-      result += display_array(hash[:changed_methods]) + "\n"
+      result += display_array("Files", hash[:changed_files], :fields=>[:to_str], :headers=>{:to_str=>'file'})
+      result += "\n"
+      result += display_array("Classes", hash[:changed_classes])
+      result += "\n"
+      result += display_array("Methods", hash[:changed_methods]) + "\n"
       result += seperator
       result +="* Project Churn \n"
       result += seperator
-      result += "Files: \n"
-      result += display_array(hash[:changes])
-      result += "\nClasses: \n"
+      result += "\n"
+      result += display_array("Files", hash[:changes])
+      result += "\n"
       class_churn = collect_items(hash[:class_churn], 'klass')
-      result += display_array(class_churn)
-      result += "\nMethods: \n"
+      result += display_array("Classes", class_churn)
+      result += "\n"
       method_churn = collect_items(hash[:method_churn], 'method')
-      result += display_array(method_churn)
+      result += display_array("Methods", method_churn)
     end
 
     private
@@ -158,40 +169,19 @@ module Churn
       /.*\.rb/
     end
 
-    def self.display_array(array, options={})
-      array ? Hirb::Helpers::AutoTable.render(array, options.merge(:description=>false)) + "\n" : ''
+    def self.display_array(title, array, options={})
+      response = ''
+      if array && array.length > 0
+        response = "#{title}\n"
+        response << Hirb::Helpers::AutoTable.render(array, options.merge(:description=>false)) + "\n"
+      end
+      response
     end
 
     def self.seperator
       "*"*70+"\n"
     end
 
-    def self.git?
-      !!(`git branch 2>&1` && $?.success?)
-    end
-    
-    def self.hg?
-      !!(`hg branch 2>&1` && $?.success?)
-    end
-    
-    def self.bzr?
-      !!(`bzr nick 2>&1` && $?.success?)
-    end
-
-    def set_source_control(start_date)
-      if self.class.git?
-        GitAnalyzer.new(start_date)
-      elsif self.class.hg?
-        HgAnalyzer.new(start_date)
-      elsif self.class.bzr?
-        BzrAnalyzer.new(start_date)
-      elsif File.exist?(".svn")
-        SvnAnalyzer.new(start_date)
-      else
-        raise "Churning requires a bazaar, git, mercurial, or subversion repo"
-      end
-    end
-
     def calculate_revision_changes
       @revisions.each do |revision|
         if revision == @revisions.first

data/lib/{churn_options.rb → churn/options.rb}

@@ -8,8 +8,9 @@ module Churn
     DEFAULT_CHURN_DIRECTORY = "tmp/churn"
     DEFAULT_MINIMUM_CHURN_COUNT = 5
     DEFAULT_START_TIME = '3 months ago'
+    DEFAULT_REPORT_HOST = 'http://churn.picoappz.com'
 
-    attr_accessor :data_directory, :minimum_churn_count, :ignore_files, :start_date, :history
+    attr_accessor :data_directory, :minimum_churn_count, :ignore_files, :start_date, :history, :report_host, :name
     
     def initialize()
       @data_directory      = DEFAULT_CHURN_DIRECTORY
@@ -17,6 +18,8 @@ module Churn
       @ignore_files        = ['/dev/null']
       @start_date          = DEFAULT_START_TIME
       @history             = nil
+      @report_host         = nil
+      @name                = nil
     end
 
     def set_options(options = {})
@@ -29,6 +32,17 @@ module Churn
       if @history=='true'
         @history = DEFAULT_START_TIME
       end
+      if !options[:report].nil? && options[:report]!='' 
+        @report_host         = options[:report]
+        if @report_host=='true'
+          @report_host = DEFAULT_REPORT_HOST
+        end
+      end
+
+      @name = options[:name] if !options[:name].nil? && options[:name]!=''
+      if !@report_host.nil? && @name.nil?
+        raise ArgumentError.new "If you are reporting churn results you must pass a valid github project name in the form of username/project_name"
+      end
 
       self
     end

data/lib/churn/{bzr_analyzer.rb → scm/bzr_analyzer.rb}

@@ -2,6 +2,11 @@ module Churn
 
   #analizes Bzr / Bazaar SCM to find recently changed files, and what lines have been altered
   class BzrAnalyzer < SourceControl
+    
+    def self.supported?
+      !!(`bzr nick 2>&1` && $?.success?)
+    end
+
     def get_logs
       `bzr log -v --short #{date_range}`.split("\n").reject{|line| line !~ /^[ ]*(M|A)  /}.map{|line| line.strip.split(" ")[1..-1]}.flatten
     end

data/lib/churn/{git_analyzer.rb → scm/git_analyzer.rb}

@@ -2,6 +2,11 @@ module Churn
 
   #analizes git SCM to find recently changed files, and what lines have been altered
   class GitAnalyzer < SourceControl
+
+    def self.supported?
+      !!(`git branch 2>&1` && $?.success?)
+    end
+
     def get_logs
       `git log #{date_range} --name-only --pretty=format:`.split(/\n/).reject{|line| line == ""}
     end

data/lib/churn/{hg_analyzer.rb → scm/hg_analyzer.rb}

@@ -2,6 +2,11 @@ module Churn
 
   #analizes Hg / Mercurial SCM to find recently changed files, and what lines have been altered
   class HgAnalyzer < SourceControl
+
+    def self.supported?
+      !!(`hg branch 2>&1` && $?.success?)
+    end
+
     def get_logs
       `hg log -v#{date_range}`.split("\n").reject{|line| line !~ /^files:/}.map{|line| line.split(" ")[1..-1]}.flatten
     end

data/lib/churn/{source_control.rb → scm/source_control.rb}

@@ -2,10 +2,37 @@ module Churn
 
   # Base clase for analyzing various SCM systems like git, HG, and SVN
   class SourceControl
+
+    def self.set_source_control(start_date)
+      if GitAnalyzer.supported?
+        GitAnalyzer.new(start_date)
+      elsif HgAnalyzer.supported?
+        HgAnalyzer.new(start_date)
+      elsif BzrAnalyzer.supported?
+        BzrAnalyzer.new(start_date)
+      elsif SvnAnalyzer.supported?
+        SvnAnalyzer.new(start_date)
+      else
+        raise "Churn requires a bazaar, git, mercurial, or subversion source control"
+      end
+    end
+    
+    def self.supported?
+      raise "child class must implement"
+    end
+
     def initialize(start_date=nil)
       @start_date = start_date
     end
 
+    def get_logs
+      raise "child class must implement"
+    end
+
+    def get_revisions
+      raise "child class must implement"
+    end
+
     def get_updated_files_change_info(revision, revisions)
       updated     = {}
       logs        = get_updated_files_from_log(revision, revisions)

data/lib/churn/{svn_analyzer.rb → scm/svn_analyzer.rb}

@@ -2,15 +2,24 @@ module Churn
 
   #analizes SVN SCM to find recently changed files, and what lines have been altered
   class SvnAnalyzer < SourceControl
+
+    def self.supported?
+      File.exist?(".svn")
+    end
+
     def get_logs
-      `svn log #{date_range} --verbose`.split(/\n/).map { |line| clean_up_svn_line(line) }.compact
+      `svn log --verbose#{date_range}#{svn_credentials}`.split(/\n/).map { |line| clean_up_svn_line(line) }.compact
     end
 
     private
+    def svn_credentials
+      " --username #{ENV['SVN_USR']} --password #{ENV['SVN_PWD']}" if ENV['SVN_PWD'] && ENV['SVN_USR']
+    end
+
     def date_range
       if @start_date
         date = Chronic.parse(@start_date)
-        "--revision {#{date.strftime('%Y-%m-%d')}}:{#{Time.now.strftime('%Y-%m-%d')}}"
+        " --revision {#{date.strftime('%Y-%m-%d')}}:{#{Time.now.strftime('%Y-%m-%d')}}"
       end
     end
 

data/lib/churn/version.rb

@@ -1,3 +1,3 @@
 module Churn
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/lib/tasks/churn_tasks.rb

@@ -1,13 +1,13 @@
 if defined?(RakeFileUtils) # self.respond_to?(:desc)
   def report_churn()
-    require File.join(File.dirname(__FILE__), '..', 'churn', 'churn_calculator')
-    params = {}
+    require File.join(File.dirname(__FILE__), '..', 'churn', 'calculator')
+    options = {}
     { :minimum_churn_count => ENV['CHURN_MINIMUM_CHURN_COUNT'],
       :start_date          => ENV['CHURN_START_DATE'],
       :ignore_files        => ENV['CHURN_IGNORE_FILES'],
       :data_directory        => ENV['CHURN_DATA_DIRECTORY'],
-    }.each {|k,v| params[k] = v unless v.nil? }
-    Churn::ChurnCalculator.new(params).report
+    }.each {|k,v| options[k] = v unless v.nil? }
+    Churn::ChurnCalculator.new(options).report
   end
   
   desc "Report the current churn for the project"

data/test/test_helper.rb

@@ -13,7 +13,7 @@ end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'churn/churn_calculator'
+require 'churn/calculator'
 Mocha::Configuration.prevent(:stubbing_non_existent_method)
 
 class Test::Unit::TestCase

data/test/unit/churn_calculator_test.rb

@@ -4,7 +4,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "use minimum churn count" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
 
       churn.stubs(:parse_log_for_changes).returns([['file.rb', 4],['less.rb',1]])
@@ -18,7 +18,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "ensure that minimum churn count is initialized as a Fixnum" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => "3"})
 
       assert_equal 3, churn.instance_variable_get(:@minimum_churn_count)
@@ -27,7 +27,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "use ignore_files filter" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:ignore_files => "file.rb"})
 
       churn.stubs(:parse_log_for_changes).returns([['file.rb', 10],['new.rb',11]])
@@ -41,7 +41,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "analize sorts changes" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
 
       churn.stubs(:parse_log_for_changes).returns([['file.rb', 4],['most.rb', 9],['less.rb',1]])
@@ -57,7 +57,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "have correct changed_files data" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
 
       churn.stubs(:parse_log_for_changes).returns([['less.rb',1]])
@@ -70,7 +70,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "have correct changed classes and methods data" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
 
       churn.stubs(:parse_log_for_changes).returns([['less.rb',1]])
@@ -87,7 +87,7 @@ class ChurnCalculatorTest < Test::Unit::TestCase
 
   should "have correct churn method and classes at 1 change" do
     within_construct do |container|
-      Churn::ChurnCalculator.stubs(:git?).returns(true)
+      Churn::GitAnalyzer.stubs(:supported?).returns(true)
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
 
       churn.stubs(:parse_log_for_changes).returns([['less.rb',1]])
@@ -117,40 +117,37 @@ class ChurnCalculatorTest < Test::Unit::TestCase
   end
 
   should "initialize a churn calculator for hg repositories" do
-    Churn::ChurnCalculator.stubs(:git?).returns(false)
-    Churn::ChurnCalculator.expects(:`).with("hg branch 2>&1").returns(true) #` fix syntax hilighting
+    Churn::GitAnalyzer.stubs(:supported?).returns(false)
+    Churn::HgAnalyzer.expects(:`).with("hg branch 2>&1").returns(true) #` fix syntax hilighting
     churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
     assert churn.instance_variable_get(:@source_control).is_a?(Churn::HgAnalyzer)
   end
 
   should "initialize a churn calculator for bzr repositories" do
-    Churn::ChurnCalculator.stubs(:git?).returns(false)
-    Churn::ChurnCalculator.stubs(:hg?).returns(false)
-    Churn::ChurnCalculator.expects(:`).with("bzr nick 2>&1").returns(true) #` fix syntax hilighting
+    Churn::GitAnalyzer.stubs(:supported?).returns(false)
+    Churn::HgAnalyzer.stubs(:supported?).returns(false)
+    Churn::BzrAnalyzer.expects(:`).with("bzr nick 2>&1").returns(true) #` fix syntax hilighting
     churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
     assert churn.instance_variable_get(:@source_control).is_a?(Churn::BzrAnalyzer)
   end
 
   should "initialize a churn calculator for svn repositories" do
-    Churn::ChurnCalculator.stubs(:git?).returns(false)
-    Churn::ChurnCalculator.stubs(:hg?).returns(false)
-    Churn::ChurnCalculator.stubs(:bzr?).returns(false)
+    Churn::GitAnalyzer.stubs(:supported?).returns(false)
+    Churn::HgAnalyzer.stubs(:supported?).returns(false)
+    Churn::BzrAnalyzer.stubs(:supported?).returns(false)
     File.stubs(:exist?).returns(true)
     churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
     assert churn.instance_variable_get(:@source_control).is_a?(Churn::SvnAnalyzer)
   end
 
   should "raise exception on a churn calculator for unknown repositories" do
-    Churn::ChurnCalculator.stubs(:git?).returns(false)
-    Churn::ChurnCalculator.stubs(:hg?).returns(false)
-    Churn::ChurnCalculator.stubs(:bzr?).returns(false)
+    Churn::GitAnalyzer.stubs(:supported?).returns(false)
+    Churn::HgAnalyzer.stubs(:supported?).returns(false)
+    Churn::BzrAnalyzer.stubs(:supported?).returns(false)
     File.stubs(:exist?).returns(false)
     assert_raises RuntimeError do
       churn = Churn::ChurnCalculator.new({:minimum_churn_count => 3})
     end
   end
 
-
-  
-
 end

data/test/unit/svn_analyzer_test.rb

@@ -21,7 +21,32 @@ class SvnAnalyzerTest < Test::Unit::TestCase
 
   should "run date range correctly" do
     svn_analyzer = Churn::SvnAnalyzer.new(Date.parse('3/3/2010'))
-    assert_equal "--revision {2010-03-03}:{#{Date.today.to_s}}", svn_analyzer.send(:date_range)
+    assert_equal " --revision {2010-03-03}:{#{Date.today.to_s}}", svn_analyzer.send(:date_range)
+  end
+
+  context "SvnAnalyzer#get_logs" do
+    should "return a list of changed files" do
+      ENV['SVN_PWD']= nil
+      ENV['SVN_USR']= nil
+      svn_analyzer = Churn::SvnAnalyzer.new
+      svn_analyzer.expects(:`).with('svn log --verbose').returns('
+      A /file1.rb
+      A /dir/file2.rb
+      A /file3.rb
+      M /file1.rb')
+      assert_equal ['/file1.rb', '/dir/file2.rb', '/file3.rb', '/file1.rb'], svn_analyzer.get_logs
+    end
+    should "invoke with svn credentials " do
+      ENV['SVN_PWD']= '123qwe'
+      ENV['SVN_USR']= 'user123'
+      svn_analyzer = Churn::SvnAnalyzer.new
+      svn_analyzer.expects(:`).with('svn log --verbose --username user123 --password 123qwe').returns('
+      A /file1.rb
+      A /dir/file2.rb
+      A /file3.rb
+      M /file1.rb')
+      assert_equal ['/file1.rb', '/dir/file2.rb', '/file3.rb', '/file1.rb'], svn_analyzer.get_logs
+    end
   end
 
   protected

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: churn
 version: !ruby/object:Gem::Version
-  version: 0.0.34
-  prerelease: 
+  version: 0.0.35
 platform: ruby
 authors:
 - Dan Mayer
@@ -14,151 +13,132 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: test-construct
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-construct
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,20 +167,32 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'High method and class churn has been shown to have increased bug and
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+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. '
 email: dan@mayerdan.com
@@ -226,16 +215,16 @@ files:
 - 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/calculator.rb
+- lib/churn/history.rb
 - lib/churn/location_mapping.rb
-- lib/churn/source_control.rb
-- lib/churn/svn_analyzer.rb
+- lib/churn/options.rb
+- lib/churn/scm/bzr_analyzer.rb
+- lib/churn/scm/git_analyzer.rb
+- lib/churn/scm/hg_analyzer.rb
+- lib/churn/scm/source_control.rb
+- lib/churn/scm/svn_analyzer.rb
 - lib/churn/version.rb
-- lib/churn_options.rb
 - lib/tasks/churn_tasks.rb
 - man/churn.1
 - man/churn.html
@@ -254,41 +243,25 @@ files:
 homepage: http://github.com/danmayer/churn
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 837759494224756390
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: churn
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Providing additional churn metrics over the original metric_fu churn
-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/churn_options_test.rb
-- test/unit/git_analyzer_test.rb
-- test/unit/hg_analyzer_test.rb
-- test/unit/location_mapping_test.rb
-- test/unit/source_control_test.rb
-- test/unit/svn_analyzer_test.rb
+test_files: []