From 21f0b961ed36aad0b047952138f8d3345fbae28f Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 09:53:41 -0500 Subject: [PATCH 01/11] Remove slash --- bin/Mac/RunSlimTestsTargetWithSlimPort | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/Mac/RunSlimTestsTargetWithSlimPort b/bin/Mac/RunSlimTestsTargetWithSlimPort index b0f34aa..f9413a6 100755 --- a/bin/Mac/RunSlimTestsTargetWithSlimPort +++ b/bin/Mac/RunSlimTestsTargetWithSlimPort @@ -1,3 +1,3 @@ #! /bin/sh -SLIM_PORT=$1 xcodebuild -workspace "ObjectiveCSlim.xcworkspace/" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build +SLIM_PORT=$1 xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build From 171aa81dd0eb599207308adfc1cf9ae85acc1786 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 09:55:51 -0500 Subject: [PATCH 02/11] Update Travis to run Mac acceptance tests only --- .travis.yml | 4 ++-- travis/build.sh | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100755 travis/build.sh diff --git a/.travis.yml b/.travis.yml index 9fb02a2..6878a5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: objective-c - -script: travis/build.sh +osx_image: xcode7.3 +script: ./bin/Mac/RunSlimTests diff --git a/travis/build.sh b/travis/build.sh deleted file mode 100755 index afa2d87..0000000 --- a/travis/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e - -xcodebuild ONLY_ACTIVE_ARCH=NO -scheme iOSSpecs -sdk iphonesimulator6.1 -configuration Debug clean build -workspace ObjectiveCSlim.xcworkspace From 36efbcc1125d46bc839742d5d1cfc140a7ff41aa Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:02:55 -0500 Subject: [PATCH 03/11] Remove Gemfile.lock --- Gemfile.lock | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index daa75c2..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,40 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (3.2.15) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) - claide (0.3.2) - cocoapods (0.27.1) - activesupport (>= 3.2.15, < 4) - claide (~> 0.3.2) - cocoapods-core (= 0.27.1) - cocoapods-downloader (~> 0.2.0) - colored (~> 1.2) - escape (~> 0.0.4) - json_pure (~> 1.8) - open4 (~> 1.3) - xcodeproj (~> 0.14.0) - cocoapods-core (0.27.1) - activesupport (>= 3.2.15, < 4) - json_pure (~> 1.8) - nap (~> 0.5) - cocoapods-downloader (0.2.0) - colored (1.2) - escape (0.0.4) - i18n (0.6.5) - json_pure (1.8.1) - multi_json (1.8.2) - nap (0.5.1) - open4 (1.3.0) - rake (10.1.0) - xcodeproj (0.14.1) - activesupport (~> 3.0) - colored (~> 1.2) - rake - -PLATFORMS - ruby - -DEPENDENCIES - cocoapods From b12a90ef83168e404e312da7b64d5f85574a9b20 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:04:12 -0500 Subject: [PATCH 04/11] Add Travis status indicator --- README.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.markdown b/README.markdown index 9ced2b4..8f0af65 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,7 @@ # Using Objective C Slim +[![Build Status](https://travis-ci.org/ericmeyer/ObjectiveCSlim.svg?branch=master)](https://travis-ci.org/ericmeyer/ObjectiveCSlim) + ## See here for installation/setup instructions: https://github.com/ericmeyer/OCSlim-Templates # What is Objective C Slim? From debba394159327efa09941f8a6d118963bc0bb9e Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:17:38 -0500 Subject: [PATCH 05/11] Fix it --- ObjectiveCSlim.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveCSlim.xcodeproj/project.pbxproj b/ObjectiveCSlim.xcodeproj/project.pbxproj index 9efeb51..7dfc7ad 100644 --- a/ObjectiveCSlim.xcodeproj/project.pbxproj +++ b/ObjectiveCSlim.xcodeproj/project.pbxproj @@ -909,7 +909,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -rf /tmp/ObjectiveCSlim\nmkdir /tmp/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME /tmp/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests"; + shellScript = "mkdir -p /tmp/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME /tmp/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests"; }; 07CB31521827E20A008F4658 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; From a58207655543e7f2e690a67678224fcfda593215 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:25:33 -0500 Subject: [PATCH 06/11] Add echo statements --- bin/Mac/RunSlimTests | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/Mac/RunSlimTests b/bin/Mac/RunSlimTests index 9f60305..964304c 100755 --- a/bin/Mac/RunSlimTests +++ b/bin/Mac/RunSlimTests @@ -1,5 +1,7 @@ if [[ $SLIM_PORT ]]; then + echo "Running tests on port $SLIM_PORT" "/tmp/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT else + echo "Running tests headless" "./bin/Mac/RunSlimTestsHeadless" fi \ No newline at end of file From 4224d8e9b0363d2102cfd6f68e103ba483c310a1 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:31:50 -0500 Subject: [PATCH 07/11] Move tmp into project --- ObjectiveCSlim.xcodeproj/project.pbxproj | 2 +- bin/Mac/RunSlimTests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ObjectiveCSlim.xcodeproj/project.pbxproj b/ObjectiveCSlim.xcodeproj/project.pbxproj index 7dfc7ad..95cdd5c 100644 --- a/ObjectiveCSlim.xcodeproj/project.pbxproj +++ b/ObjectiveCSlim.xcodeproj/project.pbxproj @@ -909,7 +909,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "mkdir -p /tmp/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME /tmp/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests"; + shellScript = "mkdir -p ./build/ObjectiveCSlim\ncp -r $CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME ./build/ObjectiveCSlim/$FULL_PRODUCT_NAME\n./bin/Mac/RunSlimTests"; }; 07CB31521827E20A008F4658 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; diff --git a/bin/Mac/RunSlimTests b/bin/Mac/RunSlimTests index 964304c..30b79c4 100755 --- a/bin/Mac/RunSlimTests +++ b/bin/Mac/RunSlimTests @@ -1,6 +1,6 @@ if [[ $SLIM_PORT ]]; then echo "Running tests on port $SLIM_PORT" - "/tmp/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT + "./build/ObjectiveCSlim/AcceptanceTests.app/Contents/MacOS/AcceptanceTests" $SLIM_PORT else echo "Running tests headless" "./bin/Mac/RunSlimTestsHeadless" From 4c9f5b87eebbb6e6754e36230871b2f66afa7e37 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:39:02 -0500 Subject: [PATCH 08/11] Run it twice --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6878a5f..8f175ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: objective-c osx_image: xcode7.3 -script: ./bin/Mac/RunSlimTests +script: ./bin/Mac/RunSlimTests && ./bin/Mac/RunSlimTests From bbf1182e074637b584603c3f76d19273dff65bfe Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:42:46 -0500 Subject: [PATCH 09/11] Add separate Travis script --- .travis.yml | 2 +- travis/Mac | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 travis/Mac diff --git a/.travis.yml b/.travis.yml index 8f175ef..ce97274 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: objective-c osx_image: xcode7.3 -script: ./bin/Mac/RunSlimTests && ./bin/Mac/RunSlimTests +script: ./travis/Mac diff --git a/travis/Mac b/travis/Mac new file mode 100755 index 0000000..d3572b3 --- /dev/null +++ b/travis/Mac @@ -0,0 +1,2 @@ +xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build +java -jar fitnesse-standalone.jar -c "MacRunnerTests?suite&format=text" From a8995d3042a7296fe11580bc39f603b73c5dfbec Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:48:00 -0500 Subject: [PATCH 10/11] Add xcworkspace --- .gitignore | 2 -- .../contents.xcworkspacedata | 10 +++++++ .../ObjectiveCSlim.xcscmblueprint | 30 +++++++++++++++++++ travis/Mac => travisMac | 1 + 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 ObjectiveCSlim.xcworkspace/contents.xcworkspacedata create mode 100644 ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint rename travis/Mac => travisMac (92%) diff --git a/.gitignore b/.gitignore index 2608a64..815b024 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,6 @@ build/* !default.mode2v3 *.perspectivev3 !default.perspectivev3 -*.xcworkspace -!default.xcworkspace xcuserdata profile *.moved-aside diff --git a/ObjectiveCSlim.xcworkspace/contents.xcworkspacedata b/ObjectiveCSlim.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..953fd45 --- /dev/null +++ b/ObjectiveCSlim.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint b/ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint new file mode 100644 index 0000000..ee27ff1 --- /dev/null +++ b/ObjectiveCSlim.xcworkspace/xcshareddata/ObjectiveCSlim.xcscmblueprint @@ -0,0 +1,30 @@ +{ + "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E", + "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { + + }, + "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { + "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" : 0, + "2184FCAD113E505BCD603D89586240249E5E2A1B" : 0 + }, + "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "81B1387C-A182-4F4D-B759-C2A650684CA9", + "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { + "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" : "ObjectiveCSlim\/", + "2184FCAD113E505BCD603D89586240249E5E2A1B" : "ObjectiveCSlim\/cslim\/" + }, + "DVTSourceControlWorkspaceBlueprintNameKey" : "ObjectiveCSlim", + "DVTSourceControlWorkspaceBlueprintVersion" : 204, + "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ObjectiveCSlim.xcworkspace", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/dougbradbury\/cslim.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2184FCAD113E505BCD603D89586240249E5E2A1B" + }, + { + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ericmeyer\/ObjectiveCSlim.git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", + "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "89D1DB61C99DA86E7B369DDD262B7BA0762A0F8E" + } + ] +} \ No newline at end of file diff --git a/travis/Mac b/travisMac similarity index 92% rename from travis/Mac rename to travisMac index d3572b3..f931272 100755 --- a/travis/Mac +++ b/travisMac @@ -1,2 +1,3 @@ xcodebuild -workspace "ObjectiveCSlim.xcworkspace" -scheme "MacAcceptanceTests" -sdk macosx -configuration Debug clean build +ls -lR ./build java -jar fitnesse-standalone.jar -c "MacRunnerTests?suite&format=text" From 1c53487fcab1a7e142ac6665d1045d1555d79d94 Mon Sep 17 00:00:00 2001 From: Eric Meyer Date: Fri, 16 Sep 2016 10:54:05 -0500 Subject: [PATCH 11/11] fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce97274..1f2ce5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: objective-c osx_image: xcode7.3 -script: ./travis/Mac +script: ./travisMac