Merge pull request #50 from jpsim/spm

add support for Swift Package Manager

.gitignore

@@ -19,3 +19,5 @@ DerivedData
 *.xcscmblueprint
 
 Carthage/Build
+Packages/
+.build/

.travis.yml

@@ -1,8 +1,21 @@
 language: objective-c
 osx_image: xcode7.2
-xcode_workspace: Commandant.xcworkspace
-xcode_scheme: Commandant
-script: script/cibuild
+script: placeholder # workaround for https://github.com/travis-ci/travis-ci/issues/4681
+matrix:
+  exclude:
+    - script: placeholder # workaround for https://github.com/travis-ci/travis-ci/issues/4681
+  include:
+    - script: script/cibuild
+      env: JOB=Xcode
+      xcode_workspace: Commandant.xcworkspace
+      xcode_scheme: Commandant
+    - script: swift build
+      env: JOB=SPM
+      before_install:
+        - export SWIFT_VERSION=swift-DEVELOPMENT-SNAPSHOT-2016-01-25-a
+        - curl https://swift.org/builds/development/xcode/$SWIFT_VERSION/$SWIFT_VERSION-osx.pkg -o swift.pkg
+        - sudo installer -pkg swift.pkg -target /
+        - export PATH="/Library/Developer/Toolchains/$SWIFT_VERSION.xctoolchain/usr/bin:$PATH"
 notifications:
   email: false
   slack:

Commandant.xcodeproj/project.pbxproj

@@ -41,7 +41,7 @@
 		D00CCDD91A20717400109F8C /* Commandant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Commandant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D00CCDDD1A20717400109F8C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D00CCDDE1A20717400109F8C /* Commandant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Commandant.h; sourceTree = "<group>"; };
-		D00CCDE41A20717400109F8C /* CommandantTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CommandantTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		D00CCDE41A20717400109F8C /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		D00CCDEA1A20717400109F8C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		D00CCDF81A20719500109F8C /* Common.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
 		D00CCDFA1A20719500109F8C /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
@@ -99,7 +99,7 @@
 			isa = PBXGroup;
 			children = (
 				D00CCDDB1A20717400109F8C /* Commandant */,
-				D00CCDE81A20717400109F8C /* CommandantTests */,
+				D00CCDE81A20717400109F8C /* Tests */,
 				D00CCDF61A20719500109F8C /* Configuration */,
 				D00CCDDA1A20717400109F8C /* Products */,
 			);
@@ -110,7 +110,7 @@
 			isa = PBXGroup;
 			children = (
 				D00CCDD91A20717400109F8C /* Commandant.framework */,
-				D00CCDE41A20717400109F8C /* CommandantTests.xctest */,
+				D00CCDE41A20717400109F8C /* Tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -123,7 +123,8 @@
 				D0BF14F91A4C893B003147BC /* Built-in Commands */,
 				D00CCDDC1A20717400109F8C /* Supporting Files */,
 			);
-			path = Commandant;
+			name = Commandant;
+			path = Sources/Commandant;
 			sourceTree = "<group>";
 		};
 		D00CCDDC1A20717400109F8C /* Supporting Files */ = {
@@ -135,14 +136,14 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		D00CCDE81A20717400109F8C /* CommandantTests */ = {
+		D00CCDE81A20717400109F8C /* Tests */ = {
 			isa = PBXGroup;
 			children = (
 				CDFC88351C3C0612003AC8F8 /* CommandSpec.swift */,
 				D00CCE281A20741C00109F8C /* OptionSpec.swift */,
 				D00CCDE91A20717400109F8C /* Supporting Files */,
 			);
-			path = CommandantTests;
+			path = Tests;
 			sourceTree = "<group>";
 		};
 		D00CCDE91A20717400109F8C /* Supporting Files */ = {
@@ -275,9 +276,9 @@
 			productReference = D00CCDD91A20717400109F8C /* Commandant.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		D00CCDE31A20717400109F8C /* CommandantTests */ = {
+		D00CCDE31A20717400109F8C /* Tests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D00CCDF21A20717400109F8C /* Build configuration list for PBXNativeTarget "CommandantTests" */;
+			buildConfigurationList = D00CCDF21A20717400109F8C /* Build configuration list for PBXNativeTarget "Tests" */;
 			buildPhases = (
 				D00CCDE01A20717400109F8C /* Sources */,
 				D00CCDE11A20717400109F8C /* Frameworks */,
@@ -288,9 +289,9 @@
 			dependencies = (
 				D00CCDE71A20717400109F8C /* PBXTargetDependency */,
 			);
-			name = CommandantTests;
-			productName = CommandantTests;
-			productReference = D00CCDE41A20717400109F8C /* CommandantTests.xctest */;
+			name = Tests;
+			productName = Tests;
+			productReference = D00CCDE41A20717400109F8C /* Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
@@ -325,7 +326,7 @@
 			projectRoot = "";
 			targets = (
 				D00CCDD81A20717400109F8C /* Commandant */,
-				D00CCDE31A20717400109F8C /* CommandantTests */,
+				D00CCDE31A20717400109F8C /* Tests */,
 			);
 		};
 /* End PBXProject section */
@@ -418,7 +419,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Commandant/Info.plist;
+				INFOPLIST_FILE = Sources/Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -435,7 +436,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Commandant/Info.plist;
+				INFOPLIST_FILE = Sources/Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -450,7 +451,7 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = CommandantTests/Info.plist;
+				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -464,7 +465,7 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = CommandantTests/Info.plist;
+				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -491,7 +492,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Commandant/Info.plist;
+				INFOPLIST_FILE = Sources/Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -506,7 +507,7 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = CommandantTests/Info.plist;
+				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -533,7 +534,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = Commandant/Info.plist;
+				INFOPLIST_FILE = Sources/Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -549,7 +550,7 @@
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = CommandantTests/Info.plist;
+				INFOPLIST_FILE = Tests/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -580,7 +581,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D00CCDF21A20717400109F8C /* Build configuration list for PBXNativeTarget "CommandantTests" */ = {
+		D00CCDF21A20717400109F8C /* Build configuration list for PBXNativeTarget "Tests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D00CCDF31A20717400109F8C /* Debug */,

Commandant.xcodeproj/xcshareddata/xcschemes/Commandant.xcscheme

@@ -29,8 +29,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D00CCDE31A20717400109F8C"
-               BuildableName = "CommandantTests.xctest"
-               BlueprintName = "CommandantTests"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
                ReferencedContainer = "container:Commandant.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,8 +47,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D00CCDE31A20717400109F8C"
-               BuildableName = "CommandantTests.xctest"
-               BlueprintName = "CommandantTests"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
                ReferencedContainer = "container:Commandant.xcodeproj">
             </BuildableReference>
          </TestableReference>

Package.swift

@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+  name: "Commandant",
+  dependencies: [
+    .Package(url: "https://github.com/antitypical/Result.git", majorVersion: 1)
+  ]
+)