ridgepole 0.7.3.beta → 0.7.3.beta2

data/spec/processing_for_travis.rb

@@ -4,6 +4,6 @@ if ENV['TRAVIS']
 
   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
-    add_filter "spec/"
+    add_filter 'spec/'
   end
 end

data/spec/spec_condition.rb

@@ -15,7 +15,7 @@ module SpecCondition
     end
 
     def activerecord_5?
-      ActiveRecord::VERSION::MAJOR >= 5 and ActiveRecord::VERSION::MAJOR < 6
+      (ActiveRecord::VERSION::MAJOR >= 5) && (ActiveRecord::VERSION::MAJOR < 6)
     end
 
     def debug?
@@ -46,7 +46,7 @@ module SpecCondition
   def condition(*conds)
     conds.any? do |c|
       if c.is_a? Array
-        c.all? {|i| check_version_or_cond(i) }
+        c.all? { |i| check_version_or_cond(i) }
       else
         check_version_or_cond(c)
       end

data/spec/spec_const.rb

@@ -1,18 +1,18 @@
 TEST_MYSQL_HOST = ENV['DOCKER_HOST'] ? ENV['DOCKER_HOST'].gsub(%r{\Atcp://|:\d+\z}, '') : '127.0.0.1'
-TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 13317 : 13316
-TEST_MYSQL_USER = 'root'
-TEST_MYSQL_PASS = 'password'
+TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 13_317 : 13_316
+TEST_MYSQL_USER = 'root'.freeze
+TEST_MYSQL_PASS = 'password'.freeze
 
-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} 2>/dev/null".freeze
 
 TEST_PG_HOST = ENV['DOCKER_HOST'] ? ENV['DOCKER_HOST'].gsub(%r{\Atcp://|:\d+\z}, '') : '127.0.0.1'
-TEST_PG_PORT = 15442
-TEST_PG_USER = 'postgres'
-TEST_PG_PASS = 'password'
+TEST_PG_PORT = 15_442
+TEST_PG_USER = 'postgres'.freeze
+TEST_PG_PASS = 'password'.freeze
 
-PG_CLI_OPTS = "PGPASSWORD=#{TEST_PG_PASS} %s -h #{TEST_PG_HOST} -p #{TEST_PG_PORT} -U #{TEST_PG_USER}"
+PG_CLI_OPTS = "PGPASSWORD=#{TEST_PG_PASS} %s -h #{TEST_PG_HOST} -p #{TEST_PG_PORT} -U #{TEST_PG_USER}".freeze
 PG_PSQL = PG_CLI_OPTS % 'psql'
 PG_CREATEDB = PG_CLI_OPTS % 'createdb'
 PG_DUMP = PG_CLI_OPTS % 'pg_dump'
 
-TEST_SCHEMA = 'ridgepole_test'
+TEST_SCHEMA = 'ridgepole_test'.freeze

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-$: << File.expand_path('..', __FILE__)
+$LOAD_PATH << File.expand_path(__dir__)
 
 require 'spec_const'
 require 'spec_condition'
@@ -35,8 +35,10 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do |example|
-    if conds = example.metadata[:condition]
-      skip unless Array(conds).any? {|c| condition(*c) }
+    conds = example.metadata[:condition]
+
+    if conds
+      skip unless Array(conds).any? { |c| condition(*c) }
     end
 
     case example.metadata[:file_path]
@@ -62,18 +64,16 @@ module SpecHelper
   end
 
   def system_raise_on_fail(*args)
-    unless system(*args)
-      raise "Failed to run: #{args}"
-    end
+    raise "Failed to run: #{args}" unless system(*args)
   end
 
   def restore_database_mysql
-    sql_file = File.expand_path('../mysql/ridgepole_test_database.sql', __FILE__)
+    sql_file = File.expand_path('mysql/ridgepole_test_database.sql', __dir__)
     system_raise_on_fail("#{MYSQL_CLI} < #{sql_file}")
   end
 
   def restore_database_postgresql
-    sql_file = File.expand_path('../postgresql/ridgepole_test_database.sql', __FILE__)
+    sql_file = File.expand_path('postgresql/ridgepole_test_database.sql', __dir__)
     system("#{PG_CREATEDB} ridgepole_test 2>/dev/null")
     system_raise_on_fail("#{PG_PSQL} ridgepole_test --set ON_ERROR_STOP=off -q -f #{sql_file} 2>/dev/null")
   end
@@ -87,23 +87,23 @@ module SpecHelper
   end
 
   def restore_tables_mysql
-    sql_file = File.expand_path('../mysql/ridgepole_test_tables.sql', __FILE__)
+    sql_file = File.expand_path('mysql/ridgepole_test_tables.sql', __dir__)
     system_raise_on_fail("#{MYSQL_CLI} < #{sql_file}")
   end
 
   def restore_tables_postgresql
-    sql_file = File.expand_path('../postgresql/ridgepole_test_tables.sql', __FILE__)
+    sql_file = File.expand_path('postgresql/ridgepole_test_tables.sql', __dir__)
     system_raise_on_fail("#{PG_PSQL} ridgepole_test -q -f #{sql_file} 2>/dev/null")
   end
 
   def restore_tables_mysql_unknown_column_type
-    sql_file = File.expand_path('../mysql/ridgepole_test_tables_unknown_column_type.sql', __FILE__)
+    sql_file = File.expand_path('mysql/ridgepole_test_tables_unknown_column_type.sql', __dir__)
     system_raise_on_fail("#{MYSQL_CLI} < #{sql_file}")
   end
 
   def client(options = {}, config = {})
     config = conn_spec(config)
-    default_options = {debug: condition(:debug)}
+    default_options = { debug: condition(:debug) }
     default_options[:dump_without_table_options] = true
 
     options = default_options.merge(options)
@@ -119,7 +119,7 @@ module SpecHelper
         host: TEST_PG_HOST,
         port: TEST_PG_PORT,
         username: TEST_PG_USER,
-        password: TEST_PG_PASS,
+        password: TEST_PG_PASS
       }.merge(config)
     else
       {
@@ -128,7 +128,7 @@ module SpecHelper
         host: TEST_MYSQL_HOST,
         port: TEST_MYSQL_PORT,
         username: TEST_MYSQL_USER,
-        password: TEST_MYSQL_PASS,
+        password: TEST_MYSQL_PASS
       }.merge(config)
     end
   end
@@ -151,18 +151,16 @@ module SpecHelper
   end
 
   def tempfile(basename, content = '')
-    begin
-      path = `mktemp /tmp/#{basename}.XXXXXX`
-      open(path, 'wb') {|f| f << content }
-      FileUtils.chmod(0777, path)
-      yield(path)
-    ensure
-      FileUtils.rm_f(path) if path
-    end
+    path = `mktemp /tmp/#{basename}.XXXXXX`
+    File.open(path, 'wb') { |f| f << content }
+    FileUtils.chmod(0o777, path)
+    yield(path)
+  ensure
+    FileUtils.rm_f(path) if path
   end
 
   def run_ridgepole(*args)
-    Dir.chdir(File.expand_path('../..', __FILE__)) do
+    Dir.chdir(File.expand_path('..', __dir__)) do
       cmd = [:bundle, :exec, './bin/ridgepole'] + args
       Open3.capture2e(cmd.join(' '))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.3.beta
+  version: 0.7.3.beta2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,21 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,131 +73,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: erbh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: hash_modern_inspect
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: hash_order_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
-  name: rspec-match_fuzzy
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: erbh
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hash_modern_inspect
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: hash_order_helper
+  name: rspec-match_fuzzy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rspec-match_ruby
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.57.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.57.1
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email:
@@ -223,6 +237,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
 - Gemfile
@@ -375,6 +390,7 @@ files:
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_table_spec.rb
 - spec/postgresql/migrate/migrate_ext_cols_spec.rb
+- spec/postgresql/migrate/migrate_primary_key_spec.rb
 - spec/postgresql/migrate/migrate_references_spec.rb
 - spec/postgresql/migrate/migrate_rename_column_spec.rb
 - spec/postgresql/migrate/migrate_rename_table_spec.rb
@@ -530,6 +546,7 @@ test_files:
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_table_spec.rb
 - spec/postgresql/migrate/migrate_ext_cols_spec.rb
+- spec/postgresql/migrate/migrate_primary_key_spec.rb
 - spec/postgresql/migrate/migrate_references_spec.rb
 - spec/postgresql/migrate/migrate_rename_column_spec.rb
 - spec/postgresql/migrate/migrate_rename_table_spec.rb