Add AsyncTest, dylib all the things

jerrymarino · jerrymarino · commit c76b22d2807f · 2018-06-23T12:52:49.000-07:00
Add a test for VimAsync and add it to the example.

For now, everything is a dylib, to simplify the testing process. This is
not ideal for many reasons, but makes many things easier.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ debug: CONFIG=debug
 debug: plugin_so
 
 .PHONY: release
-release: CONFIG=debug
+release: CONFIG=release
 release: vim_lib plugin_so
 
 BASE_OPTS=-Xcc -I$(PYTHON_INCLUDE) \
@@ -46,10 +46,10 @@ renamed_vim_lib: vim_lib
 		$(BUILD_DIR)/$(PLUGIN_NAME)Vim.swiftmodule
 	@ditto $(BUILD_DIR)/Vim.swiftdoc \
 		$(BUILD_DIR)/$(PLUGIN_NAME)Vim.swiftdoc
-	@ditto $(BUILD_DIR)/libVim.a \
-		$(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.a
+	@ditto $(BUILD_DIR)/libVim.dylib \
+		$(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.dylib
 
-.PHONY: vim_async_lib, renamed_vim_lib_async
+.PHONY: vim_async_lib, renamed_vim_async_lib
 vim_async_lib: SWIFT_OPTS=--product VimAsync  \
 	-Xswiftc -module-name=$(PLUGIN_NAME)VimAsync \
 	-Xswiftc -module-link-name=$(PLUGIN_NAME)VimAsync \
@@ -59,22 +59,23 @@ renamed_vim_async_lib: vim_async_lib
 		$(BUILD_DIR)/$(PLUGIN_NAME)VimAsync.swiftmodule
 	@ditto $(BUILD_DIR)/VimAsync.swiftdoc \
 		$(BUILD_DIR)/$(PLUGIN_NAME)VimAsync.swiftdoc
-	@ditto $(BUILD_DIR)/libVimAsync.a \
-		$(BUILD_DIR)/lib$(PLUGIN_NAME)libVimAsync.a
+	@ditto $(BUILD_DIR)/libVimAsync.dylib \
+		$(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.dylib
 
 # Main plugin lib
 .PHONY: plugin_lib
 plugin_lib: SWIFT_OPTS=--product $(PLUGIN_NAME) \
 		$(BASE_OPTS) 
-plugin_lib: renamed_vim_lib 
-# To useadd VimAsync, add it following `renamed_vim_lib`
+plugin_lib: renamed_vim_lib renamed_vim_async_lib
 
 # Build the .so, which Vim dynamically links.
 .PHONY: plugin_so
 plugin_so: plugin_lib 
 	@clang -g \
 		-Xlinker $(PYTHON_LINKED_LIB) \
 		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME).dylib \
+		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.dylib \
+		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.dylib \
 		-shared -o .build/$(PLUGIN_NAME).so
 
 # Build for the python dylib vim links
@@ -91,7 +92,6 @@ vim_lib vim_async_lib plugin_lib test_b: py_vars
 	@swift build -c $(CONFIG) \
 	   	$(BASE_OPTS) $(SWIFT_OPTS) $(EXTRA_OPTS) \
 	  	-Xswiftc -target -Xswiftc $(TRIPPLE) \
-	  	-Xlinker $(BUILD_DIR)/libVim.a \
 	   	| tee $(LAST_LOG)
 
 # Mark - Internal Utils:
@@ -108,16 +108,19 @@ test: debug
 	@swift build --product VimPackageTests \
 	   	$(BASE_OPTS) $(SWIFT_OPTS) $(EXTRA_OPTS) \
 		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME).dylib \
+		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.dylib \
+		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.dylib \
 	  	-Xswiftc -target -Xswiftc $(TRIPPLE)
 	@swift test --skip-build | tee $(LAST_LOG)
 
 
 .PHONY: test_generate
 test_generate:
 	# We use the HEAD ref in the test
-	git diff --quiet || (echo 'Dirty tree' && exit 1)
+	#git diff --quiet || (echo 'Dirty tree' && exit 1)
 	rm -rf ~/Desktop/Swiftvimexample || true
-	plugin_path=~/Desktop/Swiftvimexample make generate
+	GIT_REPO=$(PWD)/.git  \
+		plugin_path=~/Desktop/Swiftvimexample make generate
 	cd ~/Desktop/Swiftvimexample && make
 
 clean:
diff --git a/Package.swift b/Package.swift
@@ -8,22 +8,22 @@ let package = Package(
     products: [
         .library(
             name: "VimInterface",
-            type: .static,
+            type: .dynamic,
             targets: ["VimInterface"]),
 
         .library(
             name: "Vim",
-            type: .static,
+            type: .dynamic,
             targets: ["Vim"]),
 
         .library(
             name: "VimPluginBootstrap",
-            type: .static,
+            type: .dynamic,
             targets: ["VimPluginBootstrap"]),
 
         .library(
             name: "VimAsync",
-            type: .static,
+            type: .dynamic,
             targets: ["VimAsync"]),
 
         .library(
@@ -54,7 +54,9 @@ let package = Package(
         .testTarget(
             name: "VimTests",
             dependencies: []),
-
+        .testTarget(
+            name: "VimAsyncTests",
+            dependencies: []),
         // Example:
         .target(name: "Example",
             dependencies: []),
diff --git a/PluginGenerator/Makefile.tpl b/PluginGenerator/Makefile.tpl
@@ -12,7 +12,7 @@ debug: CONFIG=debug
 debug: plugin_so
 
 .PHONY: release
-release: CONFIG=debug
+release: CONFIG=release
 release: vim_lib plugin_so
 
 BASE_OPTS=-Xcc -I$(PYTHON_INCLUDE) \
@@ -22,8 +22,6 @@ BASE_OPTS=-Xcc -I$(PYTHON_INCLUDE) \
 	-Xlinker -undefined -Xlinker dynamic_lookup \
 	-Xlinker -all_load
 
-
-
 # Build namespaced versions of Vim and VimAsync libs.
 # The modules have a prefix of the plugin name, to avoid conflicts
 # when the code is linked into the Vim process.
@@ -41,8 +39,8 @@ renamed_vim_lib: vim_lib
 		$(BUILD_DIR)/$(PLUGIN_NAME)Vim.swiftmodule
 	@ditto $(BUILD_DIR)/Vim.swiftdoc \
 		$(BUILD_DIR)/$(PLUGIN_NAME)Vim.swiftdoc
-	@ditto $(BUILD_DIR)/libVim.a \
-		$(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.a
+	@ditto $(BUILD_DIR)/libVim.dylib \
+		$(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.dylib
 
 .PHONY: vim_async_lib, renamed_vim_lib_async
 vim_async_lib: SWIFT_OPTS=--product VimAsync  \
@@ -54,16 +52,16 @@ renamed_vim_async_lib: vim_async_lib
 		$(BUILD_DIR)/$(PLUGIN_NAME)VimAsync.swiftmodule
 	ditto $(BUILD_DIR)/VimAsync.swiftdoc \
 		$(BUILD_DIR)/$(PLUGIN_NAME)VimAsync.swiftdoc
-	@ditto $(BUILD_DIR)/libVimAsync.a \
-		$(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.a
+	@ditto $(BUILD_DIR)/libVimAsync.dylib \
+		$(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.dylib
 
 # Main plugin lib
 .PHONY: plugin_lib
 plugin_lib: SWIFT_OPTS=--product $(PLUGIN_NAME) \
 		$(BASE_OPTS) \
-	  	-Xlinker $(BUILD_DIR)/libVim.a
-plugin_lib: renamed_vim_lib 
-# To useadd VimAsync, add it following `renamed_vim_lib`
+		-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)VimAsync.dylib \
+	  	-Xlinker $(BUILD_DIR)/lib$(PLUGIN_NAME)Vim.dylib
+plugin_lib: renamed_vim_lib renamed_vim_async_lib
 
 # Build the .so, which Vim dynamically links.
 .PHONY: plugin_so
diff --git a/PluginGenerator/Package.tpl.swift b/PluginGenerator/Package.tpl.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["__VIM_PLUGIN_NAME__"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/swift-vim/SwiftForVim.git",
+        .package(url: "__GIT_REPO__",
              .revision("__GIT_REVISION__"))
     ],
     targets: [
@@ -32,7 +32,7 @@ let package = Package(
             dependencies: ["__VIM_PLUGIN_NAME__"]),
         // We cant depend on "Vim" due to namespacing issues
         // and SPM. This makes "Vim" available as a target.
-        .testTarget(name: "StubSPMVimImport",
-            dependencies: ["Vim"])
+        .target(name: "StubVimImport",
+            dependencies: ["Vim", "VimAsync"])
     ]
 )
diff --git a/PluginGenerator/PluginMain.tpl.swift b/PluginGenerator/PluginMain.tpl.swift
@@ -1,5 +1,6 @@
 // VimPlugin Plugin initialization
 import __VIM_PLUGIN_NAME__Vim
+import __VIM_PLUGIN_NAME__VimAsync
 
 /// plugin_load
 /// Core bootstrap for the plugin.
@@ -30,7 +31,7 @@ func plugin_load(context: UnsafePointer<Int8>) -> Int {
 func plugin_runloop_callback() {
     // Make sure to add VimAsync to the Makefile
     // and remove the comment.
-    // VimTaskRunLoopCallback()
+    VimTaskRunLoopCallback()
 }
 
 /// plugin_runloop_invoke
diff --git a/PluginGenerator/plugin.tpl.vim b/PluginGenerator/plugin.tpl.vim
@@ -73,6 +73,10 @@ let s:SwiftVimRunLoopTimer = timer_start(100, function('s:SwiftVimRunLoopTimer')
 
 " END_SWIFTVIM
 
+
+" Example of calling swift
+call s:SwiftVimEval("Swiftvimexample.invoke('helloSwift')")
+
 " This is basic vim plugin boilerplate
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/PluginGenerator/plugin_generator.sh b/PluginGenerator/plugin_generator.sh
@@ -28,11 +28,24 @@ sed "s,__VIM_PLUGIN_NAME__,$PLUGIN,g" $SCRIPTPATH/PluginMain.tpl.swift \
 
 sed "s,__VIM_PLUGIN_NAME__,$PLUGIN,g" $SCRIPTPATH/Package.tpl.swift \
     > Package.swift
-sed -i "" "s,__GIT_REVISION__,$REV,g"  Package.swift
+
+# For testing, we'll set this to PWD
+if [[ ! $GIT_REPO ]]; then
+    GIT_REPO="https://github.com/swift-vim/SwiftForVim.git"
+fi
+
+sed -i "" "s,__GIT_REPO__,$GIT_REPO,g" \
+    Package.swift
+sed -i "" "s,__GIT_REVISION__,$REV,g" \
+    Package.swift
 
 mkdir -p VimUtils
 ditto $SCRIPTPATH/../VimUtils/make_lib.sh VimUtils/
 
 sed "s,__VIM_PLUGIN_NAME__,$PLUGIN,g" $SCRIPTPATH/Makefile.tpl \
     > Makefile
 
+mkdir -p Sources/StubVimImport
+touch Sources/StubVimImport/Dummy.swift
+
+
diff --git a/Sources/Example/Example.swift b/Sources/Example/Example.swift
@@ -1,5 +1,6 @@
 // VimPlugin Plugin initialization
 import ExampleVim
+import ExampleVimAsync
 
 /// plugin_load
 /// Core bootstrap for the plugin.
@@ -30,7 +31,7 @@ func plugin_load(context: UnsafePointer<Int8>) -> Int {
 func plugin_runloop_callback() {
     // Make sure to add VimAsync to the Makefile
     // and remove the comment.
-    // VimTaskRunLoopCallback()
+    VimTaskRunLoopCallback()
 }
 
 /// plugin_runloop_invoke
diff --git a/Tests/VimAsyncTests/VimAsyncTest.swift b/Tests/VimAsyncTests/VimAsyncTest.swift
@@ -0,0 +1,32 @@
+import XCTest
+import VimInterface
+import ExampleVim
+import ExampleVimAsync
+import Foundation
+
+class VimAsyncTests: XCTestCase {
+    static var allTests = [
+        ("testCommandNone", testCommandNone)
+    ]
+
+    func testCommandNone() {
+        swiftvim_initialize()
+        var result: VimValue!
+        let semaphore = DispatchSemaphore(value: 0)
+        let serial = DispatchQueue(label: "Queuename")
+        serial.async {
+            VimTask.onMain {
+                result = try! Vim.command("VALUE")
+                semaphore.signal()
+            }
+        }
+
+        let timeout = DispatchTime.now() + .seconds(120)
+        guard semaphore.wait(timeout: timeout) != .timedOut else {
+          fatalError("Fail.")
+        }
+        XCTAssertNotNil(result)
+        XCTAssertNil(result.asString())
+        swiftvim_finalize()
+    }
+}
