ridgepole 0.7.3.beta → 0.7.3.beta2

data/lib/ridgepole/dumper.rb

@@ -1,100 +1,102 @@
-class Ridgepole::Dumper
-  def initialize(options = {})
-    @options = options
-    @logger = Ridgepole::Logger.instance
-  end
+module Ridgepole
+  class Dumper
+    def initialize(options = {})
+      @options = options
+      @logger = Ridgepole::Logger.instance
+    end
 
-  def dump
-    conn = ActiveRecord::Base.connection
-    target_tables = @options[:tables]
-    ignore_tables = @options[:ignore_tables]
+    def dump
+      conn = ActiveRecord::Base.connection
+      target_tables = @options[:tables]
+      ignore_tables = @options[:ignore_tables]
 
-    if target_tables
-      conn.data_sources.each do |tbl|
-        next if target_tables.include?(tbl)
-        ActiveRecord::SchemaDumper.ignore_tables << tbl
+      if target_tables
+        conn.data_sources.each do |tbl|
+          next if target_tables.include?(tbl)
+          ActiveRecord::SchemaDumper.ignore_tables << tbl
+        end
       end
-    end
 
-    if ignore_tables
-      conn.data_sources.each do |tbl|
-        if ignore_tables.any? {|i| i =~ tbl } and not (target_tables and target_tables.include?(tbl))
-          ActiveRecord::SchemaDumper.ignore_tables << tbl
+      if ignore_tables
+        conn.data_sources.each do |tbl|
+          if ignore_tables.any? { |i| i =~ tbl } && !(target_tables && target_tables.include?(tbl))
+            ActiveRecord::SchemaDumper.ignore_tables << tbl
+          end
         end
       end
-    end
 
-    stream = dump_from(conn)
+      stream = dump_from(conn)
 
-    if target_tables or ignore_tables
-      ActiveRecord::SchemaDumper.ignore_tables.clear
-    end
+      if target_tables || ignore_tables
+        ActiveRecord::SchemaDumper.ignore_tables.clear
+      end
 
-    stream.string.lines.each_cons(2) do |first_line, second_line|
-      if first_line =~ /\A# Could not dump/
-        @logger.warn("[WARNING] #{first_line.sub(/\A# /, '').chomp}")
-        @logger.warn(second_line.sub(/\A#/, '').chomp)
+      stream.string.lines.each_cons(2) do |first_line, second_line|
+        if first_line.start_with?('# Could not dump')
+          @logger.warn("[WARNING] #{first_line.sub(/\A# /, '').chomp}")
+          @logger.warn(second_line.sub(/\A#/, '').chomp)
+        end
       end
-    end
 
-    dsl = stream.string.lines.select do |line|
-      line !~ /\A#/ &&
-      line !~ /\AActiveRecord::Schema\.define/ &&
-      line !~ /\Aend/
-    end
+      dsl = stream.string.lines.select do |line|
+        line !~ /\A#/ &&
+          line !~ /\AActiveRecord::Schema\.define/ &&
+          line !~ /\Aend/
+      end
 
-    dsl = dsl.join.strip_heredoc
+      dsl = dsl.join.strip_heredoc
 
-    definitions = []
+      definitions = []
 
-    each_table(dsl) do |name, definition|
-      if target?(name)
-        definitions << definition
-        yield(name, definition) if block_given?
+      each_table(dsl) do |name, definition|
+        if target?(name)
+          definitions << definition
+          yield(name, definition) if block_given?
+        end
       end
-    end
 
-    definitions.join("\n\n")
-  end
+      definitions.join("\n\n")
+    end
 
-  private
+    private
 
-  def each_table(dsl)
-    name = nil
-    definition = []
+    def each_table(dsl)
+      name = nil
+      definition = []
 
-    pass = proc do
-      if name
-        yield(name, definition.join.strip)
-        name = nil
-        definition = []
+      pass = proc do
+        if name
+          yield(name, definition.join.strip)
+          name = nil
+          definition = []
+        end
       end
-    end
 
-    dsl.lines.each do |line|
-      if line =~ /\Acreate_table/
-        pass.call
-        name = line.split(/[\s,'"]+/)[1]
-        definition << line
-      elsif name
-        definition << line
+      dsl.lines.each do |line|
+        if line.start_with?('create_table')
+          pass.call
+          name = line.split(/[\s,'"]+/)[1]
+          definition << line
+        elsif name
+          definition << line
+        end
       end
-    end
 
-    pass.call
-  end
+      pass.call
+    end
 
-  def target?(table_name)
-    not @options[:tables] or @options[:tables].include?(table_name)
-  end
+    def target?(table_name)
+      !(@options[:tables]) || @options[:tables].include?(table_name)
+    end
 
-  def dump_from(conn)
-    stream = StringIO.new
-    conn.without_table_options(@options[:dump_without_table_options]) do
-      ActiveRecord::SchemaDumper.with_default_fk_name(@options[:dump_with_default_fk_name]) do
-        ActiveRecord::SchemaDumper.dump(conn, stream)
+    def dump_from(conn)
+      stream = StringIO.new
+      conn.without_table_options(@options[:dump_without_table_options]) do
+        ActiveRecord::SchemaDumper.with_default_fk_name(@options[:dump_with_default_fk_name]) do
+          ActiveRecord::SchemaDumper.dump(conn, stream)
+        end
       end
+      stream
     end
-    stream
   end
 end

data/lib/ridgepole/execute_expander.rb

@@ -1,61 +1,65 @@
-class Ridgepole::ExecuteExpander
-  class Stub
-    def method_missing(method_name, *args, &block)
-      # Nothing to do
+module Ridgepole
+  class ExecuteExpander
+    class Stub
+      def method_missing(_method_name, *_args, &_block)
+        # Nothing to do
+      end
+
+      def respond_to_missing?(_symbol, _include_private)
+        true
+      end
     end
-  end
 
-  module ConnectionAdapterExt
-    def execute(sql, name = nil)
-      if Ridgepole::ExecuteExpander.noop
-        if (callback = Ridgepole::ExecuteExpander.callback)
-          sql = append_alter_extra(sql)
-          callback.call(sql, name)
-        end
+    module ConnectionAdapterExt
+      def execute(sql, name = nil)
+        if Ridgepole::ExecuteExpander.noop
+          if (callback = Ridgepole::ExecuteExpander.callback)
+            sql = append_alter_extra(sql)
+            callback.call(sql, name)
+          end
 
-        if sql =~ /\A(SELECT|SHOW)\b/i
-          begin
-            super(sql, name)
-          rescue
+          if sql =~ /\A(SELECT|SHOW)\b/i
+            begin
+              super(sql, name)
+            rescue StandardError
+              Stub.new
+            end
+          else
             Stub.new
           end
-        else
-          Stub.new
-        end
-      elsif Ridgepole::ExecuteExpander.use_script
-        if sql =~ /\A(SELECT|SHOW)\b/i
-          super(sql, name)
+        elsif Ridgepole::ExecuteExpander.use_script
+          if sql =~ /\A(SELECT|SHOW)\b/i
+            super(sql, name)
+          else
+            sql = append_alter_extra(sql)
+            Ridgepole::ExecuteExpander.sql_executer.execute(sql)
+            nil
+          end
         else
           sql = append_alter_extra(sql)
-          Ridgepole::ExecuteExpander.sql_executer.execute(sql)
-          nil
+          super(sql, name)
         end
-      else
-        sql = append_alter_extra(sql)
-        super(sql, name)
       end
-    end
 
-    private
+      private
 
-    def append_alter_extra(sql)
-      if Ridgepole::ExecuteExpander.alter_extra and sql =~ /\AALTER\b/i
-        sql = sql + ',' + Ridgepole::ExecuteExpander.alter_extra
-      end
+      def append_alter_extra(sql)
+        if Ridgepole::ExecuteExpander.alter_extra && sql =~ /\AALTER\b/i
+          sql = sql + ',' + Ridgepole::ExecuteExpander.alter_extra
+        end
 
-      sql
+        sql
+      end
     end
-  end
 
-  cattr_accessor :noop,         :instance_writer => false, :instance_reader => false
-  cattr_accessor :callback,     :instance_writer => false, :instance_reader => false
-  cattr_accessor :use_script,   :instance_writer => false, :instance_reader => false
-  cattr_accessor :sql_executer, :instance_writer => false, :instance_reader => false
-  cattr_accessor :alter_extra,  :instance_writer => false, :instance_reader => false
+    cattr_accessor :noop,         instance_writer: false, instance_reader: false
+    cattr_accessor :callback,     instance_writer: false, instance_reader: false
+    cattr_accessor :use_script,   instance_writer: false, instance_reader: false
+    cattr_accessor :sql_executer, instance_writer: false, instance_reader: false
+    cattr_accessor :alter_extra,  instance_writer: false, instance_reader: false
 
-  class << self
-    def without_operation(callback = nil)
-      begin
+    class << self
+      def without_operation(callback = nil)
         self.noop = true
         self.callback = callback
         yield
@@ -63,10 +67,8 @@ class Ridgepole::ExecuteExpander
         self.noop = false
         self.callback = nil
       end
-    end
 
-    def with_script(script, logger)
-      begin
+      def with_script(script, logger)
         self.use_script = true
         self.sql_executer = Ridgepole::ExternalSqlExecuter.new(script, logger)
         yield
@@ -74,23 +76,21 @@ class Ridgepole::ExecuteExpander
         self.use_script = false
         self.sql_executer = nil
       end
-    end
 
-    def with_alter_extra(extra)
-      begin
+      def with_alter_extra(extra)
         self.alter_extra = extra
         yield
       ensure
         self.alter_extra = nil
       end
-    end
 
-    def expand_execute(connection)
-      return if connection.is_a?(ConnectionAdapterExt)
+      def expand_execute(connection)
+        return if connection.is_a?(ConnectionAdapterExt)
 
-      connection.class_eval do
-        prepend ConnectionAdapterExt
+        connection.class_eval do
+          prepend ConnectionAdapterExt
+        end
       end
     end
-  end # of class methods
+  end
 end

data/lib/ridgepole/ext/abstract_mysql_adapter/dump_auto_increment.rb

@@ -5,9 +5,9 @@ module Ridgepole
     module AbstractMysqlAdapter
       module DumpAutoIncrement
         def prepare_column_options(column)
-         spec = super
-         spec[:auto_increment] = "true" if column.auto_increment?
-         spec
+          spec = super
+          spec[:auto_increment] = 'true' if column.auto_increment?
+          spec
         end
       end
     end

data/lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb

@@ -5,7 +5,7 @@ module Ridgepole
     module AbstractMysqlAdapter
       module UseAlterIndex
         def add_index(table_name, column_name, options = {})
-          index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)
+          index_name, index_type, index_columns, index_options, _index_algorithm, index_using = add_index_options(table_name, column_name, options)
 
           # cannot specify index_algorithm
           execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_options}"

data/lib/ridgepole/ext/pp_sort_hash.rb

@@ -1,25 +1,25 @@
 module Ridgepole
   module Ext
     module PpSortHash
-      def pretty_print(q)
-        q.group(1, '{', '}') {
-          q.seplist(self.sort_by {|k, _| k.to_s } , nil, :each) {|k, v|
+      def pretty_print(pp_obj)
+        pp_obj.group(1, '{', '}') do
+          pp_obj.seplist(sort_by { |k, _| k.to_s }, nil, :each) do |k, v|
             v = PpSortHash.extend_if_hash(v)
 
-            q.group {
-              q.pp k
-              q.text '=>'
-              q.group(1) {
-                q.breakable ''
-                q.pp v
-              }
-            }
-          }
-        }
+            pp_obj.group do
+              pp_obj.pp k
+              pp_obj.text '=>'
+              pp_obj.group(1) do
+                pp_obj.breakable ''
+                pp_obj.pp v
+              end
+            end
+          end
+        end
       end
 
       def self.extend_if_hash(obj)
-        if obj.kind_of?(Hash)
+        if obj.is_a?(Hash)
           obj = obj.dup
           obj.extend(self)
         end

data/lib/ridgepole/ext/schema_dumper.rb

@@ -25,7 +25,7 @@ module Ridgepole
           add_foreign_key_statements = foreign_keys.map do |foreign_key|
             parts = [
               "add_foreign_key #{remove_prefix_and_suffix(foreign_key.from_table).inspect}",
-              remove_prefix_and_suffix(foreign_key.to_table).inspect,
+              remove_prefix_and_suffix(foreign_key.to_table).inspect
             ]
 
             if foreign_key.column != @connection.foreign_key_column_for(foreign_key.to_table)

data/lib/ridgepole/external_sql_executer.rb

@@ -1,23 +1,24 @@
-class Ridgepole::ExternalSqlExecuter
-  def initialize(script, logger)
-    @script = script
-    @logger = logger
-  end
+module Ridgepole
+  class ExternalSqlExecuter
+    def initialize(script, logger)
+      @script = script
+      @logger = logger
+    end
 
-  def execute(sql)
-    cmd = Shellwords.join([@script, sql, JSON.dump(ActiveRecord::Base.connection_config)])
-    @logger.info("Execute #{@script}")
-    script_basename = File.basename(@script)
+    def execute(sql)
+      cmd = Shellwords.join([@script, sql, JSON.dump(ActiveRecord::Base.connection_config)])
+      @logger.info("Execute #{@script}")
+      script_basename = File.basename(@script)
 
-    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-      stdin.close_write
-      files = [stdout, stderr]
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+        stdin.close_write
+        files = [stdout, stderr]
 
-      begin
-        until files.empty?
-          ready = IO.select(files)
+        begin
+          until files.empty?
+            ready = IO.select(files)
 
-          if ready
+            next unless ready
             readable = ready[0]
 
             readable.each do |f|
@@ -36,12 +37,11 @@ class Ridgepole::ExternalSqlExecuter
               end
             end
           end
+        rescue EOFError # rubocop:disable Lint/HandleExceptions
+          # nothing to do
         end
-      rescue EOFError
-      end
 
-      unless wait_thr.value.success?
-        raise "`#{@script}` execution failed"
+        raise "`#{@script}` execution failed" unless wait_thr.value.success?
       end
     end
   end