phenix 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81c4943e9dba3f20d4235b48c51591d815cebe8c
-  data.tar.gz: 3edbc9630ea3fff246534143f6a4f94c382339d3
+SHA256:
+  metadata.gz: 6579c2a43b814939fee5b7be5aaa1e4ab6e316b3c4e9dc735500c033bf4d43cb
+  data.tar.gz: d76b5c29e32c18bec0ba0e17a6e0c3a907db937c8bbaac7dcce469c754107893
 SHA512:
-  metadata.gz: ff6734fb4457dde177334ce4c815793769e5477795fe949eac9776742e49a759938bfe37f84d769c10da0f2a72ab6f30d98c048ddcca30d6ee900efe1a0cb515
-  data.tar.gz: e148db5446d212736e3769da620a7bfe2ad1dae52f0c14a3201adb014c9b4247341c15343b3b1182cc24993221544efe2d8e62fbe4641b5d3c5105bfeb28d521
+  metadata.gz: 244b06ae752cfefdb33c15b2dd013950aed5d05c31ba651d8aba36aab319390e8f4e1853b0ee56f13a3095c2f908c00f3433f459d0945fd9ca4e4fddfe829fae
+  data.tar.gz: 1032af97f7da4fd21c98b1fb8dbd50f8a9b85597dbe23f5c973394b0f41f5c01dc30ed3af2e8e68d6fd83bdac79de34027abf436832460dbd6b0674773be096f

data/lib/phenix.rb

@@ -1,7 +1,15 @@
+# frozen_string_literal: true
 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
@@ -35,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
@@ -53,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,3 +1,4 @@
+# frozen_string_literal: true
 module Phenix
-  VERSION = '0.2.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phenix
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Pierre Schambacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2020-11-10 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.1'
+        version: '6.1'
   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.1'
+        version: '6.1'
 - !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
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - pschambacher@zendesk.com
@@ -141,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Read a dynamic database.yml file and allow you to drop/create the database