Merge pull request #21 from fastruby/feature/bundler-stats

Add dependency on bundler-stats and improve output

Author: lubc

.github/workflows/test.yml

@@ -8,9 +8,6 @@ on:
   pull_request:
     branches:
     - main
-env:
-  COVERAGE: true
-  CODECOV_TOKEN: d7028c0e-97c5-485f-85e5-f63daabeef63
 jobs:
   test-ruby-2-4-x:
     runs-on: ubuntu-latest
@@ -23,6 +20,10 @@ jobs:
           ruby-version: 2.4
           bundler-cache: true
       - name: Build and run tests
+        env:
+          COVERAGE: true
+          TERM: xterm
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
@@ -38,6 +39,10 @@ jobs:
           ruby-version: 2.5
           bundler-cache: true
       - name: Build and run tests
+        env:
+          COVERAGE: true
+          TERM: xterm
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
@@ -53,6 +58,10 @@ jobs:
           ruby-version: 2.6
           bundler-cache: true
       - name: Build and run tests
+        env:
+          COVERAGE: true
+          TERM: xterm
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
@@ -68,6 +77,10 @@ jobs:
           ruby-version: 2.7
           bundler-cache: true
       - name: Build and run tests
+        env:
+          COVERAGE: true
+          TERM: xterm
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
@@ -83,6 +96,10 @@ jobs:
           ruby-version: 3.0
           bundler-cache: true
       - name: Build and run tests
+        env:
+          COVERAGE: true
+          TERM: xterm
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3

.gitignore

@@ -1,7 +1,9 @@
+.byebug_history
 *.gem
 *.rbc
 .bundle
 .config
+.ruby-version
 .yardoc
 Gemfile.lock
 InstalledFiles

Gemfile

@@ -1,4 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in rails_stats.gemspec
 gemspec
+
+group :development, :test do
+  gem "bundler", ">= 1.6", "< 3.0"
+  gem "byebug"
+  gem "codecov"
+  gem "minitest"
+  gem "minitest-around"
+  gem "minitest-spec-context"
+  gem "simplecov"
+  gem "simplecov-console"
+end

lib/rails_stats/app_statistics.rb

@@ -3,10 +3,11 @@ class AppStatistics
     attr_reader :statistics, :total, :test
 
     def initialize(directory)
+      @directories = []
       @test = false
-      @directory  = directory
-      @statistics = calculate_statistics
-      @total      = calculate_total
+      @directory   = directory
+      @statistics  = calculate_statistics
+      @total       = calculate_total
     end
 
     def key_concepts
@@ -28,15 +29,15 @@ def calculate_statistics
     end
 
     def directories
-      return @directories if @directories
-      out = []
+      return @directories if @directories.any?
+
       Dir.foreach(@directory) do |file_name|
         path = File.join(@directory, file_name)
         next unless File.directory?(path)
         next if (/^\./ =~ file_name)
         next if file_name == "assets" # doing separately
         next if file_name == "views"  # TODO
-        out << path
+        @directories << path
       end
 
       assets = File.join(@directory, "assets")
@@ -48,13 +49,13 @@ def directories
 
           case file_name
           when "javascripts"
-            out << path
+            @directories << path
           # TODO when "css"
           end
         end
       end
 
-      out
+      @directories
     end
   end
 

lib/rails_stats/console_formatter.rb

@@ -1,6 +1,10 @@
+require "bundler/stats/cli"
+
 module RailsStats
   class ConsoleFormatter < StatsFormatter
     def to_s
+      Bundler::Stats::CLI.start
+
       print_header
       sorted_keys = @statistics.keys.sort
       sorted_keys.each { |key| print_line(key, @statistics[key]) }

rails_stats.gemspec

@@ -19,12 +19,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake"
-  spec.add_development_dependency "bundler", ">= 1.6", "< 3.0"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "codecov"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-around"
-  spec.add_development_dependency "minitest-spec-context"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-console"
+  spec.add_dependency "bundler-stats", ">= 2.1"
 end

test/dummy/lib/monkeypatches.rb

@@ -0,0 +1 @@
+puts "Monkeypatches go here"

test/dummy/spec/models/user_spec.rb

@@ -0,0 +1,3 @@
+class FooBar
+
+end

test/dummy/spec/support/support_file.rb

@@ -0,0 +1 @@
+puts "This is a spec support file"

test/dummy/test/models/user_test.rb

@@ -0,0 +1,2 @@
+class UserTest
+end