From b700c1bef89a67a64f1040fb6bb03c0320eefe91 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sat, 29 Apr 2017 21:55:48 +0200
Subject: Rename database client files to put them in a `Client` module

Will be modifying the class names in the next commit. Here we change the
file names & locations of the database client files.

The format changes thusly:

    <adapter>_client.rb -> client/<adapter>.rb

This organisation feels cleaner to me. Wasn't liking the previous
structure.
---
 lib/dbshell/client/database.rb | 24 ++++++++++++++++++++++++
 lib/dbshell/client/postgres.rb | 23 +++++++++++++++++++++++
 lib/dbshell/client/sqlite3.rb  | 15 +++++++++++++++
 lib/dbshell/database_client.rb | 24 ------------------------
 lib/dbshell/postgres_client.rb | 23 -----------------------
 lib/dbshell/sqlite3_client.rb  | 15 ---------------
 6 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 lib/dbshell/client/database.rb
 create mode 100644 lib/dbshell/client/postgres.rb
 create mode 100644 lib/dbshell/client/sqlite3.rb
 delete mode 100644 lib/dbshell/database_client.rb
 delete mode 100644 lib/dbshell/postgres_client.rb
 delete mode 100644 lib/dbshell/sqlite3_client.rb

(limited to 'lib/dbshell')

diff --git a/lib/dbshell/client/database.rb b/lib/dbshell/client/database.rb
new file mode 100644
index 0000000..edea777
--- /dev/null
+++ b/lib/dbshell/client/database.rb
@@ -0,0 +1,24 @@
+require 'dbshell/sqlite3_client'
+require 'dbshell/postgres_client'
+
+class DBShell::DatabaseClient
+  def self.handler(connection_params)
+    case connection_params['adapter']
+    when 'sqlite3'
+      DBShell::Sqlite3Client
+    when 'postgresql'
+      DBShell::PostgresClient
+    else
+      raise DBShell::InvalidDatabaseAdapter
+    end
+  end
+
+  def self.runshell(connection_params)
+    self
+      .handler(connection_params)
+      .runshell(connection_params)
+  end
+end
+
+
+class DBShell::InvalidDatabaseAdapter < StandardError; end
diff --git a/lib/dbshell/client/postgres.rb b/lib/dbshell/client/postgres.rb
new file mode 100644
index 0000000..1c1c663
--- /dev/null
+++ b/lib/dbshell/client/postgres.rb
@@ -0,0 +1,23 @@
+class DBShell::PostgresClient
+  EXECUTABLE_NAME = 'psql'
+
+  def self.runshell(db_info)
+    args = self.build_command(db_info)
+    exec(*args)
+  end
+
+  def self.build_command(db_info)
+    args = [EXECUTABLE_NAME]
+
+    host = db_info['host']
+    port = db_info['port']
+    db_name = db_info['database']
+    user = db_info['username']
+    password = db_info['password']
+
+    args.push('-U', user) if user
+    args.push('-h', host) if host
+    args.push('-p', port) if port
+    args.push(db_name)
+  end
+end
diff --git a/lib/dbshell/client/sqlite3.rb b/lib/dbshell/client/sqlite3.rb
new file mode 100644
index 0000000..adc71ef
--- /dev/null
+++ b/lib/dbshell/client/sqlite3.rb
@@ -0,0 +1,15 @@
+class DBShell::Sqlite3Client
+  EXECUTABLE_NAME = 'sqlite3'
+
+  def self.runshell(db_info)
+    args = self.build_command(db_info)
+    exec(*args)
+  end
+
+  def self.build_command(db_info)
+    args = [
+      EXECUTABLE_NAME,
+      db_info['database']
+    ]
+  end
+end
diff --git a/lib/dbshell/database_client.rb b/lib/dbshell/database_client.rb
deleted file mode 100644
index edea777..0000000
--- a/lib/dbshell/database_client.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'dbshell/sqlite3_client'
-require 'dbshell/postgres_client'
-
-class DBShell::DatabaseClient
-  def self.handler(connection_params)
-    case connection_params['adapter']
-    when 'sqlite3'
-      DBShell::Sqlite3Client
-    when 'postgresql'
-      DBShell::PostgresClient
-    else
-      raise DBShell::InvalidDatabaseAdapter
-    end
-  end
-
-  def self.runshell(connection_params)
-    self
-      .handler(connection_params)
-      .runshell(connection_params)
-  end
-end
-
-
-class DBShell::InvalidDatabaseAdapter < StandardError; end
diff --git a/lib/dbshell/postgres_client.rb b/lib/dbshell/postgres_client.rb
deleted file mode 100644
index 1c1c663..0000000
--- a/lib/dbshell/postgres_client.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-class DBShell::PostgresClient
-  EXECUTABLE_NAME = 'psql'
-
-  def self.runshell(db_info)
-    args = self.build_command(db_info)
-    exec(*args)
-  end
-
-  def self.build_command(db_info)
-    args = [EXECUTABLE_NAME]
-
-    host = db_info['host']
-    port = db_info['port']
-    db_name = db_info['database']
-    user = db_info['username']
-    password = db_info['password']
-
-    args.push('-U', user) if user
-    args.push('-h', host) if host
-    args.push('-p', port) if port
-    args.push(db_name)
-  end
-end
diff --git a/lib/dbshell/sqlite3_client.rb b/lib/dbshell/sqlite3_client.rb
deleted file mode 100644
index adc71ef..0000000
--- a/lib/dbshell/sqlite3_client.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class DBShell::Sqlite3Client
-  EXECUTABLE_NAME = 'sqlite3'
-
-  def self.runshell(db_info)
-    args = self.build_command(db_info)
-    exec(*args)
-  end
-
-  def self.build_command(db_info)
-    args = [
-      EXECUTABLE_NAME,
-      db_info['database']
-    ]
-  end
-end
-- 
cgit v1.2.3