active_record_mysql_repl 0.1.3 → 0.1.5

data/lib/active_record_mysql_repl/cli/erd.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rails_erd/diagram/graphviz'
+require "rails_erd/diagram/graphviz"
 
 module ActiveRecordMysqlRepl
   module Erd

data/lib/active_record_mysql_repl/cli/main.rb

@@ -1,43 +1,48 @@
 #!/usr/bin/env ruby
 
-require 'pry'
-require 'colorize'
-require 'active_support'
-require 'active_support/core_ext'
-require 'fileutils'
+require "pry"
+require "colorize"
+require "active_support"
+require "active_support/core_ext"
+require "fileutils"
 
 module ActiveRecordMysqlRepl
   module CLI
     module Main
       def self.run(args)
-        if args[0] == '--zsh-completion'
+        if args.empty?
+          puts "ActiveRecordMysqlRepl Version: #{VERSION}"
+          return
+        end
+
+        if args[0] == "--zsh-completion"
           puts ZshCompletion.generate
           return
         end
 
         opts = CLI::Options.parse(args)
-        army_config = Config.load(opts[:c] || File.join(Dir.home, '.army.yml'))
+        army_config = Config.load(opts[:c] || File.join(Dir.home, ".army.yml"))
 
         db_configs = Database::Configs.load(army_config.database_config)
         db_config_key = opts[:d]
         db_config = db_configs[db_config_key]
         return puts db_configs.keys unless db_config
 
-        generate_erf = opts[:e] == 'erd'
+        generate_erf = opts[:e] == "erd"
 
         SSHTunnel.tunnel(db_config) do |port|
           Database::Connection.connect(db_config, port) do
             Database::Loader.load_tables(db_config_key, army_config, port)
 
             if generate_erf
-              require 'rails_erd/diagram/graphviz'
+              require "rails_erd/diagram/graphviz"
               puts "Generating ERD for #{db_config_key}_erd.pdf".gray
               RailsERD::Diagram::Graphviz.create
-              FileUtils.mv('erd.pdf', "#{db_config_key}_erd.pdf")
-              return
+              FileUtils.mv("erd.pdf", "#{db_config_key}_erd.pdf")
+              next
             end
 
-            require 'active_record_mysql_repl/extensions'
+            require "active_record_mysql_repl/extensions"
             if army_config.extensions_dir.present?
               puts "Loading custom extensions from #{army_config.extensions_dir}".gray
               Extensions.load_external(army_config.extensions_dir)
@@ -52,8 +57,8 @@ module ActiveRecordMysqlRepl
       end
 
       def self.clear_screen
-        system('clear')
-        system('cls')
+        system("clear")
+        system("cls")
       end
     end
   end

data/lib/active_record_mysql_repl/cli/zsh_completion.rb

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
 COMPLETION = <<~COMPLETION
-#!/usr/bin/env bash
-
-function _army() {
-  _arguments \
-    '-c[path to .armyrc file]:.armyrc:_files' \
-    '-d[Database name]:database:->database' \
-    '-e[output erd]:output erd:->erd'
-
-  case "$state" in
-    database)
-      slice=("${words[@]:1}")
-      _values 'Database name' $(_database ${slice})
-      ;;
-    erd)
-      _values 'Generate ERD' erd ''
-  esac
-}
-
-function _database {
-  army ${@}
-}
-
-compdef _army army
+  #!/usr/bin/env bash
+  
+  function _army() {
+    _arguments \
+      '-c[path to .armyrc file]:.armyrc:_files' \
+      '-d[Database name]:database:->database' \
+      '-e[output erd]:output erd:->erd'
+  
+    case "$state" in
+      database)
+        slice=("${words[@]:1}")
+        _values 'Database name' $(_database ${slice})
+        ;;
+      erd)
+        _values 'Generate ERD' erd ''
+    esac
+  }
+  
+  function _database {
+    army ${@}
+  }
+  
+  compdef _army army
 COMPLETION
 
 module ActiveRecordMysqlRepl

data/lib/active_record_mysql_repl/cli.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'cli/options'
-require_relative 'cli/main'
-require_relative 'cli/zsh_completion'
-require_relative 'cli/erd'
+require_relative "cli/options"
+require_relative "cli/main"
+require_relative "cli/zsh_completion"
+require_relative "cli/erd"
 
 module ActiveRecordMysqlRepl
   module CLI; end

data/lib/active_record_mysql_repl/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'yaml'
+require "yaml"
 
 module ActiveRecordMysqlRepl
   class Config
@@ -9,12 +9,12 @@ module ActiveRecordMysqlRepl
     end
 
     def database_config
-      raise 'database_config is not defined' unless @database_config
+      raise "database_config is not defined" unless @database_config
       File.join(@army_config_dir, @database_config)
     end
 
     def associations
-      File.join(@army_config_dir, @associations)
+      File.join(@army_config_dir, @associations) if @associations.present?
     end
 
     def extensions_dir
@@ -29,10 +29,10 @@ module ActiveRecordMysqlRepl
 
     def initialize(path, config)
       @army_config_dir = File.dirname(File.absolute_path(path))
-      @database_config = config['database_config']
-      @associations = config['associations']
-      @extensions_dir = config['extensions_dir']
-      @pryrc = config['pryrc']
+      @database_config = config["database_config"]
+      @associations = config["associations"]
+      @extensions_dir = config["extensions_dir"]
+      @pryrc = config["pryrc"]
     end
   end
 end

data/lib/active_record_mysql_repl/database/association.rb

@@ -27,7 +27,7 @@ module ActiveRecordMysqlRepl
 
       # Analyze the relationship between tables based on the information of *_id columns
       # For example, if users.company_id exists, users belongs_to companies and companies has_many users
-      def self.analyze(tables, association_settings)
+      def self.analyze(tables, association_settings = {})
         analyzed_tables = tables.map { |table| [table, AnalyzedTable.new(table)] }.to_h
 
         analyzed_tables.each do |table_name, table|
@@ -36,18 +36,18 @@ module ActiveRecordMysqlRepl
           columns.each do |column|
             next if association_setting.present? && association_settings.ignore_columns(table_name).include?(column.name)
 
-            associatable = column.name.gsub(/_id$/, '') if column.name.end_with?('_id')
-            next if associatable.blank? || associatable == 'class' # reserved word
+            associatable = column.name.gsub(/_id$/, "") if column.name.end_with?("_id")
+            next if associatable.blank? || associatable == "class" # reserved word
 
-            if analyzed_tables.keys.include?(associatable.pluralize)
+            if analyzed_tables.key?(associatable.pluralize)
               table.belongs_to << associatable.singularize if associatable
               analyzed_tables[associatable.pluralize].has_many << table_name.pluralize
             else
-              associatable_table_name = associatable.split('_').last
-              if analyzed_tables.keys.include?(associatable_table_name.pluralize)
-                table.belongs_to << { name: associatable, class_name: associatable_table_name.classify, foreign_key: :id }
+              associatable_table_name = associatable.split("_").last
+              table.belongs_to << if analyzed_tables.key?(associatable_table_name.pluralize)
+                {name: associatable, class_name: associatable_table_name.classify, foreign_key: :id}
               else
-                table.belongs_to << { name: associatable, class_name: table_name.singularize.classify, foreign_key: :id }
+                {name: associatable, class_name: table_name.singularize.classify, foreign_key: :id}
               end
             end
           end
@@ -71,12 +71,12 @@ module ActiveRecordMysqlRepl
       end
 
       def [](table)
-        table = (@association.keys - ['ignore_columns']) & [table]
+        table = (@association.keys - ["ignore_columns"]) & [table]
         @association[table.first] if table.present?
       end
 
       def ignore_columns(table)
-        @association.fetch('ignore_columns', {}).fetch(table, [])
+        @association.fetch("ignore_columns", {}).fetch(table, [])
       end
     end
   end

data/lib/active_record_mysql_repl/database/configs.rb

@@ -27,7 +27,7 @@ module ActiveRecordMysqlRepl
     private
 
     class Config
-      attr_reader *%i[
+      attr_reader(*%i[
         bastion
         ssh_user
         remote_host
@@ -36,7 +36,7 @@ module ActiveRecordMysqlRepl
         user
         password
         prompt_color
-      ]
+      ])
 
       def initialize(config)
         @bastion = config["bastion"]

data/lib/active_record_mysql_repl/database/connection.rb

@@ -7,28 +7,26 @@ module ActiveRecordMysqlRepl
 
       def self.connect(db_config, port)
         conn = {
-          adapter: 'mysql2',
-          host: '127.0.0.1',
+          adapter: "mysql2",
+          host: "127.0.0.1",
           port: port,
           username: db_config.user,
           password: db_config.password,
-          database: db_config.database,
+          database: db_config.database
         }
 
-        ActiveRecord::Base.logger = Logger.new(STDOUT)
-        conn = ActiveRecord::Base.establish_connection(conn)
+        ActiveRecord::Base.logger = Logger.new($stdout)
+        ActiveRecord::Base.establish_connection(conn)
 
         puts "Ensureing connection to #{db_config.database} on port 127.0.0.1:#{port}".gray
 
         tables = nil
-        (1..MAX_RETRY-1).to_a.each do |time|
-          begin
-            tables = ActiveRecord::Base.connection.tables
-          rescue => e
-            puts "#{e}, Retry #{time}/#{MAX_RETRY}".red
-              sleep time*time
-            next
-          end
+        (1..MAX_RETRY - 1).to_a.each do |time|
+          tables = ActiveRecord::Base.connection.tables
+        rescue => e
+          puts "#{e}, Retry #{time}/#{MAX_RETRY}".red
+          sleep time * time
+          next
         end
 
         if tables.blank?

data/lib/active_record_mysql_repl/database/loader.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'active_record'
-require 'active_support/all'
+require "json"
+require "active_record"
+require "active_support/all"
 
 module ActiveRecordMysqlRepl
   module Database
@@ -11,9 +11,14 @@ module ActiveRecordMysqlRepl
         puts "Loading tables".gray
 
         tables = ActiveRecord::Base.connection.tables
-        association_settings = Associations.load(army_config.associations)
+        association_settings = army_config.associations.present? ? Associations.load(army_config.associations) : {}
+        association_setting = association_settings[db_config_key]
+        analyzed_tables = if association_setting.present?
+          Associations.analyze(tables, association_setting)
+        else
+          Associations.analyze(tables)
+        end
 
-        analyzed_tables = Associations.analyze(tables, association_settings[db_config_key])
         skipped = []
         analyzed_tables.each do |analyzed_table|
           # defer model definition for tables with `has_many: :xxx, through: xxx` associations

data/lib/active_record_mysql_repl/database.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'database/configs'
-require_relative 'database/association'
-require_relative 'database/connection'
-require_relative 'database/loader'
+require_relative "database/configs"
+require_relative "database/association"
+require_relative "database/connection"
+require_relative "database/loader"
 
 module ActiveRecordMysqlRepl
   module Database; end

data/lib/active_record_mysql_repl/extensions/active_record.rb

@@ -5,28 +5,28 @@ module ActiverecordMysqlRepl
     module ActiveRecord
       module Base
         def as(name = nil)
-          self.reflect_on_all_associations(name).map(&:name)
+          reflect_on_all_associations(name).map(&:name)
         end
 
         def describe
           [
-            exec_sql("DESCRIBE #{self.table_name}").tab(:h),
-            exec_sql("SHOW INDEX FROM #{self.table_name}").tab(:h)
+            "# #{table_name}",
+            exec_sql("DESCRIBE #{table_name}").tab(:h),
+            exec_sql("SHOW INDEX FROM #{table_name}").tab(:h)
           ].join("\n")
         end
 
-        alias desc describe
-        alias d describe
+        alias_method :desc, :describe
+        alias_method :d, :describe
 
         def show_ddl
-          exec_sql("SHOW CREATE TABLE #{self.table_name}")[0]['Create Table']
+          exec_sql("SHOW CREATE TABLE #{table_name}")[0]["Create Table"]
         end
 
-        alias ddl show_ddl
+        alias_method :ddl, :show_ddl
       end
 
       ::ActiveRecord::Base.extend(Base)
     end
   end
 end
-

data/lib/active_record_mysql_repl/extensions/global.rb

@@ -26,4 +26,3 @@ module ActiverecordMysqlRepl
     Kernel.include(Global)
   end
 end
-

data/lib/active_record_mysql_repl/extensions/hash.rb

@@ -4,17 +4,20 @@ module ActiverecordMysqlRepl
   module Extensions
     module Hash
       def method_missing(name, *args)
-        if (self.keys & [name, name.to_s]).present?
+        if (keys & [name, name.to_s]).present?
           self[name] || self[name.to_s]
-        elsif name.to_s.end_with?('=') && self.keys.include?(name.to_s[0..-2])
+        elsif name.to_s.end_with?("=") && keys.include?(name.to_s[0..-2])
           name = name[0..-2]
-          self[name] = args.first if self.key?(name)
-          self[name.to_sym] = args.first if self.key?(name.to_sym)
+          self[name] = args.first if key?(name)
+          self[name.to_sym] = args.first if key?(name.to_sym)
         end
       end
 
+      def respond_to_missing?
+        true
+      end
+
       ::Hash.include(Hash)
     end
   end
 end
-

data/lib/active_record_mysql_repl/extensions/object.rb

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
-require 'terminal-table'
-require 'csv'
-require 'clipboard'
-require 'json'
+require "terminal-table"
+require "csv"
+require "clipboard"
+require "json"
 
 module ActiverecordMysqlRepl
   module Extensions
     module Object
       def tabulate(orientation = nil)
-        arr = if self.is_a?(Array)
-                self
-              elsif self.is_a?(::ActiveRecord::Relation)
-                self.to_a
-              else
-                [self]
-              end
+        arr = if is_a?(Array)
+          self
+        elsif is_a?(::ActiveRecord::Relation)
+          to_a
+        else
+          [self]
+        end
 
         arr = arr.map do |e|
           if e.is_a?(::ActiveRecord::Base)
-            values =  e.attributes.transform_values do |v|
+            values = e.attributes.transform_values do |v|
               next JSON.pretty_generate(v) if v.is_a?(Enumerable) && v.size > 0
-              next 'NULL' if v.nil?
-              next '""' if v == ''
+              next "NULL" if v.nil?
+              next '""' if v == ""
               v.to_s
             end
             next values
@@ -34,17 +34,17 @@ module ActiverecordMysqlRepl
         raise "#{arr} contains Hashes with different keys".red unless arr.map(&:keys).uniq.size == 1
 
         orientation = case orientation
-                      when :vertical, :v
-                        :vertical
-                      when :horizontal, :h
-                        :horizontal
-                      else
-                        if arr.first.keys.size > 5
-                          :vertical
-                        else
-                          :horizontal
-                        end
-                      end
+        when :vertical, :v
+          :vertical
+        when :horizontal, :h
+          :horizontal
+        else
+          if arr.first.keys.size > 5
+            :vertical
+          else
+            :horizontal
+          end
+        end
 
         t = Terminal::Table.new
 
@@ -54,7 +54,7 @@ module ActiverecordMysqlRepl
           t.rows = arr.map(&:values)
 
         when :vertical
-          t.headings = ['Name', 'Value']
+          t.headings = ["Name", "Value"]
           arr.each.with_index do |row, i|
             row.each { |col, val| t.add_row [col, val] }
             t.add_separator if i < arr.size - 1
@@ -64,25 +64,25 @@ module ActiverecordMysqlRepl
         t.to_s
       end
 
-      alias tab tabulate
-      alias table tabulate
-      alias to_table tabulate
+      alias_method :tab, :tabulate
+      alias_method :table, :tabulate
+      alias_method :to_table, :tabulate
 
       def csv(orientation = nil)
-        arr = if self.is_a?(Array)
-                self
-              elsif self.is_a?(::ActiveRecord::Relation)
-                self.to_a
-              else
-                [self]
-              end
+        arr = if is_a?(Array)
+          self
+        elsif is_a?(::ActiveRecord::Relation)
+          to_a
+        else
+          [self]
+        end
 
         arr = arr.map do |e|
           if e.is_a?(::ActiveRecord::Base)
-            values =  e.attributes.transform_values do |v|
+            values = e.attributes.transform_values do |v|
               next JSON.pretty_generate(v) if v.is_a?(Enumerable) && v.size > 0
-              next 'NULL' if v.nil?
-              next '""' if v == ''
+              next "NULL" if v.nil?
+              next '""' if v == ""
               v.to_s
             end
             next values
@@ -94,17 +94,17 @@ module ActiverecordMysqlRepl
         raise "#{arr} contains Hashes with different keys".red unless arr.map(&:keys).uniq.size == 1
 
         orientation = case orientation
-                      when :vertical, :v
-                        :vertical
-                      when :horizontal, :h
-                        :horizontal
-                      else
-                        if arr.first.keys.size > 5
-                          :vertical
-                        else
-                          :horizontal
-                        end
-                      end
+        when :vertical, :v
+          :vertical
+        when :horizontal, :h
+          :horizontal
+        else
+          if arr.first.keys.size > 5
+            :vertical
+          else
+            :horizontal
+          end
+        end
 
         CSV.generate do |csv|
           case orientation
@@ -121,11 +121,11 @@ module ActiverecordMysqlRepl
       end
 
       def copy
-        Clipboard.copy(self.to_s)
+        Clipboard.copy(to_s)
       end
-      alias cp copy
+      alias_method :cp, :copy
 
-      alias j to_json
+      alias_method :j, :to_json
 
       def jp
         JSON.pretty_generate(JSON.parse(to_json))
@@ -135,4 +135,3 @@ module ActiverecordMysqlRepl
 
   ::Object.include(Extensions::Object)
 end
-

data/lib/active_record_mysql_repl/extensions/tabler.rb

@@ -13,11 +13,11 @@ module ActiverecordMysqlRepl
         end
 
         model.column_names.each do |column|
-          define_method("#{model.table_name.singularize}_by_#{column}") do
+          define_method(:"#{model.table_name.singularize}_by_#{column}") do
             model.where(column => self)
           end
 
-          define_method("#{model.table_name.singularize}_#{column}_like") do
+          define_method(:"#{model.table_name.singularize}_#{column}_like") do
             model.where("#{column} like ?", "%#{self}%")
           end
         end
@@ -29,4 +29,3 @@ module ActiverecordMysqlRepl
     Enumerable.include Tabler
   end
 end
-

data/lib/active_record_mysql_repl/extensions.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'extensions/object'
-require_relative 'extensions/global'
-require_relative 'extensions/active_record'
-require_relative 'extensions/hash'
-require_relative 'extensions/tabler'
+require_relative "extensions/object"
+require_relative "extensions/global"
+require_relative "extensions/active_record"
+require_relative "extensions/hash"
+require_relative "extensions/tabler"
 
 module ActiveRecordMysqlRepl
   module Extensions
@@ -15,4 +15,3 @@ module ActiveRecordMysqlRepl
     end
   end
 end
-

data/lib/active_record_mysql_repl/ssh_tunnel.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-require 'net/ssh'
-require 'net/ssh/gateway'
+require "net/ssh"
+require "net/ssh/gateway"
 
 module ActiveRecordMysqlRepl
   module SSHTunnel
     EPHEMERAL_PORT = 0
 
     def self.tunnel(db_config)
-      return yield(db_config.port) if block_given? unless db_config.bastion
+      unless db_config.bastion
+        return yield(db_config.port) if block_given?
+      end
 
       puts "Establishing ssh tunnel to #{db_config.remote_host}:#{db_config.port} via #{db_config.ssh_user}#{db_config.bastion}".gray
 

data/lib/active_record_mysql_repl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordMysqlRepl
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end