From 13aa8b2ec03a7b7cfeeea5d855e4336ba171f5e2 Mon Sep 17 00:00:00 2001 From: portellaa Date: Thu, 16 May 2019 16:50:42 +0100 Subject: [PATCH] =?UTF-8?q?Recreate=20Kassandra=20source=20folder=20?= =?UTF-8?q?=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Package.swift | 2 +- Sources/{ => Kassandra}/Auth.swift | 0 Sources/{ => Kassandra}/Config.swift | 2 +- Sources/{ => Kassandra}/Definitions.swift | 0 Sources/{ => Kassandra}/Delete.swift | 0 Sources/{ => Kassandra}/Event.swift | 0 Sources/{ => Kassandra}/Extensions.swift | 0 Sources/{ => Kassandra}/Insert.swift | 0 .../{Kassandra.swift => Kassandra/KassandraClient.swift} | 8 ++++---- Sources/{ => Kassandra}/KassandraDelegate.swift | 0 Sources/{ => Kassandra}/Kind.swift | 0 Sources/{ => Kassandra}/Model.swift | 0 Sources/{ => Kassandra/Query}/Query.swift | 0 Sources/{ => Kassandra}/QueryBuilder.swift | 0 Sources/{ => Kassandra}/Raw.swift | 0 Sources/{ => Kassandra}/Request.swift | 0 Sources/{ => Kassandra}/Result.swift | 0 Sources/{ => Kassandra}/Select.swift | 0 Sources/{ => Kassandra}/Table.swift | 0 Sources/{ => Kassandra}/Update.swift | 0 20 files changed, 6 insertions(+), 6 deletions(-) rename Sources/{ => Kassandra}/Auth.swift (100%) rename Sources/{ => Kassandra}/Config.swift (98%) rename Sources/{ => Kassandra}/Definitions.swift (100%) rename Sources/{ => Kassandra}/Delete.swift (100%) rename Sources/{ => Kassandra}/Event.swift (100%) rename Sources/{ => Kassandra}/Extensions.swift (100%) rename Sources/{ => Kassandra}/Insert.swift (100%) rename Sources/{Kassandra.swift => Kassandra/KassandraClient.swift} (99%) rename Sources/{ => Kassandra}/KassandraDelegate.swift (100%) rename Sources/{ => Kassandra}/Kind.swift (100%) rename Sources/{ => Kassandra}/Model.swift (100%) rename Sources/{ => Kassandra/Query}/Query.swift (100%) rename Sources/{ => Kassandra}/QueryBuilder.swift (100%) rename Sources/{ => Kassandra}/Raw.swift (100%) rename Sources/{ => Kassandra}/Request.swift (100%) rename Sources/{ => Kassandra}/Result.swift (100%) rename Sources/{ => Kassandra}/Select.swift (100%) rename Sources/{ => Kassandra}/Table.swift (100%) rename Sources/{ => Kassandra}/Update.swift (100%) diff --git a/Package.swift b/Package.swift index 85e8dde..459eeeb 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .package(url: "https://github.com/IBM-Swift/BlueSSLService.git", from: "1.0.46") ], targets: [ - .target(name: "Kassandra", dependencies: ["SSLService"], path: "Sources", exclude: ["Kassandra.xcodeproj", "README.md"]), + .target(name: "Kassandra", dependencies: ["SSLService"], exclude: ["Kassandra.xcodeproj", "README.md"]), .testTarget(name: "KassandraTests", dependencies: ["Kassandra"]), ], swiftLanguageVersions: [.v5] diff --git a/Sources/Auth.swift b/Sources/Kassandra/Auth.swift similarity index 100% rename from Sources/Auth.swift rename to Sources/Kassandra/Auth.swift diff --git a/Sources/Config.swift b/Sources/Kassandra/Config.swift similarity index 98% rename from Sources/Config.swift rename to Sources/Kassandra/Config.swift index e2fbde2..dab1148 100644 --- a/Sources/Config.swift +++ b/Sources/Kassandra/Config.swift @@ -28,7 +28,7 @@ public final class Config { let _version: Byte = 0x03 - var connection: Kassandra? = nil + var connection: KassandraClient? = nil var SSLConfig: SSLService.Configuration? = nil diff --git a/Sources/Definitions.swift b/Sources/Kassandra/Definitions.swift similarity index 100% rename from Sources/Definitions.swift rename to Sources/Kassandra/Definitions.swift diff --git a/Sources/Delete.swift b/Sources/Kassandra/Delete.swift similarity index 100% rename from Sources/Delete.swift rename to Sources/Kassandra/Delete.swift diff --git a/Sources/Event.swift b/Sources/Kassandra/Event.swift similarity index 100% rename from Sources/Event.swift rename to Sources/Kassandra/Event.swift diff --git a/Sources/Extensions.swift b/Sources/Kassandra/Extensions.swift similarity index 100% rename from Sources/Extensions.swift rename to Sources/Kassandra/Extensions.swift diff --git a/Sources/Insert.swift b/Sources/Kassandra/Insert.swift similarity index 100% rename from Sources/Insert.swift rename to Sources/Kassandra/Insert.swift diff --git a/Sources/Kassandra.swift b/Sources/Kassandra/KassandraClient.swift similarity index 99% rename from Sources/Kassandra.swift rename to Sources/Kassandra/KassandraClient.swift index 6673e73..a58dda7 100644 --- a/Sources/Kassandra.swift +++ b/Sources/Kassandra/KassandraClient.swift @@ -19,7 +19,7 @@ import SSLService import Dispatch - public class Kassandra { + public class KassandraClient { public var delegate: KassandraDelegate? = nil @@ -234,7 +234,7 @@ } } - extension Kassandra { + extension KassandraClient { /** Initialize a configuration using a `CA Certificate` directory. @@ -300,7 +300,7 @@ } } - extension Kassandra { + extension KassandraClient { internal func read() { @@ -377,7 +377,7 @@ } // Custom operators for database - extension Kassandra { + extension KassandraClient { subscript(_ database: String) -> Bool { do { let request = Raw(query: "USE \(database);") diff --git a/Sources/KassandraDelegate.swift b/Sources/Kassandra/KassandraDelegate.swift similarity index 100% rename from Sources/KassandraDelegate.swift rename to Sources/Kassandra/KassandraDelegate.swift diff --git a/Sources/Kind.swift b/Sources/Kassandra/Kind.swift similarity index 100% rename from Sources/Kind.swift rename to Sources/Kassandra/Kind.swift diff --git a/Sources/Model.swift b/Sources/Kassandra/Model.swift similarity index 100% rename from Sources/Model.swift rename to Sources/Kassandra/Model.swift diff --git a/Sources/Query.swift b/Sources/Kassandra/Query/Query.swift similarity index 100% rename from Sources/Query.swift rename to Sources/Kassandra/Query/Query.swift diff --git a/Sources/QueryBuilder.swift b/Sources/Kassandra/QueryBuilder.swift similarity index 100% rename from Sources/QueryBuilder.swift rename to Sources/Kassandra/QueryBuilder.swift diff --git a/Sources/Raw.swift b/Sources/Kassandra/Raw.swift similarity index 100% rename from Sources/Raw.swift rename to Sources/Kassandra/Raw.swift diff --git a/Sources/Request.swift b/Sources/Kassandra/Request.swift similarity index 100% rename from Sources/Request.swift rename to Sources/Kassandra/Request.swift diff --git a/Sources/Result.swift b/Sources/Kassandra/Result.swift similarity index 100% rename from Sources/Result.swift rename to Sources/Kassandra/Result.swift diff --git a/Sources/Select.swift b/Sources/Kassandra/Select.swift similarity index 100% rename from Sources/Select.swift rename to Sources/Kassandra/Select.swift diff --git a/Sources/Table.swift b/Sources/Kassandra/Table.swift similarity index 100% rename from Sources/Table.swift rename to Sources/Kassandra/Table.swift diff --git a/Sources/Update.swift b/Sources/Kassandra/Update.swift similarity index 100% rename from Sources/Update.swift rename to Sources/Kassandra/Update.swift