Merge branch 'develop'

bin/nef-jekyll

@@ -219,12 +219,14 @@ makeStructure() {
   local logPath="$1/$LOG_PATH"  # parameter `project`
   local sitePath="$2"           # parameter `site`
   local sidebarFolderPath="$2/$BASE_SIDEBAR"
+  local baseJekyllPath="$sitePath/$BASE_JEKYLL"
 
   cleanStructure "$logPath"
-  cleanStructure "$sitePath"
+  cleanStructure "$baseJekyllPath"
 
   mkdir -p "$logPath"
   mkdir -p "$sidebarFolderPath"
+  mkdir -p "$baseJekyllPath"
 }
 
 cleanStructure() {

bin/nefc

@@ -185,13 +185,16 @@ buildPODS() {
 #   - Parameter `folder`: path to the project folder.
 ##
 addPlaygroundReference() {
-    cd "$1"
-    playgroundForProjectPath "$1"
+    projectPath="$1"
+    cd "$projectPath"
+    playgroundForProjectPath "$projectPath"
 
+    local logPath="nef/log"
     local pattern="<FileRef"
 
     find . -name '*.pbxproj' -print0 | while IFS= read -r -d $'\0' project; do
         workspace=$(workspaceForProjectPath "$1" "$project")
+        workspaceName=$(echo $workspace | rev | cut -d'/' -f 1 | rev | cut -d'.' -f 1)
         workspaceContent="$workspace/contents.xcworkspacedata"
         ! [[ $workspace = .*".xcworkspace" ]] && continue
         grep -q ".playground" "$workspaceContent"; [ $? -eq 0 ] && continue
@@ -200,6 +203,10 @@ addPlaygroundReference() {
             playgroundScaped=$(echo "$playground" | sed 's/\//\\\//g')
             sed -i '' "1,/<FileRef/s/<FileRef/<FileRef location = \"group:$playgroundScaped\"> <\/FileRef><FileRef/" "$workspaceContent"
         done
+
+        tmp="$logPath/$workspaceName.tmp.xcworkspace"
+        awk '{ gsub("FileRef><FileRef", "FileRef>\n<FileRef") }1' "$workspaceContent" 1> "$tmp"
+        mv "$tmp" "$workspaceContent"
     done
 }
 
@@ -213,6 +220,7 @@ playgroundForProjectPath() {
 
     playgroundForProjectPath=()
     while read -r -d $'\0' playground; do
+        playground=$(echo "$playground" | sed 's/.\///g')
         playgroundForProjectPath+=("$playground")
     done < <(find . -name '*.playground' -print0)
 

lib/Markup/Utils.swift

@@ -7,7 +7,7 @@ typealias SubstringType = (ouput: String, range: NSRange)
 
 extension String {
     func substring(pattern: String) -> SubstringType? {
-        let range = NSRange(location: 0, length: self.utf8.count)
+        let range = NSRange(location: 0, length: self.count)
         guard let regex = try? NSRegularExpression(pattern: pattern, options: .caseInsensitive),
               let match = regex.firstMatch(in: self, options: [], range: range) else { return nil }
 

lib/MarkupTests/MarkupSyntaxTests.swift

@@ -96,12 +96,12 @@ class MarkupSyntaxTests: XCTestCase {
         let input = """
                     /*:
                     // nef:begin:hidden
-                    This is a visible markup multiline
+                    This is a visible 👀 markup multiline ©
                     // nef:end
                      */
 
                     """
-        let expected: [Node] = [.markup(description: .some(""), "This is a visible markup multiline\n")]
+        let expected: [Node] = [.markup(description: .some(""), "This is a visible 👀 markup multiline ©\n")]
 
         let result = Markup.SyntaxAnalyzer.parse(content: input)