Skip to content

Commit

Permalink
Merge pull request #9 from stepanhruda/better-naming
Browse files Browse the repository at this point in the history
Better naming
  • Loading branch information
stepanhruda committed Dec 20, 2015
2 parents 10acd1a + 1d96bda commit bc5b3e9
Show file tree
Hide file tree
Showing 19 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ script:
- make test

env:
- PGHOST=localhost PGUSER=travis PGPORT=5432 DBNAME=elephant
- PGHOST=localhost PGUSER=travis PGPORT=5432 DBNAME=spec
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM swiftdocker/swift:latest

RUN apt-get -y update && apt-get -y install libpq-dev make git postgresql-client
COPY . /var/www/Elephant
WORKDIR /var/www/Elephant
COPY . /var/www/PostgreSQL-Swift
WORKDIR /var/www/PostgreSQL-Swift
RUN touch Makefile
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TARGET=elephant
TARGET=PostgreSQL
UNAME := $(shell uname)
.PHONY: test db.migrate db.seed db.schema

Expand Down Expand Up @@ -49,4 +49,4 @@ development.setup:
@docker-compose run migrate

development.test:
cd "OS X development" && xctool -workspace Elephant.xcworkspace -scheme Elephant test
cd "OS X development" && xctool -workspace PostgreSQL.xcworkspace -scheme PostgreSQL test
2 changes: 1 addition & 1 deletion OS X development/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
platform :osx, '10.10'
link_with 'Elephant'
link_with 'PostgreSQL'

use_frameworks!
pod 'Quick'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
C0D420A61C13769B00A9EF85 /* Elephant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D4209B1C13769B00A9EF85 /* Elephant.framework */; };
C0D420A61C13769B00A9EF85 /* PostgreSQL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D4209B1C13769B00A9EF85 /* PostgreSQL.framework */; };
C0D4210A1C138C5B00A9EF85 /* libpq.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D421091C138C5B00A9EF85 /* libpq.framework */; };
C0F648971C25F49900A7ABDE /* Byteswap.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648901C25F49900A7ABDE /* Byteswap.swift */; };
C0F648981C25F49900A7ABDE /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648911C25F49900A7ABDE /* Query.swift */; };
Expand All @@ -16,7 +16,7 @@
C0F6489B1C25F49900A7ABDE /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648941C25F49900A7ABDE /* Connection.swift */; };
C0F6489C1C25F49900A7ABDE /* ConnectionParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648951C25F49900A7ABDE /* ConnectionParameters.swift */; };
C0F6489D1C25F49900A7ABDE /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648961C25F49900A7ABDE /* Database.swift */; };
C0F648AD1C25F52500A7ABDE /* Elephant.h in Headers */ = {isa = PBXBuildFile; fileRef = C0F648AA1C25F52500A7ABDE /* Elephant.h */; settings = {ATTRIBUTES = (Public, ); }; };
C0F648AD1C25F52500A7ABDE /* PostgreSQL.h in Headers */ = {isa = PBXBuildFile; fileRef = C0F648AA1C25F52500A7ABDE /* PostgreSQL.h */; settings = {ATTRIBUTES = (Public, ); }; };
C0F648AF1C25F57700A7ABDE /* ConnectionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648A21C25F4FF00A7ABDE /* ConnectionSpec.swift */; };
C0F648B01C25F57700A7ABDE /* QueryResultSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648A31C25F4FF00A7ABDE /* QueryResultSpec.swift */; };
C0F648B11C25F57700A7ABDE /* DatabaseSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0F648A41C25F4FF00A7ABDE /* DatabaseSpec.swift */; };
Expand All @@ -29,16 +29,16 @@
containerPortal = C0D420921C13769B00A9EF85 /* Project object */;
proxyType = 1;
remoteGlobalIDString = C0D4209A1C13769B00A9EF85;
remoteInfo = Elephant;
remoteInfo = PostgreSQL;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
17E9AC86EF1FDB033AC8C828 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
707CBAEE41A9F264E256E4CA /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
AD1168C2B49409CAE9F17829 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
C0D4209B1C13769B00A9EF85 /* Elephant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Elephant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C0D420A51C13769B00A9EF85 /* ElephantTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ElephantTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C0D4209B1C13769B00A9EF85 /* PostgreSQL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PostgreSQL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C0D420A51C13769B00A9EF85 /* PostgreSQLTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PostgreSQLTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C0D421091C138C5B00A9EF85 /* libpq.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = libpq.framework; sourceTree = "<group>"; };
C0F648901C25F49900A7ABDE /* Byteswap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Byteswap.swift; sourceTree = "<group>"; };
C0F648911C25F49900A7ABDE /* Query.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Query.swift; sourceTree = "<group>"; };
Expand All @@ -50,9 +50,9 @@
C0F648A21C25F4FF00A7ABDE /* ConnectionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectionSpec.swift; sourceTree = "<group>"; };
C0F648A31C25F4FF00A7ABDE /* QueryResultSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryResultSpec.swift; sourceTree = "<group>"; };
C0F648A41C25F4FF00A7ABDE /* DatabaseSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseSpec.swift; sourceTree = "<group>"; };
C0F648A91C25F52500A7ABDE /* Elephant Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Elephant Info.plist"; sourceTree = "<group>"; };
C0F648AA1C25F52500A7ABDE /* Elephant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Elephant.h; sourceTree = "<group>"; };
C0F648AB1C25F52500A7ABDE /* ElephantTests Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "ElephantTests Info.plist"; sourceTree = "<group>"; };
C0F648A91C25F52500A7ABDE /* PostgreSQL Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "PostgreSQL Info.plist"; sourceTree = "<group>"; };
C0F648AA1C25F52500A7ABDE /* PostgreSQL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostgreSQL.h; sourceTree = "<group>"; };
C0F648AB1C25F52500A7ABDE /* PostgreSQLTests Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "PostgreSQLTests Info.plist"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -69,7 +69,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C0D420A61C13769B00A9EF85 /* Elephant.framework in Frameworks */,
C0D420A61C13769B00A9EF85 /* PostgreSQL.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -100,8 +100,8 @@
C0D4209C1C13769B00A9EF85 /* Products */ = {
isa = PBXGroup;
children = (
C0D4209B1C13769B00A9EF85 /* Elephant.framework */,
C0D420A51C13769B00A9EF85 /* ElephantTests.xctest */,
C0D4209B1C13769B00A9EF85 /* PostgreSQL.framework */,
C0D420A51C13769B00A9EF85 /* PostgreSQLTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -144,9 +144,9 @@
C0F648A81C25F52500A7ABDE /* Supporting Files */ = {
isa = PBXGroup;
children = (
C0F648A91C25F52500A7ABDE /* Elephant Info.plist */,
C0F648AA1C25F52500A7ABDE /* Elephant.h */,
C0F648AB1C25F52500A7ABDE /* ElephantTests Info.plist */,
C0F648A91C25F52500A7ABDE /* PostgreSQL Info.plist */,
C0F648AA1C25F52500A7ABDE /* PostgreSQL.h */,
C0F648AB1C25F52500A7ABDE /* PostgreSQLTests Info.plist */,
);
path = "Supporting Files";
sourceTree = "<group>";
Expand All @@ -158,16 +158,16 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
C0F648AD1C25F52500A7ABDE /* Elephant.h in Headers */,
C0F648AD1C25F52500A7ABDE /* PostgreSQL.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
C0D4209A1C13769B00A9EF85 /* Elephant */ = {
C0D4209A1C13769B00A9EF85 /* PostgreSQL */ = {
isa = PBXNativeTarget;
buildConfigurationList = C0D420AF1C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "Elephant" */;
buildConfigurationList = C0D420AF1C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "PostgreSQL" */;
buildPhases = (
4B8B6311AEDE610201959ABB /* Check Pods Manifest.lock */,
C0D420961C13769B00A9EF85 /* Sources */,
Expand All @@ -181,14 +181,14 @@
);
dependencies = (
);
name = Elephant;
productName = Elephant;
productReference = C0D4209B1C13769B00A9EF85 /* Elephant.framework */;
name = PostgreSQL;
productName = PostgreSQL;
productReference = C0D4209B1C13769B00A9EF85 /* PostgreSQL.framework */;
productType = "com.apple.product-type.framework";
};
C0D420A41C13769B00A9EF85 /* ElephantTests */ = {
C0D420A41C13769B00A9EF85 /* PostgreSQLTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = C0D420B21C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "ElephantTests" */;
buildConfigurationList = C0D420B21C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "PostgreSQLTests" */;
buildPhases = (
C0D420A11C13769B00A9EF85 /* Sources */,
C0D420A21C13769B00A9EF85 /* Frameworks */,
Expand All @@ -199,9 +199,9 @@
dependencies = (
C0D420A81C13769B00A9EF85 /* PBXTargetDependency */,
);
name = ElephantTests;
productName = ElephantTests;
productReference = C0D420A51C13769B00A9EF85 /* ElephantTests.xctest */;
name = PostgreSQLTests;
productName = PostgreSQLTests;
productReference = C0D420A51C13769B00A9EF85 /* PostgreSQLTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
Expand All @@ -222,7 +222,7 @@
};
};
};
buildConfigurationList = C0D420951C13769B00A9EF85 /* Build configuration list for PBXProject "Elephant" */;
buildConfigurationList = C0D420951C13769B00A9EF85 /* Build configuration list for PBXProject "PostgreSQL" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -234,8 +234,8 @@
projectDirPath = "";
projectRoot = "";
targets = (
C0D4209A1C13769B00A9EF85 /* Elephant */,
C0D420A41C13769B00A9EF85 /* ElephantTests */,
C0D4209A1C13769B00A9EF85 /* PostgreSQL */,
C0D420A41C13769B00A9EF85 /* PostgreSQLTests */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -334,7 +334,7 @@
/* Begin PBXTargetDependency section */
C0D420A81C13769B00A9EF85 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C0D4209A1C13769B00A9EF85 /* Elephant */;
target = C0D4209A1C13769B00A9EF85 /* PostgreSQL */;
targetProxy = C0D420A71C13769B00A9EF85 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -441,12 +441,12 @@
"$(PROJECT_DIR)",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Elephant Info.plist";
INFOPLIST_FILE = "Supporting Files/PostgreSQL Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = com.stepanhruda.Elephant;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = technology.stepan.PostgreSQL;
PRODUCT_NAME = PostgreSQL;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand All @@ -467,12 +467,12 @@
"$(PROJECT_DIR)",
);
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Elephant Info.plist";
INFOPLIST_FILE = "Supporting Files/PostgreSQL Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = com.stepanhruda.Elephant;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = technology.stepan.PostgreSQL;
PRODUCT_NAME = PostgreSQL;
SKIP_INSTALL = YES;
};
name = Release;
Expand All @@ -486,10 +486,10 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "Supporting Files/ElephantTests Info.plist";
INFOPLIST_FILE = "Supporting Files/PostgreSQLTests Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.stepanhruda.ElephantTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = technology.stepan.PostgreSQLTests;
PRODUCT_NAME = PostgreSQLTests;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
Expand All @@ -503,17 +503,17 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "Supporting Files/ElephantTests Info.plist";
INFOPLIST_FILE = "Supporting Files/PostgreSQLTests Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.stepanhruda.ElephantTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = technology.stepan.PostgreSQLTests;
PRODUCT_NAME = PostgreSQLTests;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
C0D420951C13769B00A9EF85 /* Build configuration list for PBXProject "Elephant" */ = {
C0D420951C13769B00A9EF85 /* Build configuration list for PBXProject "PostgreSQL" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C0D420AD1C13769B00A9EF85 /* Debug */,
Expand All @@ -522,7 +522,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C0D420AF1C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "Elephant" */ = {
C0D420AF1C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "PostgreSQL" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C0D420B01C13769B00A9EF85 /* Debug */,
Expand All @@ -531,7 +531,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C0D420B21C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "ElephantTests" */ = {
C0D420B21C13769B00A9EF85 /* Build configuration list for PBXNativeTarget "PostgreSQLTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C0D420B31C13769B00A9EF85 /* Debug */,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C0D4209A1C13769B00A9EF85"
BuildableName = "Elephant.framework"
BlueprintName = "Elephant"
ReferencedContainer = "container:Elephant.xcodeproj">
BuildableName = "PostgreSQL.framework"
BlueprintName = "PostgreSQL"
ReferencedContainer = "container:PostgreSQL.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -33,19 +33,19 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C0D420A41C13769B00A9EF85"
BuildableName = "ElephantTests.xctest"
BlueprintName = "ElephantTests"
ReferencedContainer = "container:Elephant.xcodeproj">
BuildableName = "PostgreSQLTests.xctest"
BlueprintName = "PostgreSQLTests"
ReferencedContainer = "container:PostgreSQL.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C0D4209A1C13769B00A9EF85"
BuildableName = "Elephant.framework"
BlueprintName = "Elephant"
ReferencedContainer = "container:Elephant.xcodeproj">
BuildableName = "PostgreSQL.framework"
BlueprintName = "PostgreSQL"
ReferencedContainer = "container:PostgreSQL.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -65,9 +65,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C0D4209A1C13769B00A9EF85"
BuildableName = "Elephant.framework"
BlueprintName = "Elephant"
ReferencedContainer = "container:Elephant.xcodeproj">
BuildableName = "PostgreSQL.framework"
BlueprintName = "PostgreSQL"
ReferencedContainer = "container:PostgreSQL.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -83,9 +83,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C0D4209A1C13769B00A9EF85"
BuildableName = "Elephant.framework"
BlueprintName = "Elephant"
ReferencedContainer = "container:Elephant.xcodeproj">
BuildableName = "PostgreSQL.framework"
BlueprintName = "PostgreSQL"
ReferencedContainer = "container:PostgreSQL.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bc5b3e9

Please sign in to comment.