turbulence 1.2.4 → 1.3.0

data/spec/turbulence/scm/perforce_spec.rb

@@ -1,11 +1,10 @@
 require 'turbulence/scm/perforce'
-require 'rspec/mocks'
 
 describe Turbulence::Scm::Perforce do
-  let (:p4_scm) { Turbulence::Scm::Perforce }
+  let(:p4_scm) { Turbulence::Scm::Perforce }
 
   before do
-    p4_scm.stub(:p4_list_changes) do
+    allow(p4_scm).to receive(:p4_list_changes).and_return(
       "Change 62660 on 2005/11/28 by x@client 'CHANGED: adapted to DESCODE '
 Change 45616 on 2005/07/12 by x@client 'ADDED: trigger that builds and '
 Change 45615 on 2005/07/12 by x@client 'ADDED: for testing purposes '
@@ -13,9 +12,9 @@ Change 45614 on 2005/07/12 by x@client 'COSMETIC: updated header '
 Change 11250 on 2004/09/17 by x@client 'CHANGED: trigger now also allow'
 Change 9250 on 2004/08/20 by x@client 'BUGFIX: bug#1583 (People can so'
 Change 5560 on 2004/04/26 by x@client 'ADDED: The \"BRANCHED\" tag.'"
-    end
+    )
 
-    p4_scm.stub(:p4_describe_change).with("5560") do
+    allow(p4_scm).to receive(:p4_describe_change).with("5560").and_return(
       "Change 5560 by x@client on 2004/04/26 17:25:03
 
         ADDED: The \"BRANCHED\" tag.
@@ -38,105 +37,111 @@ changed 1 chunks 3 / 3 lines
 add 0 chunks 0 lines
 deleted 0 chunks 0 lines
 changed 1 chunks 3 / 1 lines"
-    end
+    )
   end
 
   describe "::is_repo?" do
     before :each do
-      ENV.stub(:[]).with("P4CLIENT").and_return(nil)
-      ENV.stub(:[]).with("PATH").and_return("")
+      allow(ENV).to receive(:[]).with("P4CLIENT").and_return(nil)
+      allow(ENV).to receive(:[]).with("PATH").and_return("")
     end
 
     it "returns true if P4CLIENT is set " do
-      ENV.stub(:[]).with("P4CLIENT").and_return("c-foo.bar")
+      allow(ENV).to receive(:[]).with("P4CLIENT").and_return("c-foo.bar")
 
-      Turbulence::Scm::Perforce.is_repo?(".").should be_true
+      expect(Turbulence::Scm::Perforce.is_repo?(".")).to be true
     end
 
-    it "returns false if P4CLIENT is empty"  do
-      Turbulence::Scm::Perforce.is_repo?(".").should be_false
+    it "returns false if P4CLIENT is empty" do
+      expect(Turbulence::Scm::Perforce.is_repo?(".")).to be false
     end
 
     it "returns false if p4 is not available" do
-      Turbulence::Scm::Perforce.is_repo?(".").should be_false
+      expect(Turbulence::Scm::Perforce.is_repo?(".")).to be false
     end
   end
 
   describe "::log_command" do
     before do
-      p4_scm.stub(:depot_to_local).with("//admin/scripts/triggers/enforce-submit-comment.py")\
+      allow(p4_scm).to receive(:depot_to_local)
+        .with("//admin/scripts/triggers/enforce-submit-comment.py")
         .and_return("triggers/enforce-submit-comments.py")
-      p4_scm.stub(:depot_to_local).with("//admin/scripts/triggers/check-consistency.py")\
+      allow(p4_scm).to receive(:depot_to_local)
+        .with("//admin/scripts/triggers/check-consistency.py")
         .and_return("triggers/check-consistency.py")
-      p4_scm.stub(:p4_list_changes) do
+      allow(p4_scm).to receive(:p4_list_changes).and_return(
         "Change 5560 on 2004/04/26 by x@client 'ADDED: The \"BRANCHED\" tag.'"
-      end
+      )
     end
 
     it "takes an optional argument to specify the range" do
-      expect{Turbulence::Scm::Perforce.log_command("@1,2")}.to_not raise_error
+      expect { Turbulence::Scm::Perforce.log_command("@1,2") }.to_not raise_error
     end
 
     it "lists insertions/deletions per file and change" do
-      Turbulence::Scm::Perforce.log_command().should match(/\d+\t\d+\t[A-z.]*/)
+      expect(Turbulence::Scm::Perforce.log_command()).to match(/\d+\t\d+\t[A-z.]*/)
     end
   end
 
   describe "::changes" do
     it "lists changenumbers from parsing 'p4 changes' output" do
-      p4_scm.changes.should =~ %w[62660 45616 45615 45614 11250 9250 5560]
+      expect(p4_scm.changes).to match_array(%w[62660 45616 45615 45614 11250 9250 5560])
     end
   end
 
   describe "::files_per_change" do
     before do
-      p4_scm.stub(:depot_to_local).with("//admin/scripts/triggers/enforce-submit-comment.py")\
+      allow(p4_scm).to receive(:depot_to_local)
+        .with("//admin/scripts/triggers/enforce-submit-comment.py")
         .and_return("triggers/enforce-submit-comments.py")
-      p4_scm.stub(:depot_to_local).with("//admin/scripts/triggers/check-consistency.py")\
+      allow(p4_scm).to receive(:depot_to_local)
+        .with("//admin/scripts/triggers/check-consistency.py")
         .and_return("triggers/check-consistency.py")
     end
 
     it "lists files with churn" do
-      p4_scm.files_per_change("5560").should  =~ [[4,"triggers/enforce-submit-comments.py"],
-        [1,"triggers/check-consistency.py"]]
+      expect(p4_scm.files_per_change("5560")).to match_array([
+        [4, "triggers/enforce-submit-comments.py"],
+        [1, "triggers/check-consistency.py"]
+      ])
     end
   end
 
   describe "::transform_for_output" do
     it "adds a 0 for deletions" do
-      p4_scm.transform_for_output([1,"triggers/check-consistency.py"]).should == "1\t0\ttriggers/check-consistency.py\n"
+      expect(p4_scm.transform_for_output([1, "triggers/check-consistency.py"])).to eq "1\t0\ttriggers/check-consistency.py\n"
     end
   end
 
   describe "::depot_to_local" do
     describe "on windows" do
       before do
-        p4_scm.stub(:extract_clientfile_from_fstat_of).and_return("D:/Perforce/admin/scripts/triggers/enforce-no-head-change.py")
-        FileUtils.stub(:pwd).and_return("D:/Perforce")
+        allow(p4_scm).to receive(:extract_clientfile_from_fstat_of)
+          .and_return("D:/Perforce/admin/scripts/triggers/enforce-no-head-change.py")
+        allow(FileUtils).to receive(:pwd).and_return("D:/Perforce")
       end
 
       it "converts depot-style paths to local paths using forward slashes" do
-        p4_scm.depot_to_local("//admin/scripts/triggers/enforce-no-head-change.py").should \
-          == "admin/scripts/triggers/enforce-no-head-change.py"
+        expect(p4_scm.depot_to_local("//admin/scripts/triggers/enforce-no-head-change.py")).to eq "admin/scripts/triggers/enforce-no-head-change.py"
       end
     end
 
     describe "on unix" do
       before do
-        p4_scm.stub(:extract_clientfile_from_fstat_of).and_return("/home/jhwist/admin/scripts/triggers/enforce-no-head-change.py")
-        FileUtils.stub(:pwd).and_return("/home/jhwist")
+        allow(p4_scm).to receive(:extract_clientfile_from_fstat_of)
+          .and_return("/home/jhwist/admin/scripts/triggers/enforce-no-head-change.py")
+        allow(FileUtils).to receive(:pwd).and_return("/home/jhwist")
       end
 
       it "converts depot-style paths to local paths using forward slashes" do
-        p4_scm.depot_to_local("//admin/scripts/triggers/enforce-no-head-change.py").should \
-          == "admin/scripts/triggers/enforce-no-head-change.py"
+        expect(p4_scm.depot_to_local("//admin/scripts/triggers/enforce-no-head-change.py")).to eq "admin/scripts/triggers/enforce-no-head-change.py"
       end
     end
   end
 
   describe "::extract_clientfile_from_fstat_of" do
     before do
-      p4_scm.stub(:p4_fstat) do
+      allow(p4_scm).to receive(:p4_fstat).and_return(
         "... depotFile //admin/scripts/triggers/enforce-no-head-change.py
 ... clientFile /home/jhwist/admin/scripts/triggers/enforce-no-head-change.py
 ... isMapped
@@ -147,24 +152,23 @@ changed 1 chunks 3 / 1 lines"
 ... headChange 211211
 ... headModTime 1214555028
 ... haveRev 5"
-      end
+      )
     end
 
-    it "uses clientFile field"  do
-      p4_scm.extract_clientfile_from_fstat_of("//admin/scripts/triggers/enforce-no-head-change.py").should ==
-        "/home/jhwist/admin/scripts/triggers/enforce-no-head-change.py"
+    it "uses clientFile field" do
+      expect(p4_scm.extract_clientfile_from_fstat_of("//admin/scripts/triggers/enforce-no-head-change.py")).to eq "/home/jhwist/admin/scripts/triggers/enforce-no-head-change.py"
     end
   end
 
   describe "::sum_of_changes" do
     it "sums up changes" do
       output = "add 1 chunks 1 lines\ndeleted 0 chunks 0 lines\nchanged 1 chunks 3 / 3 lines"
-      p4_scm.sum_of_changes(output).should == 4
+      expect(p4_scm.sum_of_changes(output)).to eq 4
     end
 
     it "ignores junk" do
       output = "add nothing, change nothing"
-      p4_scm.sum_of_changes(output).should == 0
+      expect(p4_scm.sum_of_changes(output)).to eq 0
     end
   end
 end

data/spec/turbulence/turbulence_spec.rb

@@ -13,11 +13,11 @@ describe Turbulence do
   }
 
   it "finds files of interest" do
-    turb.files_of_interest.should include "lib/turbulence.rb"
+    expect(turb.files_of_interest).to include "lib/turbulence.rb"
   end
-  
-  it "filters out exluded files" do
+
+  it "filters out excluded files" do
     config.exclusion_pattern = 'turbulence'
-    turb.files_of_interest.should_not include "lib/turbulence.rb"
+    expect(turb.files_of_interest).not_to include "lib/turbulence.rb"
   end
 end

data/turbulence.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require "turbulence/version"
 
@@ -8,21 +9,24 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chad Fowler", "Michael Feathers", "Corey Haines"]
   s.email       = ["chad@chadfowler.com", "mfeathers@obtiva.com", "coreyhaines@gmail.com"]
-  s.homepage    = "http://chadfowler.com"
-  s.add_dependency "flog", "~>4.1"
-  s.add_dependency "json", ">= 1.4.6"
+  s.homepage    = "https://github.com/chad/turbulence"
+  s.license     = "MIT"
+
+  s.add_dependency "flog", ">= 4.1"
+  s.add_dependency "json"
   s.add_dependency "launchy", ">= 2.0.0"
-  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_dependency "racc"  # Required by flog's ruby_parser, removed from stdlib in Ruby 3.3+
+
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'rake'
 
   s.summary     = %q{Automates churn + flog scoring on a git repo for a Ruby project}
-  s.description = %q{Based on this http://www.stickyminds.com/sitewide.asp?Function=edetail&ObjectType=COL&ObjectId=16679&tth=DYN&tt=siteemail&iDyn=2}
-
-  s.rubyforge_project = "turbulence"
+  s.description = %q{Automates churn + flog scoring on a git repo for a Ruby project. Based on the article https://www.stickyminds.com/article/getting-empirical-about-refactoring}
 
   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.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 3.0'
 end

metadata

@@ -1,88 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: turbulence
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Chad Fowler
 - Michael Feathers
 - Corey Haines
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Based on this http://www.stickyminds.com/sitewide.asp?Function=edetail&ObjectType=COL&ObjectId=16679&tth=DYN&tt=siteemail&iDyn=2
+description: Automates churn + flog scoring on a git repo for a Ruby project. Based
+  on the article https://www.stickyminds.com/article/getting-empirical-about-refactoring
 email:
 - chad@chadfowler.com
 - mfeathers@obtiva.com
@@ -92,13 +120,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/bule
+- docs/scatter-plot.png
+- docs/treemap.png
 - lib/turbulence.rb
 - lib/turbulence/calculators/churn.rb
 - lib/turbulence/calculators/complexity.rb
@@ -129,27 +161,25 @@ files:
 - template/turbulence.html
 - turbulence.gemspec
 - win_rakefile_location_fix.rb
-homepage: http://chadfowler.com
-licenses: []
+homepage: https://github.com/chad/turbulence
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: turbulence
-rubygems_version: 2.0.6
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Automates churn + flog scoring on a git repo for a Ruby project
 test_files:

data/.travis.yml

@@ -1,6 +0,0 @@
-rvm:
-  - "1.9.3"
-  - "1.9.2"
-  - "1.8.7"
-  - jruby-18mode
-  - jruby-19mode