Add bacon.nu to the Framework bundle resources so it can be loaded wi…

…th: (load "ObjectiveBacon:bacon")

Framework/ObjectiveBacon.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		5122E7041330BFA9009F201C /* BaconSpecification.m in Sources */ = {isa = PBXBuildFile; fileRef = 5122E6FC1330BFA9009F201C /* BaconSpecification.m */; };
 		5122E7051330BFA9009F201C /* ObjectiveBacon.h in Headers */ = {isa = PBXBuildFile; fileRef = 5122E6FD1330BFA9009F201C /* ObjectiveBacon.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5122E7061330BFA9009F201C /* ObjectiveBacon.m in Sources */ = {isa = PBXBuildFile; fileRef = 5122E6FE1330BFA9009F201C /* ObjectiveBacon.m */; };
+		51C12E8913335A3600B731E4 /* bacon.nu in Resources */ = {isa = PBXBuildFile; fileRef = 51C12E8813335A3600B731E4 /* bacon.nu */; };
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@@ -33,6 +34,7 @@
 		5122E6FC1330BFA9009F201C /* BaconSpecification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BaconSpecification.m; path = ../ext/objective_bacon/BaconSpecification.m; sourceTree = SOURCE_ROOT; };
 		5122E6FD1330BFA9009F201C /* ObjectiveBacon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectiveBacon.h; path = ../ext/objective_bacon/ObjectiveBacon.h; sourceTree = SOURCE_ROOT; };
 		5122E6FE1330BFA9009F201C /* ObjectiveBacon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjectiveBacon.m; path = ../ext/objective_bacon/ObjectiveBacon.m; sourceTree = SOURCE_ROOT; };
+		51C12E8813335A3600B731E4 /* bacon.nu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bacon.nu; path = ../NuBacon/lib/bacon.nu; sourceTree = SOURCE_ROOT; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* ObjectiveBacon.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjectiveBacon.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
@@ -82,6 +84,7 @@
 		089C1665FE841158C02AAC07 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				51C12E8813335A3600B731E4 /* bacon.nu */,
 				8DC2EF5A0486A6940098B216 /* Info.plist */,
 				089C1666FE841158C02AAC07 /* InfoPlist.strings */,
 			);
@@ -196,6 +199,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+				51C12E8913335A3600B731E4 /* bacon.nu in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

NuBacon/bacon_spec.nu → NuBacon/spec/bacon_spec.nu

@@ -1,4 +1,4 @@
-(try (load "bacon.nu"))
+(try (load "ObjectiveBacon:bacon"))
 
 (macro catch-failure (block)
   `(try
@@ -531,7 +531,7 @@
     (describe "An completely empty spec (no contexts/specifications)" `(
       (it "does not break" (do ()
         (puts "\n[!] The following summary is from a regression spec and can be ignored:")
-        (~ (system "nush -f ObjectiveBacon -e '(load \"bacon\") ((Bacon sharedInstance) run)'") should be: 0)
+        (~ (system "nush -e '(load \"ObjectiveBacon:bacon\") ((Bacon sharedInstance) run)'") should be: 0)
       ))
     ))
   )

Rakefile

@@ -51,11 +51,9 @@ namespace :framework do
 
   desc 'Run Nu specs'
   task :nu_spec => :install do
-    Dir.chdir('NuBacon') do
-      # TODO nush doesn't use the frameworks in DYLD_FRAMEWORK_PATH, so installing the framework for now
-      #sh "env DYLD_FRAMEWORK_PATH=#{FRAMEWORK_ROOT}/build/Release nush -f ObjectiveBacon bacon_spec.nu"
-      sh "nush -f ObjectiveBacon bacon_spec.nu"
-    end
+    # TODO nush doesn't use the frameworks in DYLD_FRAMEWORK_PATH, so installing the framework for now
+    #sh "env DYLD_FRAMEWORK_PATH=#{FRAMEWORK_ROOT}/build/Release nush -f ObjectiveBacon bacon_spec.nu"
+    sh "nush NuBacon/spec/bacon_spec.nu"
   end
 
   desc 'Install framework'