convergence 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a094b6afa402acbb8e29b69c60580f89322b8437
-  data.tar.gz: 39ad0cfc2bcefed5cb2fcc365d73484933fcb017
+SHA256:
+  metadata.gz: d589a1c75e088d6e45f8dc8b3d0afdab65025b9f6ac1cb1abf919703dbc34682
+  data.tar.gz: e01d8e2e02c26f1c9d8bc80a7aeb2e3b425eded2c138203d3cb8e3ad602ab7d9
 SHA512:
-  metadata.gz: c6bd2505d21ab261de51ed9c08b38a09954333c192e919d21afa2c79abb2c444e6ef044ca23c33872b1a762c4bfa7cd814744f9de4c7d3ebf024f9fc50776696
-  data.tar.gz: 806d68d3b11c388ded5932d6f68e89520e4c70dfab1c90d5dc3f0590257e5abbfec6600461e016458aa2c4afd444d2d88e51465af5866c8e5893db19178b78a7
+  metadata.gz: 2622208e674c2192813556e25911b72db056fc57a369928e99047efcc97e66f7b152a1a2e8bec37f5aba7ddc27831d27357b9cea5d8aecda2526ae844f0068a0
+  data.tar.gz: ec99f89c4803f0dd2033d915de708b01b5d7e176c80f483e2abcdab9ecade94991992f2f67dbc9e54bded4dbf4501b99aaa01e308c5d8b54d833868d2010418c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Convergence 1.0.2 (May 24, 2019) ##
+
+* Support ssl connections (PR: #69)
+
+  *yujideveloper*
+
 ## Convergence 1.0.1 (September 27, 2018) ##
 
 * Add Rollback Dryrun command (PR: #64)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    convergence (1.0.1)
+    convergence (1.0.2)
       diff-lcs
       diffy
       mysql2
@@ -13,8 +13,8 @@ GEM
     ast (2.3.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    diffy (3.2.1)
-    ffi (1.9.18)
+    diffy (3.3.0)
+    ffi (1.11.1)
     formatador (0.2.5)
     guard (2.14.1)
       formatador (>= 0.2.4)
@@ -94,4 +94,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.3
+   1.17.1

data/convergence.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'diffy'
   spec.add_dependency 'thor', '~> 0.20'
 
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.4.0"
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/convergence/cli.rb

@@ -5,8 +5,6 @@ require 'convergence/module'
 require 'convergence/config'
 
 class Convergence::CLI < Thor
-  default_command :__fallback # TODO: `__fallback` will be removed in a future version(maybe v1.1.0)
-
   map %w[--version -v] => :version
 
   desc 'apply FILE', 'execute sql to your database'
@@ -48,61 +46,10 @@ class Convergence::CLI < Thor
     puts "version #{Convergence::VERSION}"
   end
 
-  # TODO: `__fallback` will be removed in a future version(maybe v1.1.0)
-  desc '', '', hide: true
-  method_option :config,
-                aliases: '-c', type: :string,
-                desc: 'Database Yaml Setting'
-  method_option :diff,
-                aliases: '-d', type: :array, default: nil,
-                banner: 'DSL1 DSL2'
-  method_option :export,
-                aliases: '-e', type: :boolean, default: false,
-                desc: 'export db schema to dsl'
-  method_option :input,
-                aliases: '-i', type: :string,
-                desc: 'Input DSL'
-  method_option :dryrun,
-                type: :boolean, default: false
-  method_option :apply,
-                type: :boolean, default: false,
-                desc: 'execute sql to your database'
-  def __fallback
-    command_klass =
-      if !options[:diff].nil? && !options[:diff].empty?
-        require 'convergence/command/diff'
-        opts = { diff: options[:diff] }
-        Convergence::Command::Diff
-      elsif options[:export]
-        require 'convergence/command/export'
-        opts = {}
-        Convergence::Command::Export
-      elsif options[:dryrun]
-        require 'convergence/command/dryrun'
-        opts = { input: options[:input] }
-        Convergence::Command::Dryrun
-      elsif options[:apply]
-        require 'convergence/command/apply'
-        opts = { input: options[:input] }
-        Convergence::Command::Apply
-      end
-
-    if command_klass
-      deprecation_warning
-      command_klass.new(opts, config: config).execute
-    else
-      help
-    end
-  end
-
   private
 
   def config
     return unless options[:config]
     @config ||= Convergence::Config.load(options[:config])
   end
-
-  def deprecation_warning
-    warn '[DEPRECATION] Flag style command is deprecated. Please use sub-command style instead.'
-  end
 end

data/lib/convergence/command.rb

@@ -12,6 +12,8 @@ class Convergence::Command
     end
   end
 
+  private
+
   def database_adapter
     @config.nil? ? 'mysql' : @config.adapter
   end
@@ -30,16 +32,6 @@ class Convergence::Command
                 end
   end
 
-  def sql_generator
-    @sql_generator ||= case database_adapter
-                       when 'mysql', 'mysql2'
-                         require 'convergence/sql_generator/mysql_generator'
-                         SQLGenerator::MysqlGenerator.new
-                       else
-                         fail NotImplementedError.new('unknown database adapter')
-                       end
-  end
-
   def logger
     @logger ||= Convergence::Logger.new
   end

data/lib/convergence/command/apply.rb

@@ -6,19 +6,34 @@ require 'convergence/default_parameter'
 require 'convergence/diff'
 
 class Convergence::Command::Apply < Convergence::Command
-  def validate!
-    fail ArgumentError.new('config required') if @config.nil?
-    fail ArgumentError.new('input required') unless @opts[:input]
-  end
-
   def execute
-    validate!
     current_dir_path = Pathname.new(@opts[:input]).realpath.dirname
     input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read, current_dir_path)
     current_tables = dumper.dump
     execute_sql(input_tables, current_tables)
   end
 
+  def generate_sql(input_tables, current_tables)
+    current_tables_with_full_option =
+      Convergence::DefaultParameter.append_database_default_parameter(current_tables, database_adapter)
+    input_tables_with_full_option =
+      Convergence::DefaultParameter.append_database_default_parameter(input_tables, database_adapter)
+    delta = Convergence::Diff.new.diff(current_tables_with_full_option, input_tables_with_full_option)
+    sql_generator.generate(input_tables_with_full_option, delta, current_tables_with_full_option)
+  end
+
+  private
+
+  def sql_generator
+    @sql_generator ||= case database_adapter
+                       when 'mysql', 'mysql2'
+                         require 'convergence/sql_generator/mysql_generator'
+                         SQLGenerator::MysqlGenerator.new
+                       else
+                         fail NotImplementedError.new('unknown database adapter')
+                       end
+  end
+
   def execute_sql(input_tables, current_tables)
     sql = generate_sql(input_tables, current_tables)
     unless sql.strip.empty?
@@ -45,13 +60,4 @@ SET FOREIGN_KEY_CHECKS=1;
       end
     end
   end
-
-  def generate_sql(input_tables, current_tables)
-    current_tables_with_full_option =
-      Convergence::DefaultParameter.append_database_default_parameter(current_tables, database_adapter)
-    input_tables_with_full_option =
-      Convergence::DefaultParameter.append_database_default_parameter(input_tables, database_adapter)
-    delta = Convergence::Diff.new.diff(current_tables_with_full_option, input_tables_with_full_option)
-    sql_generator.generate(input_tables_with_full_option, delta, current_tables_with_full_option)
-  end
 end

data/lib/convergence/command/diff.rb

@@ -5,14 +5,7 @@ require 'convergence/pretty_diff'
 require 'convergence/dsl'
 
 class Convergence::Command::Diff < Convergence::Command
-  def validate!
-    unless @opts[:diff].size == 2
-      fail ArgumentError.new('diff required two arguments')
-    end
-  end
-
   def execute
-    validate!
     from = Convergence::DefaultParameter.remove_database_default_parameter(from_tables, database_adapter)
     to = Convergence::DefaultParameter.remove_database_default_parameter(to_tables, database_adapter)
     msg = Convergence::PrettyDiff.new(from, to).output

data/lib/convergence/command/dryrun.rb

@@ -6,13 +6,7 @@ require 'convergence/default_parameter'
 require 'convergence/pretty_diff'
 
 class Convergence::Command::Dryrun < Convergence::Command
-  def validate!
-    fail ArgumentError.new('config required') if @config.nil?
-    fail ArgumentError.new('input required') unless @opts[:input]
-  end
-
   def execute
-    validate!
     current_dir_path = Pathname.new(@opts[:input]).realpath.dirname
     input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read, current_dir_path)
     current_tables = dumper.dump
@@ -21,6 +15,8 @@ class Convergence::Command::Dryrun < Convergence::Command
     output_sql(input_tables, current_tables)
   end
 
+  private
+
   def output_diff(input_tables, current_tables)
     input_tables_without_default_parameter =
       Convergence::DefaultParameter.remove_database_default_parameter(input_tables, database_adapter)

data/lib/convergence/command/export.rb

@@ -3,14 +3,7 @@ require 'convergence/dumper'
 require 'convergence/default_parameter'
 
 class Convergence::Command::Export < Convergence::Command
-  def validate!
-    if @config.nil?
-      fail ArgumentError.new('config required')
-    end
-  end
-
   def execute
-    validate!
     tables = Convergence::DefaultParameter.remove_database_default_parameter(dumper.dump, database_adapter)
     msg = Convergence::Dumper.new.dump_dsl(tables)
     logger.output(msg)

data/lib/convergence/command/rollback_dryrun.rb

@@ -5,13 +5,7 @@ require 'convergence/dsl'
 require 'convergence/default_parameter'
 
 class Convergence::Command::RollbackDryrun < Convergence::Command
-  def validate!
-    fail ArgumentError.new('config required') if @config.nil?
-    fail ArgumentError.new('input required') unless @opts[:input]
-  end
-
   def execute
-    validate!
     current_dir_path = Pathname.new(@opts[:input]).realpath.dirname
     input_tables = Convergence::DSL.parse(File.open(@opts[:input]).read, current_dir_path)
     current_tables = dumper.dump
@@ -19,6 +13,8 @@ class Convergence::Command::RollbackDryrun < Convergence::Command
     output_sql(current_tables, input_tables)
   end
 
+  private
+
   def output_sql(input_tables, current_tables)
     msg = Convergence::Command::Apply
       .new(@opts, config: @config)

data/lib/convergence/config.rb

@@ -4,7 +4,33 @@ require 'yaml'
 class Convergence::Config
   ATTRIBUTES = %i[adapter database host port username password].freeze
 
-  attr_accessor(*ATTRIBUTES)
+  attr_accessor(*ATTRIBUTES, :mysql)
+
+  class MySQL
+    ATTRIBUTES = %i[ssl_mode sslkey sslcert sslca sslcapath sslcipher sslverify].freeze
+
+    attr_accessor(*ATTRIBUTES)
+
+    def initialize(attributes)
+      attributes.each do |k, v|
+        next if v.nil?
+        next if !ATTRIBUTES.include?(k.to_sym) && !ATTRIBUTES.include?(k.to_s)
+        instance_variable_set("@#{k}", v)
+      end
+    end
+
+    def ssl_options
+      {
+        ssl_mode: ssl_mode,
+        sslkey: sslkey,
+        sslcert: sslcert,
+        sslca: sslca,
+        sslcapath: sslcapath,
+        sslcipher: sslcipher,
+        sslverify: sslverify
+      }.compact
+    end
+  end
 
   def initialize(attributes)
     attributes.each do |k, v|
@@ -12,6 +38,10 @@ class Convergence::Config
       next if !ATTRIBUTES.include?(k.to_sym) && !ATTRIBUTES.include?(k.to_s)
       instance_variable_set("@#{k}", v)
     end
+    case adapter
+    when 'mysql', 'mysql2'
+      @mysql = MySQL.new(attributes)
+    end
   end
 
   def self.load(yaml_path)

data/lib/convergence/database_connector/mysql_connector.rb

@@ -10,21 +10,25 @@ class Convergence::DatabaseConnector::MysqlConnector
 
   def client(database_name = @config.database)
     @mysql ||= Mysql2::Client.new(
-      host: @config.host,
-      port: @config.port,
-      username: @config.username,
-      password: @config.password,
-      database: database_name
+      {
+        host: @config.host,
+        port: @config.port,
+        username: @config.username,
+        password: @config.password,
+        database: database_name
+      }.merge!(@config.mysql.ssl_options)
     )
   end
 
   def schema_client
     @schema_mysql ||= Mysql2::Client.new(
-      host: @config.host,
-      port: @config.port,
-      username: @config.username,
-      password: @config.password,
-      database: 'information_schema'
+      {
+        host: @config.host,
+        port: @config.port,
+        username: @config.username,
+        password: @config.password,
+        database: 'information_schema'
+      }.merge!(@config.mysql.ssl_options)
     )
   end
 end

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -243,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: DB Schema management tool