diff --git a/cli/lib/twenty/cli/command/connect.rb b/cli/lib/twenty/cli/command/connect.rb index c33bc29..d027356 100644 --- a/cli/lib/twenty/cli/command/connect.rb +++ b/cli/lib/twenty/cli/command/connect.rb @@ -21,7 +21,7 @@ class Twenty::Command::Connect < Twenty::Command private def run_command(options) - path = File.realpath(options.path ? options.path : Dir.getwd) + path = File.realpath(options.path || Dir.getwd) if File.exist?(path) require_models! project = Twenty::Project.create( diff --git a/cli/lib/twenty/cli/command/disconnect.rb b/cli/lib/twenty/cli/command/disconnect.rb index 6cfabb7..464090c 100644 --- a/cli/lib/twenty/cli/command/disconnect.rb +++ b/cli/lib/twenty/cli/command/disconnect.rb @@ -20,7 +20,7 @@ class Twenty::Command::Disconnect < Twenty::Command private def run_command(options) - path = File.realpath(options.path ? options.path : Dir.getwd) + path = File.realpath(options.path || Dir.getwd) require_models! Twenty::Project .where(path:) diff --git a/cli/lib/twenty/cli/command/hook.rb b/cli/lib/twenty/cli/command/hook.rb index b439dc9..22dc1c9 100644 --- a/cli/lib/twenty/cli/command/hook.rb +++ b/cli/lib/twenty/cli/command/hook.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::Command::Hook require_relative "hook/require_migration" require_relative "hook/sqlite_conn" diff --git a/cli/lib/twenty/cli/command/hook/rescue.rb b/cli/lib/twenty/cli/command/hook/rescue.rb index 8fd1292..6308acb 100644 --- a/cli/lib/twenty/cli/command/hook/rescue.rb +++ b/cli/lib/twenty/cli/command/hook/rescue.rb @@ -22,7 +22,7 @@ module Twenty::Command::Hook private def format_backtrace(backtrace) - backtrace[0..FRAME_MAX-1].map do + backtrace[0..FRAME_MAX - 1].map do [" " * INDENT_BY, _1.gsub(Dir.getwd, "")].join end.join("\n") end diff --git a/cli/lib/twenty/cli/command/hook/sqlite_conn.rb b/cli/lib/twenty/cli/command/hook/sqlite_conn.rb index 99f1dbb..b340566 100644 --- a/cli/lib/twenty/cli/command/hook/sqlite_conn.rb +++ b/cli/lib/twenty/cli/command/hook/sqlite_conn.rb @@ -3,9 +3,16 @@ module Twenty::Command::Hook module SQLiteConn def run_command(options) - path = options.database || Twenty.default_database - Twenty.establish_connection(path:) + connect!(options) super(options) end + + private + + def connect!(options) + Twenty.connect( + database: options.database || Twenty.default_database + ) + end end end diff --git a/cli/lib/twenty/cli/command/option.rb b/cli/lib/twenty/cli/command/option.rb index 8cab3cd..4705926 100644 --- a/cli/lib/twenty/cli/command/option.rb +++ b/cli/lib/twenty/cli/command/option.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::Command::Option require_relative "option/database" end diff --git a/cli/lib/twenty/cli/command/option/database.rb b/cli/lib/twenty/cli/command/option/database.rb index fca3532..1995078 100644 --- a/cli/lib/twenty/cli/command/option/database.rb +++ b/cli/lib/twenty/cli/command/option/database.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::Command::Option module Database def self.included(mod) diff --git a/server/lib/twenty/server.rb b/server/lib/twenty/server.rb index 8ed9819..a57dc4b 100644 --- a/server/lib/twenty/server.rb +++ b/server/lib/twenty/server.rb @@ -42,22 +42,19 @@ module Twenty ## # Establishes a database connection # - # @param [String] path - # The path to a SQLite database + # @param [Hash] options + # 'Sequel.connect' options # # @return [void] - def self.establish_connection(path:) - @db = Sequel.connect( - adapter: "sqlite", - database: path - ) + def self.connect(options = {}) + @db = Sequel.connect({adapter: "sqlite"}.merge(options)) end ## # @return [Sequel::Database::SQLite] # Returns a database object def self.db - establish_connection unless @db + connect unless @db @db end diff --git a/server/lib/twenty/server/migration.rb b/server/lib/twenty/server/migration.rb index fca3594..f6fb733 100644 --- a/server/lib/twenty/server/migration.rb +++ b/server/lib/twenty/server/migration.rb @@ -21,6 +21,6 @@ module Twenty::Migration # @return [Boolean] # Returns true when there are pending migrations def self.pending_migrations? - ! Sequel::Migrator.is_current?(Twenty.db, migrations_path) + !Sequel::Migrator.is_current?(Twenty.db, migrations_path) end end diff --git a/server/lib/twenty/server/migration/3_add_color_to_projects.rb b/server/lib/twenty/server/migration/3_add_color_to_projects.rb index 7448405..19f7d79 100644 --- a/server/lib/twenty/server/migration/3_add_color_to_projects.rb +++ b/server/lib/twenty/server/migration/3_add_color_to_projects.rb @@ -3,7 +3,7 @@ Sequel.migration do column_exists = ->(table, column) do schema = Twenty.db.schema(table) - schema.find { |(key,_)| key == column } + schema.find { |(key, _)| key == column } end up do diff --git a/server/lib/twenty/server/mixin.rb b/server/lib/twenty/server/mixin.rb index 379cefa..09db885 100644 --- a/server/lib/twenty/server/mixin.rb +++ b/server/lib/twenty/server/mixin.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty::Mixin require_relative "mixin/colorable" end diff --git a/server/lib/twenty/server/model/milestone.rb b/server/lib/twenty/server/model/milestone.rb index 191a622..cd9d996 100644 --- a/server/lib/twenty/server/model/milestone.rb +++ b/server/lib/twenty/server/model/milestone.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Twenty class Milestone < Sequel::Model include Model