ridgepole 0.6.4 → 0.6.5.beta

data/spec/spec_helper.rb

@@ -1,17 +1,13 @@
 $: << File.expand_path('..', __FILE__)
 
-def travis?
-  !!ENV['TRAVIS']
-end
+require 'spec_const'
+require 'spec_condition'
+require 'cli_helper'
 
-if travis?
-  require 'simplecov'
-  require 'coveralls'
+require 'processing_for_travis'
 
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start do
-    add_filter "spec/"
-  end
+if condition(:mysql_awesome_enabled, :activerecord_5)
+  raise "Cannot use activerecord-mysql-awesome on ActiveRecord 5.0"
 end
 
 require 'ridgepole'
@@ -21,226 +17,159 @@ require 'string_ext'
 require 'open3'
 require 'tempfile'
 require 'json'
+require 'rspec/match_fuzzy'
+require 'erbh'
+require 'hash_modern_inspect'
+require 'hash_order_helper'
 
-TEST_SCHEMA = 'ridgepole_test'
+include ERBh
 
-if ENV['DEBUG']
-  ActiveRecord::Migration.verbose = true
-  logger = Ridgepole::Logger.instance
-  logger.level = ::Logger::DEBUG
-  ActiveRecord::Base.logger = logger
-else
-  ActiveRecord::Migration.verbose = false
-  Ridgepole::Logger.instance.level = ::Logger::ERROR
+class Hash
+  alias i modern_inspect_without_brace
 end
 
 RSpec.configure do |config|
-  config.before(:each) do
-    restore_database
-  end
-end
-
-def restore_database
-  if postgresql?
-    restore_database_postgresql
-  else
-    restore_database_mysql
-  end
-end
-
-def system_raise_on_fail(*args)
-  unless system(*args)
-    raise RuntimeError.new("Failed to run: #{args}")
+  config.before(:all) do
+    if condition(:debug)
+      ActiveRecord::Migration.verbose = true
+      logger = Ridgepole::Logger.instance
+      logger.level = ::Logger::DEBUG
+      ActiveRecord::Base.logger = logger
+    else
+      ActiveRecord::Migration.verbose = false
+      Ridgepole::Logger.instance.level = ::Logger::ERROR
+    end
   end
-end
 
-def restore_database_mysql
-  sql_file = File.expand_path('../mysql/ridgepole_test_database.sql', __FILE__)
-  system_raise_on_fail("mysql -uroot < #{sql_file}")
-end
+  config.before(:each) do |example|
+    if example.metadata[:condition]
+      skip unless condition(*example.metadata[:condition])
+    end
 
-def restore_database_postgresql
-  sql_file = File.expand_path('../postgresql/ridgepole_test_database.sql', __FILE__)
-  system("createdb ridgepole_test #{travis? ? '-U postgres' : ''} 2>/dev/null")
-  system_raise_on_fail("psql ridgepole_test #{travis? ? '-U postgres' : ''} --set ON_ERROR_STOP=off -q -f #{sql_file} 2>/dev/null")
-end
+    case example.metadata[:file_path]
+    when /mysql/
+      skip if condition(:postgresql)
+    when /postgresql/
+      skip unless condition(:postgresql)
+    end
 
-def restore_tables
-  if postgresql?
-    restore_tables_postgresql
-  else
-    restore_tables_mysql
+    restore_database
   end
 end
 
-def restore_tables_mysql
-  sql_file = File.expand_path('../mysql/ridgepole_test_tables.sql', __FILE__)
-  system_raise_on_fail("mysql -uroot < #{sql_file}")
-end
-
-def restore_tables_postgresql
-  sql_file = File.expand_path('../postgresql/ridgepole_test_tables.sql', __FILE__)
-  system_raise_on_fail("psql ridgepole_test #{travis? ? '-U postgres' : ''} -q -f #{sql_file} 2>/dev/null")
-end
-
-def client(options = {}, config = {})
-  config = conn_spec(config)
-
-  default_options = {
-    :debug => !!ENV['DEBUG'],
-  }
-
-  if mysql_awesome_enabled?
-    default_options[:enable_mysql_awesome] = true
-    default_options[:dump_without_table_options] = true
+module SpecHelper
+  def restore_database
+    if condition(:postgresql)
+      restore_database_postgresql
+    else
+      restore_database_mysql
+    end
   end
 
-  options = default_options.merge(options)
+  def system_raise_on_fail(*args)
+    unless system(*args)
+      raise "Failed to run: #{args}"
+    end
+  end
 
-  Ridgepole::Client.new(config, options)
-end
+  def restore_database_mysql
+    sql_file = File.expand_path('../mysql/ridgepole_test_database.sql', __FILE__)
+    system_raise_on_fail("#{MYSQL_CLI} < #{sql_file}")
+  end
 
-def conn_spec(config = {})
-  if postgresql?
-    spec = {
-      adapter: 'postgresql',
-      database: TEST_SCHEMA,
-    }
-
-    spec[:username] = 'postgres' if travis?
-    spec.merge(config)
-  else
-    {
-      adapter: 'mysql2',
-      database: TEST_SCHEMA,
-    }.merge(config)
+  def restore_database_postgresql
+    sql_file = File.expand_path('../postgresql/ridgepole_test_database.sql', __FILE__)
+    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
-end
 
-def show_create_table(table_name)
-  if postgresql?
-    show_create_table_postgresql(table_name)
-  else
-    show_create_table_mysql(table_name)
+  def restore_tables
+    if condition(:postgresql)
+      restore_tables_postgresql
+    else
+      restore_tables_mysql
+    end
   end
-end
 
-def show_create_table_mysql(table_name)
-  raw_conn = ActiveRecord::Base.connection.raw_connection
-  raw_conn.query("SHOW CREATE TABLE `#{table_name}`").first[1]
-end
+  def restore_tables_mysql
+    sql_file = File.expand_path('../mysql/ridgepole_test_tables.sql', __FILE__)
+    system_raise_on_fail("#{MYSQL_CLI} < #{sql_file}")
+  end
 
-def show_create_table_postgresql(table_name)
-  `pg_dump #{travis? ? '-U postgres' : ''} --schema-only #{TEST_SCHEMA} --table=#{table_name} | awk '/^CREATE TABLE/,/);/{print} /^CREATE INDEX/{print}'`.strip
-end
+  def restore_tables_postgresql
+    sql_file = File.expand_path('../postgresql/ridgepole_test_tables.sql', __FILE__)
+    system_raise_on_fail("#{PG_PSQL} ridgepole_test -q -f #{sql_file} 2>/dev/null")
+  end
 
-def default_cli_hook
-  <<-RUBY.strip_heredoc
-    require 'ridgepole'
-
-    class Ridgepole::Delta
-      def initialize(*args);
-      end
-      def migrate(*args)
-        puts "Ridgepole::Delta#migrate"
-        [#{differ}, "create_table :table do\\nend"]
-      end
-      def script
-        puts "Ridgepole::Delta#script"
-
-        "create_table :table do\\nend"
-      end
-      def differ?
-        puts "Ridgepole::Delta#differ?"
-        #{differ}
-      end
-    end
+  def client(options = {}, config = {})
+    config = conn_spec(config)
+    default_options = {debug: condition(:debug)}
 
-    class Ridgepole::Client
-      def initialize(*args)
-        puts "Ridgepole::Client#initialize([\#{args.map {|i| i.kind_of?(File) ? i.path : i.inspect}.join(', ')}])"
-      end
-      def dump
-        puts "Ridgepole::Client#dump"
-      end
-      def diff(*args)
-        puts "Ridgepole::Client#diff"
-        Ridgepole::Delta.new
-      end
-      class << self
-        def diff(*args)
-          puts "Ridgepole::Client.diff([\#{args.map {|i| i.kind_of?(File) ? i.path : i.inspect}.join(', ')}])"
-          Ridgepole::Delta.new
-        end
-        def dump(args)
-          puts "Ridgepole::Client.dump"
-        end
-      end
+    if condition(:mysql_awesome_enabled)
+      default_options[:enable_mysql_awesome] = true
+      default_options[:dump_without_table_options] = true
     end
-  RUBY
-end
-
-def run_cli(options = {})
-  args = options[:args] || []
-  hook = options[:hook] || default_cli_hook
-  path = File.expand_path('../../bin/ridgepole', __FILE__)
 
-  Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.rb']) do |f|
-    f.puts(hook)
-    f.puts(File.read(path))
-    f.flush
+    options = default_options.merge(options)
 
-    cmd = ([:ruby, f.path] + args).join(' ')
-    Open3.capture2e(cmd)
+    Ridgepole::Client.new(config, options)
   end
-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
+  def conn_spec(config = {})
+    if condition(:postgresql)
+      {
+        adapter: 'postgresql',
+        database: TEST_SCHEMA,
+        host: TEST_PG_HOST,
+        port: TEST_PG_PORT,
+        username: TEST_PG_USER,
+        password: TEST_PG_PASS,
+      }.merge(config)
+    else
+      {
+        adapter: 'mysql2',
+        database: TEST_SCHEMA,
+        host: TEST_MYSQL_HOST,
+        port: TEST_MYSQL_PORT,
+        username: TEST_MYSQL_USER,
+        password: TEST_MYSQL_PASS,
+      }.merge(config)
+    end
   end
-end
-
-def mysql_awesome_enabled?
-  ENV['ENABLE_MYSQL_AWESOME'] == '1'
-end
 
-def postgresql?
-  ENV['POSTGRESQL'] == '1'
-end
-
-def if_mysql_awesome_enabled(then_str, else_str = '')
-  if mysql_awesome_enabled?
-    then_str
-  else
-    else_str
+  def show_create_table(table_name)
+    if condition(:postgresql)
+      show_create_table_postgresql(table_name)
+    else
+      show_create_table_mysql(table_name)
+    end
   end
-end
 
-def unsigned_if_enabled(prefix = ', ', suffix = '')
-  if_mysql_awesome_enabled("#{prefix}unsigned: true#{suffix}")
-end
-
-def unsigned_false_if_enabled(prefix = ', ', suffix = '')
-  if_mysql_awesome_enabled("#{prefix}unsigned: false#{suffix}")
-end
+  def show_create_table_mysql(table_name)
+    raw_conn = ActiveRecord::Base.connection.raw_connection
+    raw_conn.query("SHOW CREATE TABLE `#{table_name}`").first[1]
+  end
 
-def unsigned_if_enabled2(prefix = ', ', suffix = '')
-  if_mysql_awesome_enabled("#{prefix}:unsigned=>true#{suffix}")
-end
+  def show_create_table_postgresql(table_name)
+    `#{PG_DUMP} --schema-only #{TEST_SCHEMA} --table=#{table_name} | awk '/^CREATE TABLE/,/);/{print} /^CREATE INDEX/{print}'`.strip
+  end
 
-def unsigned_false_if_enabled2(prefix = ', ', suffix = '')
-  if_mysql_awesome_enabled("#{prefix}:unsigned=>false#{suffix}")
-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
+  end
 
-def run_ridgepole(*args)
-  Dir.chdir(File.expand_path('../..', __FILE__)) do
-    cmd = [:bundle, :exec, './bin/ridgepole'] + args
-    Open3.capture2e(cmd.join(' '))
+  def run_ridgepole(*args)
+    Dir.chdir(File.expand_path('../..', __FILE__)) do
+      cmd = [:bundle, :exec, './bin/ridgepole'] + args
+      Open3.capture2e(cmd.join(' '))
+    end
   end
 end
+include SpecHelper

data/spec/string_ext.rb

@@ -35,17 +35,4 @@ class String
     raise 'must not happen' if new_def =~ /^\s*add_index\s+#{args}/m
     new_def
   end
-
-  def gsub_surely(pattern, replace)
-    old_str = self.dup
-    new_str = self.gsub(pattern, replace)
-    raise 'must not happen' if old_str == new_str
-    new_str
-  end
-
-  def delete_empty_lines
-    self.each_line.select {|line|
-      line !~ /\A\s*\Z/
-    }.join
-  end
 end

metadata

@@ -1,127 +1,189 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   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: 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: appraisal
+  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: activerecord-mysql-awesome
+  name: rspec-match_fuzzy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: erbh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash_modern_inspect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: hash_order_helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.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:
@@ -131,14 +193,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/ridgepole
+- docker-compose.yml
+- gemfiles/activerecord_4.2.gemfile
+- gemfiles/activerecord_5.0.gemfile
 - lib/ridgepole.rb
 - lib/ridgepole/cli/config.rb
 - lib/ridgepole/client.rb
@@ -157,7 +223,8 @@ files:
 - lib/ridgepole/schema_statements_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
-- spec/mysql/bigint_pk/bigint_pkspec.rb
+- spec/cli_helper.rb
+- spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
 - spec/mysql/collation/collation_spec.rb
@@ -247,6 +314,9 @@ 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/spec_condition.rb
+- spec/spec_const.rb
 - spec/spec_helper.rb
 - spec/string_ext.rb
 homepage: https://github.com/winebarrel/ridgepole
@@ -259,22 +329,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:
-- spec/mysql/bigint_pk/bigint_pkspec.rb
+- spec/cli_helper.rb
+- spec/mysql/bigint_pk/bigint_pk_spec.rb
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
 - spec/mysql/collation/collation_spec.rb
@@ -364,5 +435,8 @@ 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/spec_condition.rb
+- spec/spec_const.rb
 - spec/spec_helper.rb
 - spec/string_ext.rb