xcfit 0.3.0 → 0.4.0

data/XCFitDemo/LaunchFitnesse

@@ -1,7 +1,20 @@
-FITNESSE_PORT=8080
+##############
+# PROPERTIES #
+##############
+
+MY_PATH=$(dirname $0)
+SCRIPT_DIR=$(dirname "$(readlink "${BASH_SOURCE[0]}")")
 START=1
 CURL_CONNECTION_REFUSED_CODE=7
+
+#################
+# CONFIGURATION #
+#################
+
+FITNESSE_PORT=8080
+FITNESSE_EXECUTABLE_PATH=${SCRIPT_DIR}/fitnesse-standalone.jar
 FITNESSE_ROOT_CONTENT_FILE=FitnesseRoot/content.txt
+
 ####################################
 # Command Line Argument Processing #
 ####################################
@@ -12,7 +25,7 @@ while [ "$1" != "" ]; do
 		-p | --port )			shift
 								FITNESSE_PORT=$1
                                 ;;
-                                
+								
 		-k | --kill )			shift
 								START=0
                                 ;;
@@ -25,12 +38,27 @@ done
 # Subroutines #
 ###############
 
+function java_check {
+	if ! type java &> /dev/null ;  then
+		echo "Java (JRE) not found"
+    	echo "Download the latest version of Java?"
+		select yn in "Get Java for Mac" "Not Now"; do
+			case $yn in 
+				"Get Java for Mac" ) open "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"; break;;
+				"Not Now" ) break;;
+			esac
+		done
+		exit 0
+	fi
+}
+
 function fitnesse_kill {
 	lsof -n -i4TCP:$FITNESSE_PORT | awk ' { print $2 }' | sed -n 2p | xargs kill -9
 }
 
 function fitnesse_check {
-	if [ ! -f "fitnesse-standalone.jar" ]; then
+
+	if [ ! -f "${FITNESSE_EXECUTABLE_PATH}" ]; then
 		echo "Fitnesse-Standalone.jar missing!"
     	echo "Download the latest fitnesse-standlalone.jar to the current directory from Fitnesse.org"
 		select yn in "Goto http://fitnesse.org" "Not Now"; do
@@ -39,12 +67,18 @@ function fitnesse_check {
 				"Not Now" ) break;;
 			esac
 		done
+		popd 2>&1 > /dev/null
 		exit 0
 	fi
+
 }
 
 function fitnesse_start {
-	java -jar fitnesse-standalone.jar -e 0 -p ${FITNESSE_PORT} &
+	echo "# Fitnesse Info     "
+	echo "# Jar=${FITNESSE_EXECUTABLE_PATH}"
+	echo "# Port=${FITNESSE_PORT}"
+	echo "# Root=."
+	java -jar ${FITNESSE_EXECUTABLE_PATH} -e 0 -p ${FITNESSE_PORT} &
 }
 
 function fitnesse_wait {
@@ -63,7 +97,7 @@ function fitnesse_open {
 }
 
 function fitnesse_setup {
-	if [ ! -f "FitnesseRoot/content.txt" ]; then
+	if [ ! -f "${FITNESSE_ROOT_CONTENT_FILE}" ]; then
 		echo "''Auto Generated By !-"OCSlimProject"-! Do Not Modify This Page''" > $FITNESSE_ROOT_CONTENT_FILE
 		echo "!define TEST_SYSTEM {slim}" >> $FITNESSE_ROOT_CONTENT_FILE
 		echo "!define TEST_RUNNER {!-./OCSlimProjectTestRunner.sh-!}" >> $FITNESSE_ROOT_CONTENT_FILE
@@ -83,6 +117,10 @@ function fitnesse_launch {
 
 function fitnesse_main {
 
+	pushd $MY_PATH 2>&1 > /dev/null
+	
+	# Check Java Exists	
+	java_check
 	# Check Fitnesse Exists
 	fitnesse_check	
 	# Enable Job Control
@@ -91,6 +129,9 @@ function fitnesse_main {
 	fitnesse_launch
 	# Return Foreground control to Fitnesse
 	fg %1
+	
+	popd 2>&1 > /dev/null
+	
 }
 
 
@@ -105,7 +146,7 @@ function main {
 	0)  echo "Killing Processes on Port $FITNESSE_PORT"
 		fitnesse_kill
 		;;
-	1)  echo  "Starting Fitnesse on Port $FITNESSE_PORT"
+	1)  echo  "Launching Fitnesse"
 		fitnesse_main
 		;;
 	esac

data/XCFitDemo/Podfile

@@ -1,9 +1,9 @@
 use_frameworks!
 
 target 'XCFitDemoTests' do
-  pod 'XCFit', :path => '../'
+  pod 'XCFit'
 end  
 
 target 'XCFitAcceptanceTests' do
-  pod 'XCFit', :path => '../'
+  pod 'XCFit'
 end  

data/XCFitDemo/Podfile.lock

@@ -1,22 +1,18 @@
 PODS:
   - cslim (1.1.3)
-  - OCSlimProject (1.1):
+  - OCSlimProject (1.2):
     - cslim
   - XCFit (0.1.0):
     - OCSlimProject
 
 DEPENDENCIES:
-  - XCFit (from `../`)
-
-EXTERNAL SOURCES:
-  XCFit:
-    :path: "../"
+  - XCFit
 
 SPEC CHECKSUMS:
   cslim: acd60006b3d87c180f008f7c9074bd583c345f98
-  OCSlimProject: 7f9bef4576d0bcc3fca1c3d35724d9016784710b
-  XCFit: d9cb29f4fe1360187fdd0440aecadc4445e2fcaf
+  OCSlimProject: 066615f2932b2073c537f2bfecd5d1c83fd46452
+  XCFit: ccbebb5ffbb4adbc9c41ebc06f5ff6d700d9d4fe
 
-PODFILE CHECKSUM: d116b087519825ca0b46682484482a89cd6a370d
+PODFILE CHECKSUM: 66716f559f89c6ac7538a569f386c0163335c297
 
 COCOAPODS: 1.0.1

data/XCFitDemo/Pods/Manifest.lock

@@ -1,22 +1,18 @@
 PODS:
   - cslim (1.1.3)
-  - OCSlimProject (1.1):
+  - OCSlimProject (1.2):
     - cslim
   - XCFit (0.1.0):
     - OCSlimProject
 
 DEPENDENCIES:
-  - XCFit (from `../`)
-
-EXTERNAL SOURCES:
-  XCFit:
-    :path: "../"
+  - XCFit
 
 SPEC CHECKSUMS:
   cslim: acd60006b3d87c180f008f7c9074bd583c345f98
-  OCSlimProject: 7f9bef4576d0bcc3fca1c3d35724d9016784710b
-  XCFit: d9cb29f4fe1360187fdd0440aecadc4445e2fcaf
+  OCSlimProject: 066615f2932b2073c537f2bfecd5d1c83fd46452
+  XCFit: ccbebb5ffbb4adbc9c41ebc06f5ff6d700d9d4fe
 
-PODFILE CHECKSUM: d116b087519825ca0b46682484482a89cd6a370d
+PODFILE CHECKSUM: 66716f559f89c6ac7538a569f386c0163335c297
 
 COCOAPODS: 1.0.1

data/XCFitDemo/Pods/OCSlimProject/Pod/Support/SharedSupport/LICENCE.txt

@@ -0,0 +1,214 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license set
+forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to
+control, and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may participate in
+any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement, including but not limited to the risks and costs of
+program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
+as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the Agreement
+is published, Contributor may elect to distribute the Program (including its
+Contributions) under the new version. Except as expressly stated in Sections
+2(a) and 2(b) above, Recipient receives no rights or licenses to the
+intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+

data/XCFitDemo/Pods/OCSlimProject/Pod/Support/SharedSupport/LaunchFitnesse

@@ -1,7 +1,20 @@
-FITNESSE_PORT=8080
+##############
+# PROPERTIES #
+##############
+
+MY_PATH=$(dirname $0)
+SCRIPT_DIR=$(dirname "$(readlink "${BASH_SOURCE[0]}")")
 START=1
 CURL_CONNECTION_REFUSED_CODE=7
+
+#################
+# CONFIGURATION #
+#################
+
+FITNESSE_PORT=8080
+FITNESSE_EXECUTABLE_PATH=${SCRIPT_DIR}/fitnesse-standalone.jar
 FITNESSE_ROOT_CONTENT_FILE=FitnesseRoot/content.txt
+
 ####################################
 # Command Line Argument Processing #
 ####################################
@@ -12,7 +25,7 @@ while [ "$1" != "" ]; do
 		-p | --port )			shift
 								FITNESSE_PORT=$1
                                 ;;
-                                
+								
 		-k | --kill )			shift
 								START=0
                                 ;;
@@ -25,12 +38,27 @@ done
 # Subroutines #
 ###############
 
+function java_check {
+	if ! type java &> /dev/null ;  then
+		echo "Java (JRE) not found"
+    	echo "Download the latest version of Java?"
+		select yn in "Get Java for Mac" "Not Now"; do
+			case $yn in 
+				"Get Java for Mac" ) open "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"; break;;
+				"Not Now" ) break;;
+			esac
+		done
+		exit 0
+	fi
+}
+
 function fitnesse_kill {
 	lsof -n -i4TCP:$FITNESSE_PORT | awk ' { print $2 }' | sed -n 2p | xargs kill -9
 }
 
 function fitnesse_check {
-	if [ ! -f "fitnesse-standalone.jar" ]; then
+
+	if [ ! -f "${FITNESSE_EXECUTABLE_PATH}" ]; then
 		echo "Fitnesse-Standalone.jar missing!"
     	echo "Download the latest fitnesse-standlalone.jar to the current directory from Fitnesse.org"
 		select yn in "Goto http://fitnesse.org" "Not Now"; do
@@ -39,12 +67,18 @@ function fitnesse_check {
 				"Not Now" ) break;;
 			esac
 		done
+		popd 2>&1 > /dev/null
 		exit 0
 	fi
+
 }
 
 function fitnesse_start {
-	java -jar fitnesse-standalone.jar -e 0 -p ${FITNESSE_PORT} &
+	echo "# Fitnesse Info     "
+	echo "# Jar=${FITNESSE_EXECUTABLE_PATH}"
+	echo "# Port=${FITNESSE_PORT}"
+	echo "# Root=."
+	java -jar ${FITNESSE_EXECUTABLE_PATH} -e 0 -p ${FITNESSE_PORT} &
 }
 
 function fitnesse_wait {
@@ -63,7 +97,7 @@ function fitnesse_open {
 }
 
 function fitnesse_setup {
-	if [ ! -f "FitnesseRoot/content.txt" ]; then
+	if [ ! -f "${FITNESSE_ROOT_CONTENT_FILE}" ]; then
 		echo "''Auto Generated By !-"OCSlimProject"-! Do Not Modify This Page''" > $FITNESSE_ROOT_CONTENT_FILE
 		echo "!define TEST_SYSTEM {slim}" >> $FITNESSE_ROOT_CONTENT_FILE
 		echo "!define TEST_RUNNER {!-./OCSlimProjectTestRunner.sh-!}" >> $FITNESSE_ROOT_CONTENT_FILE
@@ -83,6 +117,10 @@ function fitnesse_launch {
 
 function fitnesse_main {
 
+	pushd $MY_PATH 2>&1 > /dev/null
+	
+	# Check Java Exists	
+	java_check
 	# Check Fitnesse Exists
 	fitnesse_check	
 	# Enable Job Control
@@ -91,6 +129,9 @@ function fitnesse_main {
 	fitnesse_launch
 	# Return Foreground control to Fitnesse
 	fg %1
+	
+	popd 2>&1 > /dev/null
+	
 }
 
 
@@ -105,7 +146,7 @@ function main {
 	0)  echo "Killing Processes on Port $FITNESSE_PORT"
 		fitnesse_kill
 		;;
-	1)  echo  "Starting Fitnesse on Port $FITNESSE_PORT"
+	1)  echo  "Launching Fitnesse"
 		fitnesse_main
 		;;
 	esac