phenix 0.3.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e5ee1863ab6fb76d4f2ee85d8dc37f6b1298ebe
-  data.tar.gz: e75d5e0a0c7a582559a1e54a63affcb29e7c322c
+SHA256:
+  metadata.gz: 58a44d30d1fa3381afa8430a76cd2b17800c7fecdbe78a21a1af6a23e9a7d0fb
+  data.tar.gz: 5497fc3d6e5735a320177c95d2b55784c8399be847b8471bf2fed0a28a45e750
 SHA512:
-  metadata.gz: 0a8a74352d9cc56ccc1043a36d231bc8a30ecc30ca7320d3697288dff8cb07364b03e5cf8738a65f18dc4fde8be5ad82fe1035ca99829bf2bdf5135628ca6fb2
-  data.tar.gz: 0defc7e17a2a5088c7857222cbd29178ca9b04cad9c2696679d4fba3c0e9f18109c443c845826629268e5090c36e65eee0b1bd70da322624e05e3eacabf43d74
+  metadata.gz: bd3abcc151bcaed345375ab9c6baf11543f1c06afe36df21911c6adc820e959d92ca09b3de37ac08fde562f7d65059717876afac17981fee0224ee78b97060d3
+  data.tar.gz: d3f550a2f0fae38458cdfbdc604707fa8bf24961525c1b1a20e1024588168123962fa4c8e96d6c17c34570518215628c8a2f0e704d1a6d4e282535bd9b8cf821

data/lib/phenix.rb

@@ -3,6 +3,13 @@ require 'phenix/version'
 require 'erb'
 
 module Phenix
+  CONFIG_TO_MYSQL_MAPPING = {
+    'username' => 'user',
+    'password' => 'password',
+    'port' => 'port',
+    'host' => 'host'
+  }.freeze
+
   class << self
     attr_accessor :database_config_path, :schema_path, :skip_database
     attr_accessor :current_configuration
@@ -36,15 +43,18 @@ module Phenix
 
   def create_databases(with_schema)
     for_each_database do |name, conf|
-      run_mysql_command(conf, "CREATE DATABASE #{conf['database']}")
+      run_mysql_command(conf, "CREATE DATABASE IF NOT EXISTS #{conf['database']}")
       ActiveRecord::Base.establish_connection(name.to_sym)
       populate_database if with_schema
     end
   end
 
   def populate_database
+    old = ActiveRecord::Migration.verbose
     ActiveRecord::Migration.verbose = false
     load(Phenix.schema_path)
+  ensure
+    ActiveRecord::Migration.verbose = old
   end
 
   def drop_databases
@@ -54,25 +64,39 @@ module Phenix
   end
 
   def for_each_database
-    ActiveRecord::Base.configurations.each do |name, conf|
+    configuration_hashes = if ActiveRecord::VERSION::STRING < '6.1'
+      ActiveRecord::Base.configurations.to_h
+    else
+      # We need to get all the configurations and put them back into a hash
+      # indexed by the env_name and with configuration_hash as the value.
+      ActiveRecord::Base.configurations
+        .configurations
+        .map { |c| [c.env_name, c.configuration_hash.with_indifferent_access] }
+        .to_h
+    end
+
+    configuration_hashes.each do |name, conf|
       next if conf['database'].nil?
       next if Phenix.skip_database.call(name, conf)
       yield(name, conf)
     end
   end
 
-  def run_mysql_command(conf, command)
-    @mysql_command ||= begin
-      commands = [
-        'mysql',
-        "--user=#{conf['username']}"
-      ]
-      commands << "--host=#{conf['host']}" if conf['host'].present?
-      commands << "--port=#{conf['port']}" if conf['port'].present?
-      commands << " --password=#{conf['password']} 2> /dev/null" if conf['password'].present?
-      commands.join(' ')
+  def run_mysql_command(config, execute)
+    command = ['mysql']
+    CONFIG_TO_MYSQL_MAPPING.each do |c, m|
+      if config.key?(c)
+        command << "--#{m}=#{config.fetch(c)}"
+      end
     end
-    `echo "#{command}" | #{@mysql_command}`
+    command << "--execute"
+    command << execute
+
+    pio = IO.popen(command, err: '/dev/null')
+    result = pio.read
+    pio.close
+    raise "Failed to execute #{execute}" unless $?.success?
+    result
   end
 
   extend self

data/lib/phenix/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Phenix
-  VERSION = '0.3.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phenix
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Pierre Schambacher
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,34 +30,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: single_cov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,7 +114,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - pschambacher@zendesk.com
 executables: []
@@ -126,7 +126,7 @@ files:
 homepage: https://github.com/zendesk/phenix
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.9
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: Read a dynamic database.yml file and allow you to drop/create the database
   on demand.