ardb 0.29.1 → 0.29.2

data/lib/ardb/adapter/sqlite.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "fileutils"
 require "ardb"
 require "ardb/adapter/base"
@@ -5,23 +7,21 @@ require "ardb/adapter/base"
 module Ardb::Adapter
   class Sqlite < Ardb::Adapter::Base
     def db_file_path
-      File.expand_path(self.database, self.config.root_path)
+      File.expand_path(database, config.root_path)
     end
 
     def validate!
-      if File.exist?(self.db_file_path)
-        raise RuntimeError, "`#{self.database}` already exists"
-      end
+      raise "`#{database}` already exists" if File.exist?(db_file_path)
     end
 
     def create_db
       validate!
-      FileUtils.mkdir_p File.dirname(self.db_file_path)
-      ActiveRecord::Base.establish_connection(self.connect_hash)
+      FileUtils.mkdir_p File.dirname(db_file_path)
+      ActiveRecord::Base.establish_connection(connect_hash)
     end
 
     def drop_db
-      FileUtils.rm(self.db_file_path) if File.exist?(self.db_file_path)
+      FileUtils.rm(db_file_path) if File.exist?(db_file_path)
     end
   end
 end

data/lib/ardb/adapter_spy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ardb"
 require "ardb/adapter/base"
 
@@ -20,60 +22,60 @@ module Ardb
     end
 
     def create_db_called?
-      self.create_db_called_count > 0
+      create_db_called_count > 0
     end
 
     def drop_db_called?
-      self.drop_db_called_count > 0
+      drop_db_called_count > 0
     end
 
     def drop_tables_called?
-      self.drop_tables_called_count > 0
+      drop_tables_called_count > 0
     end
 
     def connect_db_called?
-      self.connect_db_called_count > 0
+      connect_db_called_count > 0
     end
 
     def migrate_db_called?
-      self.migrate_db_called_count > 0
+      migrate_db_called_count > 0
     end
 
     def load_schema_called?
-      self.load_schema_called_count > 0
+      load_schema_called_count > 0
     end
 
     def dump_schema_called?
-      self.dump_schema_called_count > 0
+      dump_schema_called_count > 0
     end
 
     # Overwritten `Adapter::Base` methods
 
-    def create_db(*args, &block)
+    def create_db(*_args)
       self.create_db_called_count += 1
     end
 
-    def drop_db(*args, &block)
+    def drop_db(*_args)
       self.drop_db_called_count += 1
     end
 
-    def drop_tables(*args, &block)
+    def drop_tables(*_args)
       self.drop_tables_called_count += 1
     end
 
-    def connect_db(*args, &block)
+    def connect_db(*_args)
       self.connect_db_called_count += 1
     end
 
-    def migrate_db(*args, &block)
+    def migrate_db(*_args)
       self.migrate_db_called_count += 1
     end
 
-    def load_schema(*args, &block)
+    def load_schema(*_args)
       self.load_schema_called_count += 1
     end
 
-    def dump_schema(*args, &block)
+    def dump_schema(*_args)
       self.dump_schema_called_count += 1
     end
   end

data/lib/ardb/cli.rb

@@ -1,23 +1,28 @@
+# frozen_string_literal: true
+
 require "ardb/cli/clirb"
 require "ardb/cli/commands"
 require "ardb/version"
 
 module Ardb
   class CLI
-    COMMANDS = CommandSet.new{ |unknown| InvalidCommand.new(unknown) }.tap do |c|
-      c.add(ConnectCommand)
-      c.add(CreateCommand)
-      c.add(DropCommand)
-      c.add(GenerateMigrationCommand)
-      c.add(MigrateCommand)
-      c.add(MigrateUpCommand)
-      c.add(MigrateDownCommand)
-      c.add(MigrateForwardCommand)
-      c.add(MigrateBackwardCommand)
-    end
+    COMMANDS =
+      CommandSet.new{ |unknown|
+        InvalidCommand.new(unknown)
+      }.tap do |c|
+        c.add(ConnectCommand)
+        c.add(CreateCommand)
+        c.add(DropCommand)
+        c.add(GenerateMigrationCommand)
+        c.add(MigrateCommand)
+        c.add(MigrateUpCommand)
+        c.add(MigrateDownCommand)
+        c.add(MigrateForwardCommand)
+        c.add(MigrateBackwardCommand)
+      end
 
     def self.run(args)
-      self.new.run(args)
+      new.run(args)
     end
 
     def initialize(kernel = nil, stdout = nil, stderr = nil)
@@ -37,16 +42,16 @@ module Ardb
         @stdout.puts cmd.command_help
       rescue CLIRB::VersionExit
         @stdout.puts Ardb::VERSION
-      rescue CLIRB::Error, ArgumentError, InvalidCommandError => exception
-        display_debug(exception)
-        @stderr.puts "#{exception.message}\n\n"
+      rescue CLIRB::Error, ArgumentError, InvalidCommandError => ex
+        display_debug(ex)
+        @stderr.puts "#{ex.message}\n\n"
         @stdout.puts cmd.command_help
         @kernel.exit 1
       rescue CommandExitError
         @kernel.exit 1
-      rescue StandardError => exception
-        @stderr.puts "#{exception.class}: #{exception.message}"
-        @stderr.puts exception.backtrace.join("\n")
+      rescue => ex
+        @stderr.puts "#{ex.class}: #{ex.message}"
+        @stderr.puts ex.backtrace.join("\n")
         @kernel.exit 1
       end
       @kernel.exit 0

data/lib/ardb/cli/clirb.rb

@@ -1,4 +1,5 @@
 module Ardb; end
+
 class Ardb::CLI
   class CLIRB  # Version 1.1.0, https://github.com/redding/cli.rb
     Error    = Class.new(RuntimeError);
@@ -18,13 +19,16 @@ class Ardb::CLI
     end
 
     def option(*args); @options << Option.new(*args); end
+
     def parse!(argv)
       @args = (argv || []).dup.tap do |args_list|
         begin; @parser.parse!(args_list)
         rescue OptionParser::ParseError => err; raise Error, err.message; end
       end; @data = @args + [@opts]
     end
+
     def to_s; @parser.to_s; end
+
     def inspect
       "#<#{self.class}:#{"0x0%x" % (object_id << 1)} @data=#{@data.inspect}>"
     end
@@ -50,6 +54,7 @@ class Ardb::CLI
           custom_abbrev || processed_name.gsub(/[^a-z]/, "").chars.first || "a"
         ]
       end
+
       def gvalinfo(v); v.kind_of?(Class) ? [nil,v] : [v,v.class]; end
     end
   end

data/lib/ardb/cli/commands.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require "ardb"
 require "ardb/cli/clirb"
-require "much-plugin"
+require "much-mixin"
 
 module Ardb; end
+
 class Ardb::CLI
   InvalidCommandError = Class.new(ArgumentError)
   CommandExitError    = Class.new(RuntimeError)
@@ -15,12 +18,14 @@ class Ardb::CLI
       @clirb = CLIRB.new
     end
 
-    def new; self; end
+    def new
+      self
+    end
 
     def run(argv)
       @clirb.parse!([@name, argv].flatten.compact)
       raise CLIRB::HelpExit if @name.to_s.empty?
-      raise InvalidCommandError, "\"#{self.name}\" is not a command."
+      raise InvalidCommandError, "\"#{name}\" is not a command."
     end
 
     def command_help
@@ -32,19 +37,26 @@ class Ardb::CLI
   end
 
   module ValidCommand
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_class_methods do
-      def command_name;    raise NotImplementedError; end
-      def command_summary; "";                        end
+    mixin_class_methods do
+      def command_name
+        raise NotImplementedError
+      end
+
+      def command_summary
+        ""
+      end
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize(&clirb_build)
         @clirb = CLIRB.new(&clirb_build)
       end
 
-      def clirb; @clirb; end
+      def clirb
+        @clirb
+      end
 
       def run(argv, stdout = nil, stderr = nil)
         @clirb.parse!(argv)
@@ -52,14 +64,19 @@ class Ardb::CLI
         @stderr = stderr || $stderr
       end
 
-      def command_name;    self.class.command_name;    end
-      def command_summary; self.class.command_summary; end
+      def command_name
+        self.class.command_name
+      end
+
+      def command_summary
+        self.class.command_summary
+      end
 
       def command_help
-        "Usage: ardb #{self.command_name} [options]\n\n" \
-        "Options: #{self.clirb}\n" \
+        "Usage: ardb #{command_name} [options]\n\n" \
+        "Options: #{clirb}\n" \
         "Description:\n" \
-        "  #{self.command_summary}"
+        "  #{command_summary}"
       end
     end
   end
@@ -67,8 +84,13 @@ class Ardb::CLI
   class ConnectCommand
     include ValidCommand
 
-    def self.command_name;    "connect";                      end
-    def self.command_summary; "Connect to the configured DB"; end
+    def self.command_name
+      "connect"
+    end
+
+    def self.command_summary
+      "Connect to the configured DB"
+    end
 
     def run(argv, *args)
       super
@@ -76,15 +98,21 @@ class Ardb::CLI
       begin
         Ardb.init(false)
         Ardb.adapter.connect_db
-        @stdout.puts "connected to #{Ardb.config.adapter} db #{Ardb.config.database.inspect}"
-      rescue ActiveRecord::NoDatabaseError => e
-        @stderr.puts "error: database #{Ardb.config.database.inspect} "\
-                     "does not exist"
-      rescue StandardError => e
-        @stderr.puts e
-        @stderr.puts e.backtrace.join("\n")
-        @stderr.puts "error connecting to #{Ardb.config.database.inspect} database " \
-                     "with #{Ardb.config.activerecord_connect_hash.inspect}"
+        @stdout.puts(
+          "connected to #{Ardb.config.adapter} "\
+          "db #{Ardb.config.database.inspect}",
+        )
+      rescue ActiveRecord::NoDatabaseError
+        @stderr.puts(
+          "error: database #{Ardb.config.database.inspect} does not exist",
+        )
+      rescue => ex
+        @stderr.puts ex
+        @stderr.puts ex.backtrace.join("\n")
+        @stderr.puts(
+          "error connecting to #{Ardb.config.database.inspect} database " \
+          "with #{Ardb.config.activerecord_connect_hash.inspect}",
+        )
         raise CommandExitError
       end
     end
@@ -93,8 +121,13 @@ class Ardb::CLI
   class CreateCommand
     include ValidCommand
 
-    def self.command_name;    "create";                   end
-    def self.command_summary; "Create the configured DB"; end
+    def self.command_name
+      "create"
+    end
+
+    def self.command_summary
+      "Create the configured DB"
+    end
 
     def run(argv, *args)
       super
@@ -102,12 +135,15 @@ class Ardb::CLI
       begin
         Ardb.init(false)
         Ardb.adapter.create_db
-        @stdout.puts "created #{Ardb.config.adapter} db #{Ardb.config.database.inspect}"
-      rescue ActiveRecord::StatementInvalid => e
-        @stderr.puts "error: database #{Ardb.config.database.inspect} "\
-                     "already exists"
-      rescue StandardError => e
-        @stderr.puts e
+        @stdout.puts(
+          "created #{Ardb.config.adapter} db #{Ardb.config.database.inspect}",
+        )
+      rescue ActiveRecord::StatementInvalid
+        @stderr.puts(
+          "error: database #{Ardb.config.database.inspect} already exists",
+        )
+      rescue => ex
+        @stderr.puts ex
         @stderr.puts "error creating #{Ardb.config.database.inspect} database"
         raise CommandExitError
       end
@@ -117,8 +153,13 @@ class Ardb::CLI
   class DropCommand
     include ValidCommand
 
-    def self.command_name;    "drop";                   end
-    def self.command_summary; "Drop the configured DB"; end
+    def self.command_name
+      "drop"
+    end
+
+    def self.command_summary
+      "Drop the configured DB"
+    end
 
     def run(argv, *args)
       super
@@ -126,12 +167,15 @@ class Ardb::CLI
       begin
         Ardb.init(true)
         Ardb.adapter.drop_db
-        @stdout.puts "dropped #{Ardb.config.adapter} db #{Ardb.config.database.inspect}"
-      rescue ActiveRecord::NoDatabaseError => e
-        @stderr.puts "error: database #{Ardb.config.database.inspect} "\
-                     "does not exist"
-      rescue StandardError => e
-        @stderr.puts e
+        @stdout.puts(
+          "dropped #{Ardb.config.adapter} db #{Ardb.config.database.inspect}",
+        )
+      rescue ActiveRecord::NoDatabaseError
+        @stderr.puts(
+          "error: database #{Ardb.config.database.inspect} does not exist",
+        )
+      rescue => ex
+        @stderr.puts ex
         @stderr.puts "error dropping #{Ardb.config.database.inspect} database"
         raise CommandExitError
       end
@@ -141,8 +185,13 @@ class Ardb::CLI
   class GenerateMigrationCommand
     include ValidCommand
 
-    def self.command_name;    "generate-migration";                       end
-    def self.command_summary; "Generate a MIGRATION-NAME migration file"; end
+    def self.command_name
+      "generate-migration"
+    end
+
+    def self.command_summary
+      "Generate a MIGRATION-NAME migration file"
+    end
 
     def run(argv, *args)
       super
@@ -154,50 +203,55 @@ class Ardb::CLI
         migration = Ardb::Migration.new(Ardb.config, @clirb.args.first)
         migration.save!
         @stdout.puts "generated #{migration.file_path}"
-      rescue Ardb::Migration::NoIdentifierError => exception
+      rescue Ardb::Migration::NoIdentifierError => ex
         error = ArgumentError.new("MIGRATION-NAME must be provided")
-        error.set_backtrace(exception.backtrace)
+        error.set_backtrace(ex.backtrace)
         raise error
-      rescue StandardError => e
-        @stderr.puts e
-        @stderr.puts e.backtrace.join("\n")
+      rescue => ex
+        @stderr.puts ex
+        @stderr.puts ex.backtrace.join("\n")
         @stderr.puts "error generating migration"
         raise CommandExitError
       end
     end
 
     def command_help
-      "Usage: ardb #{self.command_name} MIGRATION-NAME [options]\n\n" \
-      "Options: #{self.clirb}\n" \
+      "Usage: ardb #{command_name} MIGRATION-NAME [options]\n\n" \
+      "Options: #{clirb}\n" \
       "Description:\n" \
-      "  #{self.command_summary}"
+      "  #{command_summary}"
     end
   end
 
   module MigrateCommandBehaviors
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include ValidCommand
     end
 
-    plugin_instance_methods do
-      def migrate; raise NotImplementedError; end
+    mixin_instance_methods do
+      def migrate
+        raise NotImplementedError
+      end
 
       def run(argv, *args)
         super
 
         begin
           Ardb.init(true)
-          self.migrate
+          migrate
           Ardb.adapter.dump_schema unless ENV["ARDB_MIGRATE_NO_SCHEMA"]
-        rescue ActiveRecord::NoDatabaseError => e
-          @stderr.puts "error: database #{Ardb.config.database.inspect} "\
-                       "does not exist"
-        rescue StandardError => e
-          @stderr.puts e
-          @stderr.puts e.backtrace.join("\n")
-          @stderr.puts "error migrating #{Ardb.config.database.inspect} database"
+        rescue ActiveRecord::NoDatabaseError
+          @stderr.puts(
+            "error: database #{Ardb.config.database.inspect} does not exist",
+          )
+        rescue => ex
+          @stderr.puts ex
+          @stderr.puts ex.backtrace.join("\n")
+          @stderr.puts(
+            "error migrating #{Ardb.config.database.inspect} database",
+          )
           raise CommandExitError
         end
       end
@@ -207,8 +261,13 @@ class Ardb::CLI
   class MigrateCommand
     include MigrateCommandBehaviors
 
-    def self.command_name;    "migrate";                   end
-    def self.command_summary; "Migrate the configured DB"; end
+    def self.command_name
+      "migrate"
+    end
+
+    def self.command_summary
+      "Migrate the configured DB"
+    end
 
     def migrate
       Ardb.adapter.migrate_db
@@ -216,43 +275,60 @@ class Ardb::CLI
   end
 
   module MigrateStyleBehaviors
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include MigrateCommandBehaviors
     end
 
-    plugin_class_methods do
-      def command_style; raise NotImplementedError; end
+    mixin_class_methods do
+      def command_style
+        raise NotImplementedError
+      end
 
-      def command_name;    "migrate-#{self.command_style}";                   end
-      def command_summary; "Migrate the configured DB #{self.command_style}"; end
+      def command_name
+        "migrate-#{command_style}"
+      end
+
+      def command_summary
+        "Migrate the configured DB #{command_style}"
+      end
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def migrate
-        Ardb.adapter.send("migrate_db_#{self.class.command_style}", *migrate_args)
+        Ardb.adapter.send(
+          "migrate_db_#{self.class.command_style}",
+          *migrate_args,
+        )
       end
 
       private
 
-      def migrate_args; raise NotImplementedError; end
+      def migrate_args
+        raise NotImplementedError
+      end
     end
   end
 
   module MigrateDirectionBehaviors
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include MigrateStyleBehaviors
     end
 
-    plugin_class_methods do
-      def command_style;     self.command_direction;    end
-      def command_direction; raise NotImplementedError; end
+    mixin_class_methods do
+      def command_style
+        command_direction
+      end
+
+      def command_direction
+        raise NotImplementedError
+      end
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize
         super do
           option(:target_version, "version to migrate to", value: String)
@@ -268,18 +344,23 @@ class Ardb::CLI
   end
 
   module MigrateStepDirectionBehaviors
-    include MuchPlugin
+    include MuchMixin
 
-    plugin_included do
+    mixin_included do
       include MigrateStyleBehaviors
     end
 
-    plugin_class_methods do
-      def command_style;     self.command_direction;    end
-      def command_direction; raise NotImplementedError; end
+    mixin_class_methods do
+      def command_style
+        command_direction
+      end
+
+      def command_direction
+        raise NotImplementedError
+      end
     end
 
-    plugin_instance_methods do
+    mixin_instance_methods do
       def initialize
         super do
           option(:steps, "number of migrations to migrate", value: 1)
@@ -297,30 +378,38 @@ class Ardb::CLI
   class MigrateUpCommand
     include MigrateDirectionBehaviors
 
-    def self.command_direction; "up"; end
+    def self.command_direction
+      "up"
+    end
   end
 
   class MigrateDownCommand
     include MigrateDirectionBehaviors
 
-    def self.command_direction; "down"; end
+    def self.command_direction
+      "down"
+    end
   end
 
   class MigrateForwardCommand
     include MigrateStepDirectionBehaviors
 
-    def self.command_direction; "forward"; end
+    def self.command_direction
+      "forward"
+    end
   end
 
   class MigrateBackwardCommand
     include MigrateStepDirectionBehaviors
 
-    def self.command_direction; "backward"; end
+    def self.command_direction
+      "backward"
+    end
   end
 
   class CommandSet
     def initialize(&unknown_cmd_block)
-      @lookup    = Hash.new{ |h,k| unknown_cmd_block.call(k) }
+      @lookup    = Hash.new{ |_h, k| unknown_cmd_block.call(k) }
       @names     = []
       @aliases   = {}
       @summaries = {}
@@ -329,7 +418,7 @@ class Ardb::CLI
     def add(klass)
       begin
         cmd = klass.new
-      rescue StandardError
+      rescue
         # don"t add any commands you can"t initialize
       else
         @lookup[cmd.command_name] = cmd
@@ -355,11 +444,11 @@ class Ardb::CLI
     end
 
     def to_s
-      max_name_size  = @names.map{ |n| n.size }.max || 0
+      max_name_size = @names.map(&:size).max || 0
 
-      @to_s ||= @names.map do |n|
+      @to_s ||= @names.map{ |n|
         "#{n.ljust(max_name_size)} #{@summaries[n]}"
-      end.join("\n")
+      }.join("\n")
     end
   end
 end