From d35c5fff985ad435525b0b0afe20b1e47c11df83 Mon Sep 17 00:00:00 2001 From: Chris Oliver Date: Thu, 8 Aug 2024 19:35:34 -0500 Subject: [PATCH] Simplify --- Gemfile | 11 +++++------ Gemfile.lock | 8 -------- gemfiles/rails_6_1.gemfile | 11 +++++------ gemfiles/rails_7.gemfile | 10 +++++----- gemfiles/rails_7.gemfile.lock | 16 ++++++++-------- gemfiles/rails_7_1.gemfile | 10 +++++----- gemfiles/rails_7_1.gemfile.lock | 16 ++++++++-------- gemfiles/rails_7_2.gemfile | 10 +++++----- gemfiles/rails_7_2.gemfile.lock | 16 ++++++++-------- gemfiles/rails_main.gemfile | 10 +++++----- gemfiles/rails_main.gemfile.lock | 16 ++++++++-------- test/test_helper.rb | 10 ---------- 12 files changed, 62 insertions(+), 82 deletions(-) diff --git a/Gemfile b/Gemfile index 6231fb3..fe2fff9 100644 --- a/Gemfile +++ b/Gemfile @@ -12,16 +12,15 @@ gemspec # your gem to rubygems.org. gem "appraisal" -gem "standardrb" +gem "bcrypt" gem "ffaker", "~> 2.17" -gem "name_of_person", "~> 1.1", ">= 1.1.1" -gem "sprockets-rails" -gem "simplecov", group: :test -gem "web-console", group: :development gem "friendly_id", "~> 5.4" -gem "bcrypt" +gem "name_of_person", "~> 1.1", ">= 1.1.1" gem "paper_trail", "~> 15.0" gem "puma" +gem "sprockets-rails" +gem "standardrb" +gem "web-console" # Databases to test against gem "pg" diff --git a/Gemfile.lock b/Gemfile.lock index 90bc8f9..8358487 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,6 @@ GEM connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - docile (1.4.1) drb (2.2.1) erubi (1.13.0) ffaker (2.23.0) @@ -227,12 +226,6 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -298,7 +291,6 @@ DEPENDENCIES paper_trail (~> 15.0) pg puma - simplecov sprockets-rails sqlite3 (~> 1.4) standardrb diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 5516209..2b86c1d 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -3,19 +3,18 @@ source "https://rubygems.org" gem "appraisal" -gem "standardrb" +gem "bcrypt" gem "ffaker", "~> 2.17" -gem "name_of_person", "~> 1.1", ">= 1.1.1" -gem "simplecov", group: :test -gem "web-console", group: :development gem "friendly_id", "~> 5.4" -gem "bcrypt" +gem "name_of_person", "~> 1.1", ">= 1.1.1" gem "paper_trail", "~> 15.0" gem "puma" +gem "sprockets-rails" +gem "standardrb" +gem "web-console" gem "pg" gem "mysql2" gem "sqlite3", "~> 1.4" gem "rails", "~> 6.1.0" -gem "sprockets-rails" gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 4cff1a1..c5cf6fb 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -3,15 +3,15 @@ source "https://rubygems.org" gem "appraisal" -gem "standardrb" +gem "bcrypt" gem "ffaker", "~> 2.17" -gem "name_of_person", "~> 1.1", ">= 1.1.1" -gem "simplecov", group: :test -gem "web-console", group: :development gem "friendly_id", "~> 5.4" -gem "bcrypt" +gem "name_of_person", "~> 1.1", ">= 1.1.1" gem "paper_trail", "~> 15.0" gem "puma" +gem "sprockets-rails" +gem "standardrb" +gem "web-console" gem "pg" gem "mysql2" gem "sqlite3", "~> 1.4" diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock index 0411c3d..a34b04d 100644 --- a/gemfiles/rails_7.gemfile.lock +++ b/gemfiles/rails_7.gemfile.lock @@ -84,7 +84,6 @@ GEM concurrent-ruby (1.3.3) crass (1.0.6) date (3.3.4) - docile (1.4.0) erubi (1.12.0) ffaker (2.23.0) friendly_id (5.5.1) @@ -203,12 +202,13 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) sqlite3 (1.7.3-arm64-darwin) @@ -267,7 +267,7 @@ DEPENDENCIES propshaft puma rails (~> 7.0.0) - simplecov + sprockets-rails sqlite3 (~> 1.4) standardrb web-console diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index 1fdf528..0b08220 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -3,15 +3,15 @@ source "https://rubygems.org" gem "appraisal" -gem "standardrb" +gem "bcrypt" gem "ffaker", "~> 2.17" -gem "name_of_person", "~> 1.1", ">= 1.1.1" -gem "simplecov", group: :test -gem "web-console", group: :development gem "friendly_id", "~> 5.4" -gem "bcrypt" +gem "name_of_person", "~> 1.1", ">= 1.1.1" gem "paper_trail", "~> 15.0" gem "puma" +gem "sprockets-rails" +gem "standardrb" +gem "web-console" gem "pg" gem "mysql2" gem "sqlite3", "~> 1.4" diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock index ee7623f..4a673f7 100644 --- a/gemfiles/rails_7_1.gemfile.lock +++ b/gemfiles/rails_7_1.gemfile.lock @@ -96,7 +96,6 @@ GEM connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - docile (1.4.0) drb (2.2.1) erubi (1.12.0) ffaker (2.23.0) @@ -232,12 +231,13 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) sqlite3 (1.7.3-arm64-darwin) @@ -298,7 +298,7 @@ DEPENDENCIES propshaft puma rails (~> 7.1.0) - simplecov + sprockets-rails sqlite3 (~> 1.4) standardrb web-console diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile index 384f41a..aa072c3 100644 --- a/gemfiles/rails_7_2.gemfile +++ b/gemfiles/rails_7_2.gemfile @@ -3,15 +3,15 @@ source "https://rubygems.org" gem "appraisal" -gem "standardrb" +gem "bcrypt" gem "ffaker", "~> 2.17" -gem "name_of_person", "~> 1.1", ">= 1.1.1" -gem "simplecov", group: :test -gem "web-console", group: :development gem "friendly_id", "~> 5.4" -gem "bcrypt" +gem "name_of_person", "~> 1.1", ">= 1.1.1" gem "paper_trail", "~> 15.0" gem "puma" +gem "sprockets-rails" +gem "standardrb" +gem "web-console" gem "pg" gem "mysql2" gem "sqlite3", "~> 2.0" diff --git a/gemfiles/rails_7_2.gemfile.lock b/gemfiles/rails_7_2.gemfile.lock index 82884c7..e84b6b5 100644 --- a/gemfiles/rails_7_2.gemfile.lock +++ b/gemfiles/rails_7_2.gemfile.lock @@ -90,7 +90,6 @@ GEM connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - docile (1.4.0) drb (2.2.1) erubi (1.12.0) ffaker (2.23.0) @@ -227,12 +226,13 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) sqlite3 (2.0.2-aarch64-linux-gnu) sqlite3 (2.0.2-arm-linux-gnu) sqlite3 (2.0.2-arm64-darwin) @@ -293,7 +293,7 @@ DEPENDENCIES propshaft puma rails (~> 7.2.0.beta2) - simplecov + sprockets-rails sqlite3 (~> 2.0) standardrb web-console diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile index 29fa302..b00dc5a 100644 --- a/gemfiles/rails_main.gemfile +++ b/gemfiles/rails_main.gemfile @@ -3,15 +3,15 @@ source "https://rubygems.org" gem "appraisal" -gem "standardrb" +gem "bcrypt" gem "ffaker", "~> 2.17" -gem "name_of_person", "~> 1.1", ">= 1.1.1" -gem "simplecov", group: :test -gem "web-console", group: :development gem "friendly_id", "~> 5.4" -gem "bcrypt" +gem "name_of_person", "~> 1.1", ">= 1.1.1" gem "paper_trail", "~> 15.0" gem "puma" +gem "sprockets-rails" +gem "standardrb" +gem "web-console" gem "pg" gem "mysql2" gem "sqlite3", "~> 2.0" diff --git a/gemfiles/rails_main.gemfile.lock b/gemfiles/rails_main.gemfile.lock index 828976a..32182b0 100644 --- a/gemfiles/rails_main.gemfile.lock +++ b/gemfiles/rails_main.gemfile.lock @@ -118,7 +118,6 @@ GEM connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - docile (1.4.0) drb (2.2.1) erubi (1.12.0) ffaker (2.23.0) @@ -232,12 +231,13 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) sqlite3 (2.0.2) mini_portile2 (~> 2.8.0) sqlite3 (2.0.2-arm64-darwin) @@ -299,7 +299,7 @@ DEPENDENCIES propshaft puma rails! - simplecov + sprockets-rails sqlite3 (~> 2.0) standardrb web-console diff --git a/test/test_helper.rb b/test/test_helper.rb index e1bcbf8..7fd8aeb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,13 +1,3 @@ -# Configure SimpleCov -if ENV["COVERAGE"] == "true" - puts "Calculating Code Coverage with SimpleCov" - - require "simplecov" - SimpleCov.start "rails" - - puts "Required SimpleCov" -end - # Configure Rails Environment ENV["RAILS_ENV"] = "test"