convergence 0.2.7 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef1510b43ccf48e6a03e2fd52d2db4bde278b310
-  data.tar.gz: fc57a20928217ecdd52231365a9dbd76366e26ac
+SHA256:
+  metadata.gz: a41f0e1a7c45b785eecc5a53f5aa622158f8777d51999e0ba48280fc53901326
+  data.tar.gz: 91749136917fd3c5f0c2ba6ff1553bd23ceb96edeca9c702eae9aeecd01f7976
 SHA512:
-  metadata.gz: 9a83c88ec1b880cc029fa3ce993b907f51dc4e8987274a0a2d2fac2a1cef0ee1f5accf0d89f4ee603521a13863ae7a4b51e27671ea426887c8a590011054e55d
-  data.tar.gz: a8e5a9ce6069bfb6285dd5855c4c8082c35989c4c537cbb9a5791eadabd5209b2161c93d7126ae6e514ed573e6a141132c434b8e8a785c5293a36e0274cebef2
+  metadata.gz: 2e232a04b220ccdce258b2ab2f8da447e1c95dbba6b58f5de20ef6d9193553fce54a8504205503d15111ce2e00db5000753083af5284c502f4919890919b8572
+  data.tar.gz: 5fdc75e1b04fac387622100c41d85cc79b8c4440988fe0560d5c9bd0149411da18172ab3513a9fad1a1688b38b7f3a247640ce7d815d0614b29030868986f750

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
   - 2.4.1
+services:
+  - mysql
 script:
   - bundle install
   - bundle exec rake db:convergence:prepare

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+## Convergence 1.0.4 (September 8, 2020) ##
+
+* Support diff-lcs 1.4 (PR: #75 #76)
+
+  *yujideveloper*
+
+* Fix warning on Ruby 2.6 and later (PR: #77)
+
+  *yujideveloper*
+
+## Convergence 1.0.3 (January 8, 2020) ##
+
+* Support json column (PR: #70)
+
+  *nishio-dens*
+
+## 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)
+
+  *nishio-dens*
+
+## Convergence 1.0.0 (August 28, 2018) ##
+
+* [BREAKING CHANGE] Change flag style command to sub-command style (PR: #60)
+
+  A flag style command has been deprecated
+
+      e.g. convergence -c database.yml -i example.schema --apply
+
+  Introduce a sub command style.
+
+      e.g. convergence apply example.schema -c database.yml
+
+  *yujideveloper*
+
 ## Convergence 0.2.7 (August 20, 2018) ##
 
 * Fix issues of Convergence::Config (PR: #58)

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    convergence (0.2.7)
+    convergence (1.0.4)
       diff-lcs
       diffy
       mysql2
-      slop (~> 3.6)
+      thor (~> 0.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
+    ast (2.4.0)
     coderay (1.1.2)
-    diff-lcs (1.3)
-    diffy (3.2.1)
-    ffi (1.9.18)
+    diff-lcs (1.4.2)
+    diffy (3.4.0)
+    ffi (1.11.3)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -30,69 +30,64 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.9.0)
-    mysql2 (0.5.2)
+    jaro_winkler (1.5.4)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.1.0)
+    method_source (0.9.2)
+    mysql2 (0.5.3)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
-    pry (0.11.3)
+    parallel (1.19.1)
+    parser (2.7.0.1)
+      ast (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.51.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    ruby_dep (1.5.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.20.0)
-    unicode-display_width (1.3.0)
+    thor (0.20.3)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
   convergence!
   guard
   guard-rspec
   pry
-  rake (~> 10.0)
-  rspec
+  rake (~> 13.0)
+  rspec (>= 3.5)
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   2.1.3

data/README.md

@@ -1,10 +1,10 @@
 # Convergence
 
 Convergence is a pure-Ruby database schema migration tool.
-Currently, This tools is support only MySQL.
+Currently, This tool is support only MySQL.
 
 It defines DB Schema using Convergence DSL(like Rails DSL).
-For more information about Convergence DSL, See below 'Detail About Convergence DSL'.
+For more information about Convergence DSL, See below ['Detail About Convergence DSL'](#detail-about-convergence-dsl)
 
 
 [![Gem Version](https://badge.fury.io/rb/convergence.svg)](https://badge.fury.io/rb/convergence)
@@ -53,7 +53,7 @@ create_table 'test_tables' do |t|
   t.index :name
 end
 
-$ convergence -c database.yml -i example.schema --dryrun
+$ convergence apply example.schema -c database.yml --dry-run
 
 # CREATE TABLE `test_tables` (
 #   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -64,7 +64,7 @@ $ convergence -c database.yml -i example.schema --dryrun
 #   KEY `index_test_tables_on_name` (`name`)
 # ) ENGINE=InnoDB ROW_FORMAT=Compact DEFAULT CHARACTER SET=utf8 COLLATE=utf8_general_ci;
 
-$ convergence -c database.yml -i example.schema --apply
+$ convergence apply example.schema -c database.yml
 
 SET FOREIGN_KEY_CHECKS=0;
   --> 0.0005826340056955814s
@@ -89,7 +89,7 @@ create_table 'test_tables', comment: 'Table Comment Test', engine: 'MyISAM' do |
   t.datetime :posted_at
 end
 
-$ convergence -c database.yml -i changed_example.schema  --dryrun
+$ convergence apply changed_example.schema -c database.yml --dry-run
 
 # DROP INDEX `index_test_tables_on_name` ON `test_tables`;
 # ALTER TABLE `test_tables`
@@ -98,7 +98,7 @@ $ convergence -c database.yml -i changed_example.schema  --dryrun
 #   ADD COLUMN `posted_at` datetime NOT NULL AFTER `created_at`;
 # ALTER TABLE `test_tables` ENGINE=MyISAM COMMENT='Table Comment Test';
 
-$ convergence -c database.yml -i changed_example.schema  --apply
+$ convergence apply changed_example.schema -c database.yml
 
 SET FOREIGN_KEY_CHECKS=0;
   --> 0.0005331430002115667s
@@ -131,15 +131,12 @@ Create Table: CREATE TABLE `test_tables` (
 ## Usage
 
 ```
-Usage: convergence [options]
-    -v, --version
-    -c, --config       Database Yaml Setting
-    -d, --diff         DSL1,DSL2
-    -e, --export       export db schema to dsl
-    -i, --input        Input DSL
-        --dryrun
-        --apply        execute sql to your database
-    -h, --help         Display this help message.
+Commands:
+  convergence apply FILE -c, --config=CONFIG   # execute sql to your database
+  convergence diff FILE1 FILE2                 # print diff of DSLs
+  convergence export -c, --config=CONFIG       # export db schema to dsl
+  convergence help [COMMAND]                   # Describe available commands or one specific command
+  convergence version                          # print the version
 ```
 
 ### DB Config
@@ -155,13 +152,39 @@ username: root
 password:
 ```
 
+#### Use SSL connection
+
+If you would like to use SSL connection, you can specify SSL options in database.yml
+
+```
+$ cat database.yml
+adapter: mysql
+database: convergence_test
+host: 127.0.0.1
+username: root
+password:
+sslca: /path/to/ca-cert.pem
+sslverify: true
+```
+
+Supported ssl options are below:
+* `ssl_mode`
+* `sslkey`
+* `sslcert`
+* `sslca`
+* `sslcapath`
+* `sslcipher`
+* `sslverify`
+
+See [the ssl options section of mysql2 README](https://github.com/brianmario/mysql2/tree/master#ssl-options) for more details of SSL options
+
 ### Export Your DB Schema
 
 First, you need to create database.yml.
 And then, execute command like below.
 
 ```
-$ convergence -c database.yml --export > example.schema
+$ convergence export -c database.yml > example.schema
 ```
 
 Export DSL like this.
@@ -193,16 +216,23 @@ create_table "paper_authors", collate: "utf8_general_ci", comment: "Paper Author
 end
 ```
 
-### Dryrun
+### Dry run
 
 ```
-$ convergence -c database.yml -i example.schema --dryrun
+$ convergence apply example.schema -c database.yml --dry-run
 ```
 
+### Rollback Dry run
+
+```
+$ convergence apply example.schema -c database.yml --rollback-dry-run
+```
+
+
 ### Apply
 
 ```
-$ convergence -c database.yml -i example.schema --apply
+$ convergence apply example.schema -c database.yml
 ```
 
 ### Include Other Schema files
@@ -242,6 +272,7 @@ Convergence is currently support column types below.
 - datetime
 - timestamp
 - year
+- json
 
 ```
 create_table "tests", comment: 'Column type example' do |t|

data/bin/convergence

@@ -1,23 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rubygems'
-require 'convergence'
-require 'slop'
+require 'convergence/cli'
 
-opts = Slop.parse(help: true) do |opt|
-  opt.banner 'Usage: convergence [options]'
-
-  opt.on 'v', 'version' do
-    puts "version #{Convergence::VERSION}"
-    exit
-  end
-
-  opt.on 'c=', 'config=', 'Database Yaml Setting'
-  opt.on 'd=', 'diff=', 'DSL1,DSL2', as: Array, limit: 2
-  opt.on 'e', 'export', 'export db schema to dsl'
-  opt.on 'i=', 'input=', 'Input DSL'
-  opt.on 'dryrun'
-  opt.on 'apply', 'execute sql to your database'
-end
-
-Convergence::Command.new(opts).execute
+Convergence::CLI.start

data/convergence.gemspec

@@ -21,13 +21,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mysql2'
   spec.add_dependency 'diff-lcs'
   spec.add_dependency 'diffy'
-  spec.add_dependency 'slop', '~> 3.6'
+  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'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '>= 3.5'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'guard'

data/lib/convergence.rb

@@ -1,24 +1,2 @@
 require 'convergence/module'
-require 'convergence/logger'
 require 'convergence/version'
-require 'convergence/config'
-require 'convergence/command'
-require 'convergence/command/diff'
-require 'convergence/command/export'
-require 'convergence/command/dryrun'
-require 'convergence/command/apply'
-require 'convergence/pretty_diff'
-require 'convergence/database_connector'
-require 'convergence/database_connector/mysql_connector'
-require 'convergence/column'
-require 'convergence/index'
-require 'convergence/foreign_key'
-require 'convergence/table'
-require 'convergence/dsl'
-require 'convergence/diff'
-require 'convergence/sql_generator'
-require 'convergence/sql_generator/mysql_generator'
-require 'convergence/dumper'
-require 'convergence/dumper/mysql_schema_dumper'
-require 'convergence/default_parameter'
-require 'convergence/default_parameter/mysql_default_parameter'

data/lib/convergence/cli.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'thor'
+require 'convergence/module'
+require 'convergence/config'
+
+class Convergence::CLI < Thor
+  map %w[--version -v] => :version
+
+  desc 'apply FILE', 'execute sql to your database'
+  method_option :config, aliases: '-c', type: :string, required: true, desc: 'Database Yaml Setting'
+  method_option :dry_run, type: :boolean
+  method_option :rollback_dry_run, type: :boolean
+  def apply(file)
+    opts = { input: file }
+    if options[:dry_run]
+      require 'convergence/command/dryrun'
+      Convergence::Command::Dryrun.new(opts, config: config).execute
+    elsif options[:rollback_dry_run]
+      require 'convergence/command/rollback_dryrun'
+      Convergence::Command::RollbackDryrun.new(opts, config: config).execute
+    else
+      require 'convergence/command/apply'
+      Convergence::Command::Apply.new(opts, config: config).execute
+    end
+  end
+
+  desc 'diff FILE1 FILE2', 'print diff of DSLs'
+  def diff(file1, file2)
+    require 'convergence/command/diff'
+    opts = { diff: [file1, file2] }
+    Convergence::Command::Diff.new(opts, config: config).execute
+  end
+
+  desc 'export', 'export db schema to dsl'
+  method_option :config, aliases: '-c', type: :string, required: true, desc: 'Database Yaml Setting'
+  def export
+    require 'convergence/command/export'
+    opts = {}
+    Convergence::Command::Export.new(opts, config: config).execute
+  end
+
+  desc 'version', 'print the version'
+  def version
+    require 'convergence/version'
+    puts "version #{Convergence::VERSION}"
+  end
+
+  private
+
+  def config
+    return unless options[:config]
+    @config ||= Convergence::Config.load(options[:config])
+  end
+end

data/lib/convergence/column.rb

@@ -27,6 +27,7 @@ class Convergence::Column
     datetime
     timestamp
     year
+    json
   )
   FLOATING_POINT_COLUMN_TYPE = %i(
     float

data/lib/convergence/command.rb

@@ -1,3 +1,7 @@
+require 'convergence/config'
+require 'convergence/logger'
+require 'convergence/database_connector'
+
 class Convergence::Command
   def initialize(opts, config: nil)
     @opts = opts
@@ -8,23 +12,7 @@ class Convergence::Command
     end
   end
 
-  def execute
-    execute_klass =
-      if @opts[:diff]
-        Convergence::Command::Diff
-      elsif @opts[:export]
-        Convergence::Command::Export
-      elsif @opts[:dryrun]
-        Convergence::Command::Dryrun
-      elsif @opts[:apply]
-        Convergence::Command::Apply
-      end
-    if execute_klass.nil?
-      puts @opts
-    else
-      execute_klass.new(@opts, config: @config).execute
-    end
-  end
+  private
 
   def database_adapter
     @config.nil? ? 'mysql' : @config.adapter
@@ -37,21 +25,13 @@ class Convergence::Command
   def dumper
     @dumper ||= case database_adapter
                 when 'mysql', 'mysql2'
+                  require 'convergence/dumper/mysql_schema_dumper'
                   Convergence::Dumper::MysqlSchemaDumper.new(connector)
                 else
                   fail NotImplementedError.new('unknown database adapter')
                 end
   end
 
-  def sql_generator
-    @sql_generator ||= case database_adapter
-                       when 'mysql', 'mysql2'
-                         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

@@ -1,20 +1,39 @@
 require 'benchmark'
 require 'pathname'
+require 'convergence/command'
+require 'convergence/dsl'
+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?
@@ -41,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

@@ -1,12 +1,11 @@
-class Convergence::Command::Diff < Convergence::Command
-  def validate!
-    unless @opts[:diff].size == 2
-      fail ArgumentError.new('diff required two arguments')
-    end
-  end
+require 'pathname'
+require 'convergence/command'
+require 'convergence/default_parameter'
+require 'convergence/pretty_diff'
+require 'convergence/dsl'
 
+class Convergence::Command::Diff < Convergence::Command
   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

@@ -1,12 +1,12 @@
 require 'pathname'
-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
+require 'convergence/command'
+require 'convergence/command/apply'
+require 'convergence/dsl'
+require 'convergence/default_parameter'
+require 'convergence/pretty_diff'
 
+class Convergence::Command::Dryrun < Convergence::Command
   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
@@ -15,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)
@@ -35,7 +37,7 @@ class Convergence::Command::Dryrun < Convergence::Command
       .split("\n")
       .map { |v| '# ' + v }
       .join("\n")
-    logger.output(msg)
+    logger.output(msg) unless msg.empty?
     msg
   end
 end

data/lib/convergence/command/export.rb

@@ -1,12 +1,9 @@
-class Convergence::Command::Export < Convergence::Command
-  def validate!
-    if @config.nil?
-      fail ArgumentError.new('--config required')
-    end
-  end
+require 'convergence/command'
+require 'convergence/dumper'
+require 'convergence/default_parameter'
 
+class Convergence::Command::Export < Convergence::Command
   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

@@ -0,0 +1,28 @@
+require 'pathname'
+require 'convergence/command'
+require 'convergence/command/apply'
+require 'convergence/dsl'
+require 'convergence/default_parameter'
+
+class Convergence::Command::RollbackDryrun < Convergence::Command
+  def execute
+    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
+
+    output_sql(current_tables, input_tables)
+  end
+
+  private
+
+  def output_sql(input_tables, current_tables)
+    msg = Convergence::Command::Apply
+      .new(@opts, config: @config)
+      .generate_sql(input_tables, current_tables)
+      .split("\n")
+      .map { |v| '# ' + v }
+      .join("\n")
+    logger.output(msg)
+    msg
+  end
+end

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.rb

@@ -5,6 +5,7 @@ class Convergence::DatabaseConnector
     @connector =
       case config.adapter
       when 'mysql', 'mysql2'
+        require 'convergence/database_connector/mysql_connector'
         Convergence::DatabaseConnector::MysqlConnector.new(config)
       else
         fail NotImplementedError.new("#{config.adapter} not supported yet")

data/lib/convergence/database_connector/mysql_connector.rb

@@ -1,4 +1,6 @@
 require 'mysql2'
+require 'convergence/database_connector'
+
 class Convergence::DatabaseConnector::MysqlConnector
   attr_reader :config
 
@@ -8,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/default_parameter.rb

@@ -2,6 +2,7 @@ class Convergence::DefaultParameter
   def initialize(adapter)
     case adapter.downcase
     when 'mysql', 'mysql2'
+      require 'convergence/default_parameter/mysql_default_parameter'
       @parameter_klass = Convergence::DefaultParameter::MysqlDefaultParameter.new
     else
       fail NotImplementedError.new("unknown adapter #{config.adapter}.")

data/lib/convergence/default_parameter/mysql_default_parameter.rb

@@ -1,3 +1,5 @@
+require 'convergence/default_parameter'
+
 class Convergence::DefaultParameter::MysqlDefaultParameter
   DEFAULT_TABLE_PARAMETERS = {
     engine: 'InnoDB',

data/lib/convergence/diff.rb

@@ -99,7 +99,7 @@ class Convergence::Diff
     from_columns = from.columns.keys
     to_columns = to.columns.keys
     order_changed_columns = Diff::LCS.diff(from_columns, to_columns)
-      .flatten
+      .flatten(1)
       .select(&:adding?)
       .map(&:element)
     order_changed_columns.each do |column|

data/lib/convergence/dsl.rb

@@ -1,3 +1,5 @@
+require 'convergence/table'
+
 class Convergence::DSL
   attr_accessor :tables, :current_dir_path
 

data/lib/convergence/dumper.rb

@@ -70,7 +70,7 @@ class Convergence::Dumper
   end
 
   def key_value_text(k, v)
-    value = if v.to_s == 'true' || v.to_s == 'false' || v =~ /^\d+$/
+    value = if v.to_s == 'true' || v.to_s == 'false' || v.to_s =~ /^\d+$/
               v
             else
               %(#{v.inspect})

data/lib/convergence/dumper/mysql_schema_dumper.rb

@@ -1,3 +1,6 @@
+require 'convergence/dumper'
+require 'convergence/table'
+
 class Convergence::Dumper::MysqlSchemaDumper
   def initialize(connector)
     @connector = connector

data/lib/convergence/pretty_diff.rb

@@ -1,4 +1,6 @@
 require 'diffy'
+require 'convergence/diff'
+require 'convergence/dumper'
 
 class Convergence::PrettyDiff
   def initialize(from_tables, to_tables)

data/lib/convergence/sql_generator/mysql_generator.rb

@@ -1,3 +1,5 @@
+require 'convergence/sql_generator'
+
 class SQLGenerator::MysqlGenerator < SQLGenerator
   OPTION_MAPPING = {
     engine: 'ENGINE',

data/lib/convergence/table.rb

@@ -1,3 +1,7 @@
+require 'convergence/column'
+require 'convergence/index'
+require 'convergence/foreign_key'
+
 class Convergence::Table
   attr_accessor :table_name, :table_options, :columns, :indexes, :foreign_keys
 

data/lib/convergence/version.rb

@@ -1,3 +1,3 @@
 module Convergence
-  VERSION = '0.2.7'
+  VERSION = '1.0.4'
 end

data/spec/convergence/diff_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'convergence/diff'
+require 'convergence/table'
 
 describe Convergence::DSL do
   describe '#diff' do

data/spec/convergence/dsl_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'convergence/dsl'
 
 describe Convergence::DSL do
   let(:dsl_single_table) do

data/spec/convergence/dumper/mysql_schema_dumper_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'convergence/dumper/mysql_schema_dumper'
+require 'convergence/database_connector'
 
 describe Convergence::Dumper::MysqlSchemaDumper do
   before do

data/spec/convergence/dumper_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'convergence/dumper'
+require 'convergence/table'
 
 describe Convergence::Dumper do
   let(:table1) do

data/spec/convergence/table_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'convergence/table'
 
 describe Convergence::Table do
   let(:table_name) { 'dummy_table' }

data/spec/integrations/command_dryrun.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
+require 'convergence/command/dryrun'
 
 describe 'Command::Dryrun#execute' do
   def execute(dsl_path)
     parse_option = {
-      dryrun: true,
       input: File.expand_path("#{File.dirname(__FILE__)}/../fixtures/#{dsl_path}")
     }
-    Convergence::Command.new(parse_option, config: mysql_settings).execute
+    Convergence::Command::Dryrun.new(parse_option, config: mysql_settings).execute
   end
 
   describe 'change table options' do

data/spec/integrations/drop_foreign_key.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'convergence/command/apply'
 
 describe 'Changeable Foreign key' do
   after(:each) do
@@ -7,10 +8,9 @@ describe 'Changeable Foreign key' do
 
   def execute(dsl_path)
     parse_option = {
-      apply: true,
       input: File.expand_path("#{File.dirname(__FILE__)}/../fixtures/#{dsl_path}")
     }
-    Convergence::Command.new(parse_option, config: mysql_settings).execute
+    Convergence::Command::Apply.new(parse_option, config: mysql_settings).execute
   end
 
   describe 'drop foreign key' do

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'bundler/setup'
 require 'rspec'
 require 'pry'
 require 'convergence'
+require 'convergence/database_connector'
 Dir["#{File.dirname(__FILE__)}/integrations/**/*.rb"].each { |f| require f }
 
 $default_output = File.open('/dev/null', 'w')
@@ -20,14 +21,12 @@ def rollback
     .map(&:strip)
     .reject(&:empty?)
   sqls.each do |sql|
-    Convergence::Command.new({}, config: mysql_settings)
-      .connector
+    Convergence::DatabaseConnector.new(mysql_settings)
       .client
       .query("#{sql};")
   end
 end
 
 RSpec.configure do |config|
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
+  config.filter_run_when_matching :focus
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convergence
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 1.0.4
 platform: ruby
 authors:
 - Shinsuke Nishio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -53,61 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -187,12 +173,14 @@ files:
 - convergence.gemspec
 - database.yml.example
 - lib/convergence.rb
+- lib/convergence/cli.rb
 - lib/convergence/column.rb
 - lib/convergence/command.rb
 - lib/convergence/command/apply.rb
 - lib/convergence/command/diff.rb
 - lib/convergence/command/dryrun.rb
 - lib/convergence/command/export.rb
+- lib/convergence/command/rollback_dryrun.rb
 - lib/convergence/config.rb
 - lib/convergence/database_connector.rb
 - lib/convergence/database_connector/mysql_connector.rb
@@ -241,15 +229,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: DB Schema management tool