Merge pull request #26 from fastruby/fixes/skunk-action

Run compare only when we are running action within a PR (branch != "master")

Author: etagwerker

.github/workflows/skunk.yml

@@ -1,5 +1,5 @@
 name: Skunk
-on: [push, pull_request]
+on: [push]
 
 jobs:
   skunk:
@@ -11,14 +11,19 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: 2.6.x
+      - name: Run test suite with COVERAGE=true
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          COVERAGE=true bundle exec rake test
       - name: Run Skunk on Project
         run: |
           gem install skunk
           CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-          if [[ "$CURRENT_BRANCH" -ne "master" ]]; then
+          if [[ "$CURRENT_BRANCH" != "master" ]]; then
             echo "Executing within branch: $CURRENT_BRANCH"
-            skunk lib/
+            skunk lib/ -b master
           else
             echo "Executing within master branch"
-            skunk lib/ -b master
+            skunk lib/
           fi

Gemfile.lock

@@ -37,7 +37,6 @@ GEM
       sexp_processor (~> 4.8)
     ice_nine (0.11.2)
     jaro_winkler (1.5.4)
-    json (2.2.0)
     kwalify (0.7.2)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -80,15 +79,14 @@ GEM
       tty-which (~> 0.4.0)
       virtus (~> 1.0)
     sexp_processor (4.14.0)
-    simplecov (0.17.1)
+    simplecov (0.18.1)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
+      simplecov-html (~> 0.11.0)
     simplecov-console (0.5.0)
       ansi
       simplecov
       terminal-table
-    simplecov-html (0.10.2)
+    simplecov-html (0.11.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
@@ -111,7 +109,7 @@ DEPENDENCIES
   rake (~> 10.0)
   reek (~> 5.4.0)
   rubocop (< 1.0)
-  simplecov (~> 0.17.1)
+  simplecov (~> 0.18.1)
   simplecov-console (= 0.5.0)
   skunk!
 

lib/skunk/cli/commands/compare.rb

@@ -30,9 +30,9 @@ def analyse_modified_files
       # create a txt file with the branch score details
       def build_details
         details = "Base branch (#{::RubyCritic::Config.base_branch}) "\
-          "average stink score: #{::RubyCritic::Config.base_branch_score} \n"\
+          "average stink score: #{::RubyCritic::Config.base_branch_score.to_f.round(2)} \n"\
           "Feature branch (#{::RubyCritic::Config.feature_branch}) "\
-          "average stink score: #{::RubyCritic::Config.feature_branch_score} \n"
+          "average stink score: #{::RubyCritic::Config.feature_branch_score.to_f.round(2)} \n"
         Skunk::Command::Output.create_directory(::RubyCritic::Config.compare_root_directory)
         File.open(build_details_path, "w") { |file| file.write(details) }
         puts details

lib/skunk/cli/commands/status_reporter.rb

@@ -64,7 +64,7 @@ def total_churn_times_cost
       def stink_score_average
         return 0 if analysed_modules_count.zero?
 
-        (total_stink_score.to_d / analysed_modules_count).to_f
+        (total_stink_score.to_d / analysed_modules_count).to_f.round(2)
       end
 
       def table_options

skunk.gemspec

@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "reek", "~> 5.4.0"
   spec.add_development_dependency "rubocop", "< 1.0"
-  spec.add_development_dependency "simplecov", "~> 0.17.1"
+  spec.add_development_dependency "simplecov", "~> 0.18.1"
   spec.add_development_dependency "simplecov-console", "0.5.0"
 end

test/test_helper.rb

@@ -10,7 +10,7 @@
   ]
 
   SimpleCov.start do
-    track_files "/lib/"
+    track_files "lib/**/*.rb"
   end
 end