bleib 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6fa5132b7e6a2a8e711ae6344c9301827dd85292847239ac7ce80f0a76d2ea1
-  data.tar.gz: 3ac0d02964d70e9cf5ce16fe25e0f6dec5827770e55ddac1052bd61973cbdad2
+  metadata.gz: 68851b89d057d623d8722d8f963d2e4d39bed6f503faa8b5cddd38866332151b
+  data.tar.gz: 34f282b7406cf20998405a417a8851e53ffec5c5e4dae3c708a26489d8d0acaf
 SHA512:
-  metadata.gz: 06bbfd17d0eb644385eeb352af430da3ac94c0d4adcb6fbf3f08340958163ff6f0a6bf06b6646d14ab57bddb5c6124e9a8bcee884c14258dd9d59b1fc4e040d5
-  data.tar.gz: d3ab55b5c415b858ff04c4ad34a97835aa48dfa0cf27ec96c04c4790bcf8851c6c9821ba3329d17f782133021afbf9c48b8e3457143e6b3072718c57d8b35ba0
+  metadata.gz: 242c84b8082fc4834274a9d8eda8292c252905420f6302477fdd1693e59168241a997571a848a825856eb17088069e812bd22e03cafe2b7f556c5e6451dfcdcc
+  data.tar.gz: 271a6e8459260fa37c3640b658c48dce12a04d8d118ede656fdefd5886ba0c86e46314fbb26f82ce841d6408477e304c00ee87191d0ed67ba7a3a4736dfba144

data/lib/bleib/configuration.rb

@@ -79,10 +79,19 @@ module Bleib
 
     def self.rails_database(database_yml_path, rails_env)
       contents = File.read(database_yml_path)
-      config = YAML.load(ERB.new(contents).result)
+      config = load_yaml(ERB.new(contents).result)
       config[rails_env]
     end
 
+    # Psych 4 Patch: https://github.com/rails/rails/commit/179d0a1f474ada02e0030ac3bd062fc653765dbe
+    def self.load_yaml(content)
+      begin
+        YAML.load(content, aliases: true)
+      rescue ArgumentError
+        YAML.load(content)
+      end
+    end
+
     def check!
       # We should add clean rescue statements to
       # `Bleib::Database#database_down?`to support

data/lib/bleib/migrations.rb

@@ -54,11 +54,10 @@ module Bleib
     end
 
     def in_all_tenant_contexts
-      tenants = []
-      tenants << ENV.fetch('BLEIB_DEFAULT_TENANT', 'public')
-      Apartment::Tenant.each { |tenant| tenants << tenant }
+      tenants = [ENV.fetch('BLEIB_DEFAULT_TENANT', 'public')] +
+                Apartment.tenant_names
 
-      tenants.each do |tenant|
+      tenants.uniq.each do |tenant|
         Apartment::Tenant.switch(tenant) do
           yield
         end

data/lib/bleib/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bleib
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bleib
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Puzzle ITC
@@ -12,7 +12,7 @@ date: 2018-10-04 00:00:00.000000000 Z
 dependencies: []
 description: Intended for use in containerized setups whereanother component takes
   care of migrating the database.
-email: raez@puzzle.ch
+email: viehweger@puzzle.ch
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -45,8 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Use a rake task to wait on database and migrations.