wcc-base 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b315171b9971db51111de42a8765ea911c174554
-  data.tar.gz: 4e01c9bc609bbda1536c50e8f694081174c37893
+  metadata.gz: e5ffcb2f194975822128b22d2974798fa6f55c2b
+  data.tar.gz: c48c096a7543d02f4cfe0a5db226a13ef60fd4aa
 SHA512:
-  metadata.gz: 50c8c8805c6ed40b0df94c01f9de2da3d67e463790bc0aeabe13f8cbeb0c10825ed5267cee161db076875d49fea0ed5c660c52fb1a47ac5a8abbeb6b5608576f
-  data.tar.gz: 2b9c223e56fb34ca0b42da8cabb2efd825bcfc34a76549571d3a219c4c2b3b10ed9b487461041117e9534dc946d87dbbdbf27fd52f8a5d6e88640e92af291ea5
+  metadata.gz: a40deac1be76edbaa952ba2477c091afaaf74a3eade3a2e09091f10d15f3fad30ec0c494e5c0ac6375fab7c6c15e8b31702b5eaac52e79c534bb11d47b2713b4
+  data.tar.gz: 2d113be9c9dce854322ac690f52b14e87f511fc20902b8c1a3394dd878af0ef379a05b4c070645ae003428c1605bbb33652429ec28cb9583b92f0ec3c08716f7

data/lib/tasks/db.rake

@@ -2,7 +2,7 @@ module WCC
   module RakeHelpers
 
     def self.db_config
-      @config ||= db_config_file_data[ENV['RAILS_ENV'] || 'development'] || {}
+      db_config_file_data[ENV['RAILS_ENV'] || 'development'] || {}
     end
 
     def self.db_cmd_with_password(cmd, pw)
@@ -22,10 +22,10 @@ module WCC
     end
 
     def self.db_config_file_data
-      if defined?(ActiveRecord::Base)
+      if defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.present?
         ActiveRecord::Base.configurations
       else
-        YAML.load_file("config/database.yml")
+        @yaml_file ||= YAML.load_file("config/database.yml")
       end
     rescue SystemCallError
       {}

data/lib/tasks/db/psql.rake

@@ -15,7 +15,7 @@ namespace :db do
   Rake::Task['db:drop'].enhance ['db:drop_pg_connections']
 
   desc 'Dump the pg database to the specified file'
-  task :dump, :file do |t, args|
+  task :dump, [:file] => :environment do |t, args|
     raise "file argument required" unless args[:file]
     db_config = WCC::RakeHelpers.db_config
     command = [
@@ -29,7 +29,7 @@ namespace :db do
   end
 
   desc 'Restore the pg datbase from the specified file'
-  task :restore, :file do |t, args|
+  task :restore, [:file] => :environment do |t, args|
     raise "file argument required" unless File.exists?(args[:file])
     db_config = WCC::RakeHelpers.db_config
     case File.extname(args[:file])

data/lib/wcc/version.rb

@@ -1,3 +1,3 @@
 module WCC
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-base
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Watermark Community Church
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler