wcc-base 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94205352d36070433943dc9b9de961e0f450a09a
-  data.tar.gz: 574d9df4a23fad35a5ec0608217ceb0400e5af88
+SHA256:
+  metadata.gz: 84554c7dfd673da7c898380cd9eaa8e6eee6c2695d86a68ddc8b89e6b022d3f9
+  data.tar.gz: c81d63b4dfcfde12dcfe67d1643e0810976f3bccce059d82b250b8ded93d8568
 SHA512:
-  metadata.gz: 0f4203cd6329d356ec87be65f932396447b1d15509a29e4f87adbdd0d3e0e48401914a2208008acce49ca58d295d037bc892372c17f6988e345f87c876e3a836
-  data.tar.gz: 1a42d129b62153187a8ad30a609196a82f7a54b768db9d8730aee41156d2f49393eed7c10aa20aa489a1031911467804dbf227e095f22b245d757d78e314ad2e
+  metadata.gz: 0e5f543a9f03040b44532ef3ba73a6e03133166c7a1d6c93b55a7134e46762aa2047e8fe18aa1d83ed1f2f4e347eb040bee6f209bee671f4455fe88dce1db918
+  data.tar.gz: dfd1cc3e64ccd6b85306c2834c17452093a7f19ba8d8b752d41a3def000e3987c0180e0e84c98daedb4e30c47c57ea64bc8795eb2b2e61bf130fef304352bcdd

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)
@@ -25,7 +30,7 @@ module WCC
       if defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.present?
         ActiveRecord::Base.configurations
       else
-        @yaml_file ||= YAML.load(ERB.new(File.read('config/database.yml' )).result)
+        @yaml_file ||= YAML.load(ERB.new(File.read('config/database.yml' )).result, aliases: true)
       end
     rescue SystemCallError
       {}

data/lib/wcc/version.rb

@@ -1,3 +1,3 @@
 module WCC
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 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.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Watermark Community Church
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2024-03-07 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.2.15
+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