wcc-base 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f9d11630c92acd1e2b18c378967c894665057f6
-  data.tar.gz: 91bfaafff00de40d02fa6fec58292603b24d8f75
+SHA256:
+  metadata.gz: f1d242e0c67ebac9ba3f5f96a40a88cb0185c9d0207b29cab52c9abcd0b0a687
+  data.tar.gz: f45dbdc6a425dbeb7af1b53c9185b2784f9ef2967887e9d379790460da198572
 SHA512:
-  metadata.gz: 7ba2e1bbf29ada69f150a6cd31a6c4b6c6a47dddd60afd3068401f0b165b3a44a3eabdf11743e9a8ebba4ba36e82f46d7c1fa06401f06d49da1cb5b440cfbae5
-  data.tar.gz: 0f5b94c87373d060d7eb46ed8216afb4b6272c722fb9fd78a35a26d39caa2e9babea64d81e5baa18e8880335305bf77c234f52d5d544379ef4a665974ca06a85
+  metadata.gz: 1628357da582b78aac9d10308635381cbee83b343f2acc0714875f90e2393a9e6a045080c37a46441e31f896771e12c837bacc6e12bef108b767add474787001
+  data.tar.gz: ab922684f27c8d00bf284bea2c17f39b20b1730b05bf02c0f39a64662bf90624769e532805db51fb5afd639486dc9dbc67f4539f8c172ba1006863735c5bd8ff

data/lib/tasks/db.rake

@@ -2,7 +2,12 @@ module WCC
   module RakeHelpers
 
     def self.db_config
-      db_config_file_data[ENV['RAILS_ENV'] || 'development'] || {}
+      if Rails::VERSION::MAJOR >= 7
+        configs = db_config_file_data.configs_for(env_name: ENV['RAILS_ENV'] || 'development')
+        configs.any? ? configs[0].configuration_hash : {}
+      else
+        db_config_file_data[ENV['RAILS_ENV'] || 'development'] || {}
+      end
     end
 
     def self.db_cmd_with_password(cmd, pw)
@@ -10,36 +15,30 @@ module WCC
     end
 
     def self.db_cmd_with_password_string(cmd, pw)
-      %{PGPASSWORD="#{pw}" #{cmd.join(" ")}}
+      %{PGPASSWORD='#{pw}' #{cmd.join(' ')}}
     end
 
     def self.postgresql?
-      db_config["adapter"] == "postgresql"
+      db_config['adapter'] == 'postgresql'
     end
 
     def self.mysql?
-      db_config["adapter"] == "mysql"
+      db_config['adapter'] == 'mysql'
     end
 
     def self.db_config_file_data
       if defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.present?
         ActiveRecord::Base.configurations
       else
-        @yaml_file ||= YAML.load(
-          ERB.new(File.read("#{app_dir}/config/database.yml" )).result
-        )
+        @yaml_file ||= YAML.load(ERB.new(File.read('config/database.yml' )).result)
       end
     rescue SystemCallError
       {}
     end
-
   end
 end
 
 namespace :db do
-
-  desc "Drops, creates, migrates, seeds dev DB and prepares test DB"
-  task :rebuild => ["db:drop", "db:create", "db:migrate", "db:seed", "db:test:prepare"]
-
+  desc 'Drops, creates, migrates, seeds dev DB and prepares test DB'
+  task rebuild: %w[db:drop db:create db:migrate db:seed db:test:prepare]
 end
-

data/lib/wcc/version.rb

@@ -1,3 +1,3 @@
 module WCC
-  VERSION = "0.3.0"
+  VERSION = '0.3.2'
 end

data/wcc-base.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wcc-base
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Watermark Community Church
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +48,7 @@ homepage: https://github.com/watermarkchurch/wcc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,9 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: "# WCC  This gem holds the base namespace and default configuration for Watermark
   Community Church's Ruby development. This is kind of the general repository for