ridgepole 0.9.0.beta → 0.9.3

data/spec/postgresql/migrate/migrate_same_spec.rb

@@ -4,14 +4,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when database and definition are same' do
     let(:dsl) do
       erbh(<<-ERB)
-        create_table "clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
+        create_table "clubs", id: :serial, force: :cascade do |t|
           t.string "name", limit: 255, default: "", null: false
-          t.index ["name"], name: "idx_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["name"], name: "idx_name", unique: true
         end
 
         create_table "departments", primary_key: "dept_no", <%= i cond(">= 6.1", { id: { type: :string, limit: 4 } }, { id: :string, limit: 4 }) %>, force: :cascade do |t|
           t.string "dept_name", limit: 40, null: false
-          t.index ["dept_name"], name: "idx_dept_name", unique: true, <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_name"], name: "idx_dept_name", unique: true
         end
 
         create_table "dept_emp", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -19,8 +19,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "dept_no", limit: 4, null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "idx_dept_emp_dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "idx_dept_emp_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "idx_dept_emp_dept_no"
+          t.index ["emp_no"], name: "idx_dept_emp_emp_no"
         end
 
         create_table "dept_manager", primary_key: ["emp_no", "dept_no"], force: :cascade do |t|
@@ -28,17 +28,17 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "emp_no", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["dept_no"], name: "idx_dept_manager_dept_no", <%= i cond(5.0, using: :btree) %>
-          t.index ["emp_no"], name: "idx_dept_manager_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["dept_no"], name: "idx_dept_manager_dept_no"
+          t.index ["emp_no"], name: "idx_dept_manager_emp_no"
         end
 
-        create_table "employee_clubs", <%= i cond('>= 5.1',id: :serial) + {force: :cascade} %> do |t|
+        create_table "employee_clubs", id: :serial, force: :cascade do |t|
           t.integer "emp_no", null: false
           t.integer "club_id", null: false
-          t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no", "club_id"], name: "idx_employee_clubs_emp_no_club_id"
         end
 
-        create_table "employees", primary_key: "emp_no", <%= i({id: :integer} + cond('>= 5.1',default: nil) + {force: :cascade}) %> do |t|
+        create_table "employees", primary_key: "emp_no", id: :integer, default: nil, force: :cascade do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
           t.string "last_name", limit: 16, null: false
@@ -50,7 +50,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.integer "salary", null: false
           t.date    "from_date", null: false
           t.date    "to_date", null: false
-          t.index ["emp_no"], name: "idx_salaries_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_salaries_emp_no"
         end
 
         create_table "titles", primary_key: ["emp_no", "title", "from_date"], force: :cascade do |t|
@@ -58,7 +58,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string  "title", limit: 50, null: false
           t.date    "from_date", null: false
           t.date    "to_date"
-          t.index ["emp_no"], name: "idx_titles_emp_no", <%= i cond(5.0, using: :btree) %>
+          t.index ["emp_no"], name: "idx_titles_emp_no"
         end
       ERB
     end

data/spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb

@@ -9,7 +9,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc", on_delete: :cascade
@@ -20,7 +20,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -34,7 +34,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|

data/spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb

@@ -6,7 +6,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -52,7 +52,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -63,7 +63,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -94,7 +94,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"

data/spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb

@@ -9,7 +9,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -26,7 +26,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|
@@ -65,7 +65,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         create_table "child", force: :cascade do |t|
           t.integer "parent_id", unsigned: true
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         add_foreign_key "child", "parent", name: "fk_rails_e74ce85cbc"
@@ -76,7 +76,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       erbh(<<-ERB)
         create_table "child", force: :cascade do |t|
           t.integer "parent_id"
-          t.index ["parent_id"], name: "par_id", <%= i cond(5.0, using: :btree) %>
+          t.index ["parent_id"], name: "par_id"
         end
 
         create_table "parent", force: :cascade do |t|

data/spec/processing_for_ci.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+if ENV['CI']
+  require 'simplecov'
+  require 'simplecov-lcov'
+
+  SimpleCov::Formatter::LcovFormatter.config do |c|
+    c.report_with_single_file = true
+    c.single_report_path = 'coverage/lcov.info'
+  end
+  SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([SimpleCov::Formatter::LcovFormatter])
+  SimpleCov.start
+end

data/spec/spec_const.rb

@@ -5,7 +5,7 @@ TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 13_317 : 13_316
 TEST_MYSQL_USER = 'root'
 TEST_MYSQL_PASS = 'password'
 
-MYSQL_CLI = "mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER} -p#{TEST_MYSQL_PASS} 2>/dev/null"
+MYSQL_CLI = "mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER} -p#{TEST_MYSQL_PASS} --ssl-mode=DISABLED 2>/dev/null"
 
 TEST_PG_HOST = ENV['DOCKER_HOST'] ? ENV['DOCKER_HOST'].gsub(%r{\Atcp://|:\d+\z}, '') : '127.0.0.1'
 TEST_PG_PORT = 15_442

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'spec_condition'
 require 'cli_helper'
 require 'hide_pending_formatter'
 
-require 'processing_for_travis'
+require 'processing_for_ci'
 
 require 'ridgepole'
 require 'ridgepole/cli/config'
@@ -132,6 +132,7 @@ module SpecHelper
         port: TEST_MYSQL_PORT,
         username: TEST_MYSQL_USER,
         password: TEST_MYSQL_PASS,
+        ssl_mode: 'DISABLED',
       }.merge(config)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta
+  version: 0.9.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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'
 - !ruby/object:Gem::Dependency
   name: erbh
   requirement: !ruby/object:Gem::Requirement
@@ -216,16 +202,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +240,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  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: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email:
@@ -267,6 +281,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -300,17 +315,6 @@ files:
 - lib/ridgepole/schema_dumper_ext.rb
 - lib/ridgepole/schema_statements_ext.rb
 - lib/ridgepole/version.rb
-- omnibus-ridgepole/.gitignore
-- omnibus-ridgepole/Dockerfile.centos
-- omnibus-ridgepole/Dockerfile.ubuntu
-- omnibus-ridgepole/Gemfile
-- omnibus-ridgepole/README.md
-- omnibus-ridgepole/Rakefile
-- omnibus-ridgepole/config/projects/ridgepole.rb
-- omnibus-ridgepole/config/software/ridgepole.rb
-- omnibus-ridgepole/omnibus.rb
-- omnibus-ridgepole/package-scripts/ridgepole/postinst
-- omnibus-ridgepole/package-scripts/ridgepole/postrm
 - ridgepole.gemspec
 - spec/cli_helper.rb
 - spec/dsl_parser/context_spec.rb
@@ -318,7 +322,6 @@ files:
 - spec/fixtures/for_require_relative_spec.rb
 - spec/hide_pending_formatter.rb
 - spec/mysql/_migrate/migrate_change_table_option_spec.rb
-- spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
@@ -446,7 +449,7 @@ files:
 - spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb
-- spec/processing_for_travis.rb
+- spec/processing_for_ci.rb
 - spec/spec_condition.rb
 - spec/spec_const.rb
 - spec/spec_helper.rb
@@ -465,9 +468,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key:
@@ -480,7 +483,6 @@ test_files:
 - spec/fixtures/for_require_relative_spec.rb
 - spec/hide_pending_formatter.rb
 - spec/mysql/_migrate/migrate_change_table_option_spec.rb
-- spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/bigint_pk/int_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
@@ -608,7 +610,7 @@ test_files:
 - spec/postgresql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/postgresql/~default_name_fk/migrate_drop_fk_spec.rb
-- spec/processing_for_travis.rb
+- spec/processing_for_ci.rb
 - spec/spec_condition.rb
 - spec/spec_const.rb
 - spec/spec_helper.rb

data/omnibus-ridgepole/.gitignore

@@ -1,10 +0,0 @@
-*.gem
-.bundle
-.kitchen/
-.kitchen.local.yml
-vendor/bundle
-pkg/*
-.vagrant
-bin/*
-files/**/cache/
-vendor/cookbooks

data/omnibus-ridgepole/Dockerfile.centos

@@ -1,25 +0,0 @@
-FROM centos:7
-
-RUN yum install -y centos-release-scl && \
-    yum-config-manager --enable rhel-server-rhscl-7-rpms && \
-    yum install -y \
-      rh-ruby25-dev \
-      rh-ruby25-ruby-devel \
-      make \
-      gcc \
-      gcc-c++ \
-      git \
-      rpm-build
-
-RUN scl enable rh-ruby25 -- \
-    gem install --no-document \
-      bundler \
-      omnibus
-
-COPY Gemfile /
-RUN scl enable rh-ruby25 -- \
-    bundle install
-
-WORKDIR /omnibus-ridgepole
-
-ENTRYPOINT ["/usr/bin/scl", "enable", "rh-ruby25", "--"]

data/omnibus-ridgepole/Dockerfile.ubuntu

@@ -1,21 +0,0 @@
-FROM ubuntu:xenial
-
-RUN apt-get update && \
-    apt-get install -y software-properties-common
-
-RUN apt-add-repository -y ppa:brightbox/ruby-ng && \
-    apt-get update && \
-    apt-get install -y \
-      ruby2.5 \
-      ruby2.5-dev \
-      build-essential \
-      git
-
-RUN gem install --no-document \
-      bundler \
-      omnibus
-
-COPY Gemfile /
-RUN bundle install
-
-WORKDIR /omnibus-ridgepole

data/omnibus-ridgepole/Gemfile

@@ -1,24 +0,0 @@
-source 'https://rubygems.org'
-
-# Install omnibus
-gem 'omnibus', '~> 6.0'
-gem 'omnibus-software', git: 'https://github.com/chef/omnibus-software.git'
-
-gem 'rake'
-
-# Use Chef's software definitions. It is recommended that you write your own
-# software definitions, but you can clone/fork Chef's to get you started.
-# gem 'omnibus-software', github: 'chef/omnibus-software'
-
-# This development group is installed by default when you run `bundle install`,
-# but if you are using Omnibus in a CI-based infrastructure, you do not need
-# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
-# by running `bundle install --without development` to speed up build times.
-group :development do
-  # Use Berkshelf for resolving cookbook dependencies
-  gem 'berkshelf', '~> 3.3'
-
-  # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',    '~> 1.4'
-  gem 'kitchen-vagrant', '~> 0.18'
-end