phenix 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5ee1863ab6fb76d4f2ee85d8dc37f6b1298ebe
-  data.tar.gz: e75d5e0a0c7a582559a1e54a63affcb29e7c322c
+  metadata.gz: 02c40fe211c590d4f7ba84d7133271b50669088d
+  data.tar.gz: 25735809d7f5d851b18081a2bfd0ec2de39298a7
 SHA512:
-  metadata.gz: 0a8a74352d9cc56ccc1043a36d231bc8a30ecc30ca7320d3697288dff8cb07364b03e5cf8738a65f18dc4fde8be5ad82fe1035ca99829bf2bdf5135628ca6fb2
-  data.tar.gz: 0defc7e17a2a5088c7857222cbd29178ca9b04cad9c2696679d4fba3c0e9f18109c443c845826629268e5090c36e65eee0b1bd70da322624e05e3eacabf43d74
+  metadata.gz: 3713144e578b2a711a8f56d8be89bd2f458922dcb5ed63a0fff078c74d1243f3d77b07ee67813a1b8769ab8d30770a8fe4b395287c6a49ef68e0df2584a69946
+  data.tar.gz: ad56ea002acc7c2e03864779ffae8b4410b50f66d151757a64e18fc1573f7ee80697b21858ec132f30afd6273f1c0c2dd9ea6e7c308b7e3c320744aa43b44714

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
@@ -61,18 +71,21 @@ module Phenix
     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 v = config[c].presence
+        command << "--#{m}" << v.to_s
+      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.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phenix
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pierre Schambacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -142,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Read a dynamic database.yml file and allow you to drop/create the database