ridgepole 0.7.3.beta → 0.7.3.beta2

data/lib/ridgepole/logger.rb

@@ -1,22 +1,24 @@
-class Ridgepole::Logger < ::Logger
-  include Singleton
-  cattr_accessor :verbose
+module Ridgepole
+  class Logger < ::Logger
+    include Singleton
+    cattr_accessor :verbose
 
-  def initialize
-    super($stdout)
+    def initialize
+      super($stdout)
 
-    self.formatter = proc do |severity, datetime, progname, msg|
-      "#{msg}\n"
-    end
+      self.formatter = proc do |_severity, _datetime, _progname, msg|
+        "#{msg}\n"
+      end
 
-    self.level = Logger::INFO
-  end
+      self.level = Logger::INFO
+    end
 
-  def verbose_info(msg)
-    info(msg) if verbose
-  end
+    def verbose_info(msg)
+      info(msg) if verbose
+    end
 
-  def set_debug(value)
-    self.level = value ? Logger::DEBUG : Logger::INFO
+    def debug=(value)
+      self.level = value ? Logger::DEBUG : Logger::INFO
+    end
   end
 end

data/lib/ridgepole/migration_ext.rb

@@ -13,7 +13,7 @@ module Ridgepole
           begin
             self.time_recorder = TimeRecorder.new
             yield
-            result = self.time_recorder.result
+            result = time_recorder.result
           ensure
             self.time_recorder = nil
           end
@@ -25,18 +25,18 @@ module Ridgepole
 
     def write(text = '')
       logger = Ridgepole::Logger.instance
-      logger.info(text) unless self.disable_logging
+      logger.info(text) unless disable_logging
       parse_text(text)
     end
 
     def parse_text(text)
-      return unless self.time_recorder
+      return unless time_recorder
 
       case text
       when /\A--\s+(.+)\Z/
-        self.time_recorder.add_key($1)
+        time_recorder.add_key(Regexp.last_match(1))
       when /\A\s+->\s+(\d+\.\d+)s\Z/
-        self.time_recorder.add_value($1.to_f)
+        time_recorder.add_value(Regexp.last_match(1).to_f)
       end
     end
 
@@ -52,9 +52,7 @@ module Ridgepole
       end
 
       def add_value(value)
-        if @key
-          @result[@key] = value
-        end
+        @result[@key] = value if @key
 
         @key = nil
       end

data/lib/ridgepole/schema_statements_ext.rb

@@ -4,10 +4,10 @@ module Ridgepole
   module SchemaStatementsExt
     def index_name_exists?(*)
       if Ridgepole::ExecuteExpander.noop
-        caller_methods = caller.map {|i| i =~ /:\d+:in `(.+)'/ ? $1 : '' }
-        if caller_methods.any? {|i| i =~ /\Aremove_index/ }
+        caller_methods = caller.map { |i| i =~ /:\d+:in `(.+)'/ ? Regexp.last_match(1) : '' }
+        if caller_methods.any? { |i| i.start_with?('remove_index') }
           true
-        elsif caller_methods.any? {|i| i =~ /\Aadd_index/ }
+        elsif caller_methods.any? { |i| i.start_with?('add_index') }
           false
         else
           super

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.3.beta'
+  VERSION = '0.7.3.beta2'.freeze
 end

data/ridgepole.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ridgepole/version'
 
@@ -8,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = Ridgepole::VERSION
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
-  spec.summary       = %q{Ridgepole is a tool to manage DB schema.}
-  spec.description   = %q{Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.}
+  spec.summary       = 'Ridgepole is a tool to manage DB schema.'
+  spec.description   = 'Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.'
   spec.homepage      = 'https://github.com/winebarrel/ridgepole'
   spec.license       = 'MIT'
 
@@ -22,16 +21,18 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord', '>= 5.0.1', '< 6'
   spec.add_dependency 'diffy'
+
+  spec.add_development_dependency 'appraisal', '>= 2.2.0'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '>= 3.0.0'
-  spec.add_development_dependency 'mysql2', '~> 0.3.20'
-  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'appraisal', '>= 2.2.0'
-  spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
   spec.add_development_dependency 'hash_order_helper', '>= 0.1.6'
+  spec.add_development_dependency 'mysql2', '~> 0.3.20'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
+  spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
   spec.add_development_dependency 'rspec-match_ruby', '>= 0.1.3'
+  spec.add_development_dependency 'rubocop', '>= 0.57.1'
 end

data/spec/cli_helper.rb

@@ -48,9 +48,9 @@ module CLIHelper
   def run_cli(options = {})
     args = options[:args] || []
     hook = options[:hook] || default_cli_hook
-    path = File.expand_path('../../bin/ridgepole', __FILE__)
+    path = File.expand_path('../bin/ridgepole', __dir__)
 
-    Tempfile.open(["#{File.basename __FILE__}.#{$$}", '.rb']) do |f|
+    Tempfile.open(["#{File.basename __FILE__}.#{$PROCESS_ID}", '.rb']) do |f|
       f.puts(hook)
       f.puts(File.read(path))
       f.flush

data/spec/erb_helper.rb

@@ -1,7 +1,7 @@
 include ERBh
 
 ERBh.define_method(:i) do |obj|
-  if obj.nil? or (obj.respond_to?(:empty?) and obj.empty?)
+  if obj.nil? || (obj.respond_to?(:empty?) && obj.empty?)
     @_erbout.sub!(/,\s*\z/, '')
     ''
   elsif obj.is_a?(Hash)
@@ -15,6 +15,10 @@ ERBh.define_method(:cond) do |conds, m, e = nil|
   if condition(*Array(conds))
     m
   else
-    e || (m.class.new rescue nil)
+    e || (begin
+            m.class.new
+          rescue StandardError
+            nil
+          end)
   end
 end

data/spec/hide_pending_formatter.rb

@@ -1,6 +1,7 @@
 class HidePendingFormatter < RSpec::Core::Formatters::ProgressFormatter
-   RSpec::Core::Formatters.register self, :example_pending
-   RSpec::Core::Formatters.register self, :dump_pending
-   def example_pending(notification); end
-   def dump_pending(notification); end
+  RSpec::Core::Formatters.register self, :example_pending
+  RSpec::Core::Formatters.register self, :dump_pending
+  def example_pending(notification); end
+
+  def dump_pending(notification); end
 end

data/spec/mysql/_migrate/migrate_change_table_option_spec.rb

@@ -1,7 +1,7 @@
 describe 'Ridgepole::Client#diff -> migrate' do
   context 'when change mysql table options' do
-    let(:actual_dsl) {
-      erbh(<<-EOS)
+    let(:actual_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade, options: "ENGINE=MyISAM DEFAULT CHARSET=utf8" do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false
@@ -9,11 +9,11 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
-    let(:expected_dsl) {
-      erbh(<<-EOS)
+    let(:expected_dsl) do
+      erbh(<<-ERB)
         create_table "employees", primary_key: "emp_no", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=ascii" do |t|
           t.date   "birth_date", null: false
           t.string "first_name", limit: 14, null: false, <%= i cond(5.2, collation: "utf8_general_ci") %>
@@ -21,8 +21,8 @@ describe 'Ridgepole::Client#diff -> migrate' do
           t.string "gender", limit: 1, null: false, <%= i cond(5.2, collation: "utf8_general_ci") %>
           t.date   "hire_date", null: false
         end
-      EOS
-    }
+      ERB
+    end
 
     before { subject.diff(actual_dsl).migrate }
     subject { client(dump_without_table_options: false, mysql_change_table_options: true) }

data/spec/mysql/bigint_pk/bigint_pk_spec.rb

@@ -1,25 +1,25 @@
 describe 'Ridgepole::Client (with bigint pk)', condition: 5.0 do
-  let(:id_primary_key_create_table) {
-    <<-EOS
+  let(:id_primary_key_create_table) do
+    <<-RUBY
       create_table "books", id: :primary_key, limit: 8, force: :cascade do |t|
         t.string   "title", null: false
         t.integer  "author_id", null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    EOS
-  }
+    RUBY
+  end
 
-  let(:id_bigint_create_table) {
-    <<-EOS
+  let(:id_bigint_create_table) do
+    <<-RUBY
       create_table "books", id: :bigint, force: :cascade do |t|
         t.string   "title", null: false
         t.integer  "author_id", null: false
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    EOS
-  }
+    RUBY
+  end
 
   context 'when with limit:8' do
     subject { client }

data/spec/mysql/bigint_pk/int_pk_spec.rb

@@ -1,45 +1,45 @@
-describe 'Ridgepole::Client (with integer pk)', condition: 5.1 do
+describe 'Ridgepole::Client (with integer pk)', condition: '>= 5.1.0' do
   context 'when with id:integer' do
-    let(:dsl) {
-      <<-EOS
+    let(:dsl) do
+      <<-RUBY
         create_table "books", id: :integer, force: :cascade do |t|
           t.string   "title", null: false
           t.integer  "author_id", null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
-      EOS
-    }
+      RUBY
+    end
 
     subject { client }
 
     before { subject.diff(dsl).migrate }
 
-    specify {
+    specify do
       expect(show_create_table(:books)).to include '`id` int(11) NOT NULL AUTO_INCREMENT'
       expect(subject.dump).to match_ruby dsl
-    }
+    end
   end
 
   context 'when without id:integer' do
-    let(:dsl) {
-      <<-EOS
+    let(:dsl) do
+      <<-RUBY
         create_table "books", force: :cascade do |t|
           t.string   "title", null: false
           t.integer  "author_id", null: false
           t.datetime "created_at"
           t.datetime "updated_at"
         end
-      EOS
-    }
+      RUBY
+    end
 
     subject { client }
 
     before { subject.diff(dsl).migrate }
 
-    specify {
+    specify do
       expect(show_create_table(:books)).to include '`id` bigint(20) NOT NULL AUTO_INCREMENT'
       expect(subject.dump).to match_ruby dsl
-    }
+    end
   end
 end

data/spec/mysql/cli/config_spec.rb

@@ -2,43 +2,43 @@ describe Ridgepole::Config do
   subject { Ridgepole::Config.load(config, env) }
 
   context 'when passed toplevel yaml' do
-    let(:config) {
+    let(:config) do
       <<-YAML.strip_heredoc
         adapter: mysql2
         encoding: utf8
         database: blog
         username: root
       YAML
-    }
+    end
     let(:env) { 'development' }
-    specify {
-      expect(subject['adapter']).to eq "mysql2"
-      expect(subject['encoding']).to eq "utf8"
-      expect(subject['database']).to eq "blog"
-      expect(subject['username']).to eq "root"
-    }
+    specify do
+      expect(subject['adapter']).to eq 'mysql2'
+      expect(subject['encoding']).to eq 'utf8'
+      expect(subject['database']).to eq 'blog'
+      expect(subject['username']).to eq 'root'
+    end
   end
 
   context 'when passed dynamic yaml' do
-    let(:config) {
+    let(:config) do
       <<-YAML.strip_heredoc
         adapter: mysql2
         encoding: utf8
         database: blog_<%= 1 + 2 %>
         username: user_<%= 3 * 4 %>
       YAML
-    }
+    end
     let(:env) { 'development' }
-    specify {
-      expect(subject['adapter']).to eq "mysql2"
-      expect(subject['encoding']).to eq "utf8"
-      expect(subject['database']).to eq "blog_3"
-      expect(subject['username']).to eq "user_12"
-    }
+    specify do
+      expect(subject['adapter']).to eq 'mysql2'
+      expect(subject['encoding']).to eq 'utf8'
+      expect(subject['database']).to eq 'blog_3'
+      expect(subject['username']).to eq 'user_12'
+    end
   end
 
   context 'when passed rails database.yml style yaml' do
-    let(:config) {
+    let(:config) do
       <<-YAML.strip_heredoc
         development:
           adapter: sqlspecifye
@@ -49,63 +49,63 @@ describe Ridgepole::Config do
           database: blog
           username: root
       YAML
-    }
+    end
 
     context 'in development env' do
       let(:env) { 'development' }
-      specify {
-        expect(subject['adapter']).to eq "sqlspecifye"
-        expect(subject['database']).to eq "db/sample.db"
+      specify do
+        expect(subject['adapter']).to eq 'sqlspecifye'
+        expect(subject['database']).to eq 'db/sample.db'
         expect(subject['username']).to be_nil
-      }
+      end
     end
 
     context 'in production env' do
       let(:env) { 'production' }
-      specify {
-        expect(subject['adapter']).to eq "mysql2"
-        expect(subject['encoding']).to eq "utf8"
-        expect(subject['database']).to eq "blog"
-        expect(subject['username']).to eq "root"
-      }
+      specify do
+        expect(subject['adapter']).to eq 'mysql2'
+        expect(subject['encoding']).to eq 'utf8'
+        expect(subject['database']).to eq 'blog'
+        expect(subject['username']).to eq 'root'
+      end
     end
   end
 
   context 'when passed yaml file' do
-    let(:config) {
+    let(:config) do
       <<-YAML.strip_heredoc
         adapter: mysql2
         encoding: utf8
         database: blog
         username: root
       YAML
-    }
+    end
     let(:env) { 'development' }
     it {
-      Tempfile.create("database.yml") do |f|
+      Tempfile.create('database.yml') do |f|
         f.puts config
         f.flush
 
-        expect(subject['adapter']).to eq "mysql2"
-        expect(subject['encoding']).to eq "utf8"
-        expect(subject['database']).to eq "blog"
-        expect(subject['username']).to eq "root"
+        expect(subject['adapter']).to eq 'mysql2'
+        expect(subject['encoding']).to eq 'utf8'
+        expect(subject['database']).to eq 'blog'
+        expect(subject['username']).to eq 'root'
       end
     }
   end
 
   context 'when passed unexisting yaml' do
-    let(:config) {
+    let(:config) do
       'database.yml'
-    }
+    end
 
     let(:env) { 'development' }
 
-    specify {
-      expect {
+    specify do
+      expect do
         subject
-      }.to raise_error 'Invalid config: "database.yml"'
-    }
+      end.to raise_error 'Invalid config: "database.yml"'
+    end
   end
 
   context 'when passed DATABASE_URL' do
@@ -113,10 +113,10 @@ describe Ridgepole::Config do
     let(:env) { 'development' }
 
     it {
-      expect(subject['adapter']).to eq "mysql2"
-      expect(subject['database']).to eq "blog"
-      expect(subject['username']).to eq "root"
-      expect(subject['password']).to eq "pass"
+      expect(subject['adapter']).to eq 'mysql2'
+      expect(subject['database']).to eq 'blog'
+      expect(subject['username']).to eq 'root'
+      expect(subject['password']).to eq 'pass'
       expect(subject['port']).to eq 3307
     }
   end
@@ -125,16 +125,15 @@ describe Ridgepole::Config do
     let(:config) { 'env:DATABASE_URL' }
     let(:env) { 'development' }
 
-    before {
-      allow(ENV).to receive(:fetch).with('DATABASE_URL').
-        and_return('mysql2://root:pass@127.0.0.1:3307/blog')
-    }
+    before do
+      allow(ENV).to receive(:fetch).with('DATABASE_URL').and_return('mysql2://root:pass@127.0.0.1:3307/blog')
+    end
 
     it {
-      expect(subject['adapter']).to eq "mysql2"
-      expect(subject['database']).to eq "blog"
-      expect(subject['username']).to eq "root"
-      expect(subject['password']).to eq "pass"
+      expect(subject['adapter']).to eq 'mysql2'
+      expect(subject['database']).to eq 'blog'
+      expect(subject['username']).to eq 'root'
+      expect(subject['password']).to eq 'pass'
       expect(subject['port']).to eq 3307
     }
   end