Merge pull request #100 from bow-swift/fix_nef_launcher

create xcworkspace using playground name

Author: miguelangel-dev

bin/nef-carbon

@@ -91,7 +91,7 @@ buildCarbon() {
         echo "${normal}Downloading Carbon's snippets for ${green}$playgroundName${reset}"
 
         checkOutputNotSameInput "$output" "$projectPath"
-        cleanStructure "$output"
+        resetStructure "$output"
         mkdir -pv "$output"
         pagesInPlayground "$playgroundPath"
 
@@ -125,7 +125,7 @@ makeStructure() {
     local logPath="$1/$LOG_PATH"  # parameter `project`
     local outputPath="$2"         # parameter `outputPath`
 
-    cleanStructure "$outputPath/*/*.png"
+    resetStructure "$outputPath/*/*.png"
     mkdir -p "$logPath"
     mkdir -p "$outputPath"
 }

bin/nef-common

@@ -8,10 +8,8 @@
 playgrounds() {
     local root="$1"   # parameter `folder`
 
-    workspacesForProjectPath "$1"
-    checkIsWorkspaceValid "$workspacesForProjectPath"
-    local workspacePath=$(echo "$workspacesForProjectPath" | rev | cut -d'/' -f 2- | rev)
-    local content="$workspacesForProjectPath/contents.xcworkspacedata"
+    local workspacePath=$(getWorkspace "$1")
+    local content="$workspacePath/contents.xcworkspacedata"
 
     local dependencies="awk -F'location = \"group:' '{print \$2}'"
     local cleanUp="rev | cut -d'\"' -f 2- | rev | grep playground"
@@ -23,9 +21,9 @@ playgrounds() {
     # build playground path
     playgroundsPaths=()
     for playground in "${playgrounds[@]}"; do
-        if [ -d "$workspacePath/$playground" ]; then # is it relative path?
-            playgroundsPaths+=("$workspacePath/$playground")
-        elif [ -d "$playground" ]; then     # is it a absolute path?
+        if [ -d "$workspacePath/../$playground" ]; then # is it relative path?
+            playgroundsPaths+=("$workspacePath/../$playground")
+        elif [ -d "$playground" ]; then                 # is it a absolute path?
             playgroundsPaths+=("$playground")
         else
             echo " ❌"
@@ -83,10 +81,10 @@ pagesInPlayground() {
 }
 
 ##
-#   cleanStructure(String folder)
+#   resetStructure(String folder)
 #   - Parameter `folder`: path to the folder to clean up.
 ##
-cleanStructure() {
+resetStructure() {
   set +e
   local folder="$1"  # parameter `folder`
   rm -rf $folder 1>/dev/null 2>/dev/null
@@ -178,15 +176,50 @@ checkOutputNotSameInput() {
   fi
 }
 
+##
+#   getWorkspace(String folder, String projectPath) throws : String
+#   - Parameter `folder`: path to the project folder.
+#   - Return an valid `workspace` path given a project path
+##
+getWorkspace() {
+    _workspacesForProjectPath "$1"
+    for workspacePath in "${workspacesForProjectPath[@]}"; do
+        isDependency=$(isPathFromDependencies "$workspacePath")
+        [ $isDependency -eq 1 ] && continue
+        echo "$workspacePath"
+        return
+    done
+
+    echo "[!] error: not found any valid workspace in root project '$1'"
+    exit 1
+}
+
+##
+#   _isPathFromDependencies(String path): Bool
+#   - Parameter `path`: path to check if it is in dependencies folder
+#   - Return `isDependency` 1 - is a dependency; 0 - another case
+##
+isPathFromDependencies() {
+    podProject=$(eval echo "\"$1\" | grep '/Pods/' | awk '{ print length; }'")
+    carthageProject=$(eval echo "\"$1\" | grep '/Carthage/' | awk '{ print length; }'")
+
+    if [ "$podProject" != "" ] || [ "$carthageProject" != "" ]; then
+      echo 1
+    else
+      echo 0
+    fi
+}
+
+
 ###: - Internal methods
 
 ##
-#   workspacesForProjectPath(String folder, String projectPath): String
+#   workspacesForProjectPath(String folder): String
 #   - Parameter `folder`: path to the project folder.
 #   - Parameter `projectPath`: path to the *.pbxproj file.
 #   - Return `workspaces` path given a project path
 ##
-workspacesForProjectPath() {
+_workspacesForProjectPath() {
     local path="$1"         # parameter `folder`
     local log="$1/$LOG_PATH/workspace.log"
     cd "$path"
@@ -195,7 +228,7 @@ workspacesForProjectPath() {
     while read -r -d $'\0' project; do
         projectPath=$(echo "$path/$project" | rev | cut -d'/' -f3- | rev)
         projectName=$(echo "$project" | rev | cut -d'/' -f 2 | rev)
-        workspacePath=$(workspaceForProjectPath "$projectPath" "$projectName")
+        workspacePath=$(_workspaceForProjectPath "$projectPath" "$projectName")
         workspaceExtension=$(echo "$workspacePath" | rev | cut -d'.' -f1 | rev)
         workspaceContent="$workspacePath/contents.xcworkspacedata"
         (! [ "$workspaceExtension" = "xcworkspace" ] || ! [ -f "$workspaceContent" ]) && continue
@@ -206,35 +239,19 @@ workspacesForProjectPath() {
     declare -p workspacesForProjectPath 1>/dev/null 2>/dev/null
 }
 
-checkIsWorkspaceValid() {
-    local workspacesPaths="$1"
-    local numberOfWorkspaces=${#workspacesPaths[@]}
-
-    if [ "$numberOfWorkspaces" -gt 1 ]; then
-        echo "[!] error: found more than 1 workspace (total:$numberOfWorkspaces): '$workspacesPaths'" > "$log"
-        exit 1
-    elif [ "$numberOfWorkspaces" -eq 0 ] || ! [ -d $workspacesPaths ]; then
-        echo "[!] error: not found any workspace in root project '$workspacesPaths'" > "$log"
-        exit 1
-    fi
-}
-
 ##
-#   workspacePathForProjectPath(String projectPath, String projectName): String
+#   _workspaceForProjectPath(String projectPath, String projectName): String
 #   - Parameter `projectPath`: path to the project folder.
 #   - Parameter `projectName`: *.pbxproj filename.
 #   - Return `workspaceName`
 ##
-workspaceForProjectPath() {
+_workspaceForProjectPath() {
     cd "$1"
     local xcprojectNoExtension=$(echo "$2" | rev | cut -d'.' -f 2- | rev )
-    local nefWorkspace="`pwd`/nef.xcworkspace"
     local xcprojectWorkspace="`pwd`/$xcprojectNoExtension.xcworkspace"
     local xcproject="`pwd`/$xcprojectNoExtension.xcodeproj"
 
-    if [ -d "$nefWorkspace" ]; then
-        echo "$nefWorkspace"
-    elif [ -d "$xcprojectWorkspace" ]; then
+    if [ -d "$xcprojectWorkspace" ]; then
         echo "$xcprojectWorkspace"
     else
         echo "$xcproject"

bin/nef-jekyll

@@ -82,7 +82,7 @@ buildMicrosite() {
             log="$1/$logFile"
 
             checkOutputNotSameInput "$output" "$projectPath"
-            cleanStructure "$output"
+            resetStructure "$output"
             mkdir -p "$output"
             nef-jekyll-page --from "$pagePath" --to "$output" --permalink "$permalink" 1> "$log" 2>&1
             echo -e "        - title: $pageName\n          url: $permalink\n" >> "$sidebarFilePath" # sidebar page
@@ -127,8 +127,8 @@ makeStructure() {
     local sidebarFolderPath="$sitePath/$BASE_SIDEBAR"
     local baseJekyllPath="$sitePath/$BASE_JEKYLL"
 
-    cleanStructure "$logPath"
-    cleanStructure "$baseJekyllPath"
+    resetStructure "$logPath"
+    resetStructure "$baseJekyllPath"
 
     mkdir -p "$logPath"
     mkdir -p "$sidebarFolderPath"

bin/nef-markdown

@@ -58,7 +58,7 @@ buildMarkdown() {
         echo -ne "${normal}Rendering Markdown files for ${green}$playgroundName${reset}..."
 
         checkOutputNotSameInput "$output" "$projectPath"
-        cleanStructure "$output"
+        resetStructure "$output"
         mkdir -p "$output"
         pagesInPlayground "$playgroundPath"
 
@@ -91,7 +91,7 @@ makeStructure() {
     local logPath="$1/$LOG_PATH"  # parameter `project`
     local outputPath="$2"         # parameter `outputPath`
 
-    cleanStructure "$outputPath/*/*.md"
+    resetStructure "$outputPath/*/*.md"
     mkdir -p "$logPath"
     mkdir -p "$outputPath"
 }

bin/nef-playground

@@ -61,7 +61,6 @@ setDependency() {
       checkCocoaPods
       setPlaygroundPlatform "$projectFolder" "$projectName" "$platform" "cocoapods"
       setCocoaPodsDependency "$projectFolder" "$projectName" "$platform" "$podfile"
-      setDefaultWorkspace "$projectFolder"
   elif [ "$cartfile" != "" ] && [ -f "$cartfile" ]; then
       checkCarthage
       setPlaygroundPlatform "$projectFolder" "$projectName" "$platform" "carthage"
@@ -70,13 +69,13 @@ setDependency() {
       checkCocoaPods
       setPlaygroundPlatform "$projectFolder" "$projectName" "$platform" "cocoapods"
       setBowBranchDependency "$projectFolder" "$projectName" "$platform" "$branch"
-      setDefaultWorkspace "$projectFolder"
   else # version
       checkCocoaPods
       setPlaygroundPlatform "$projectFolder" "$projectName" "$platform" "cocoapods"
       setBowVersionDependency "$projectFolder" "$projectName" "$platform" "$version"
-      setDefaultWorkspace "$projectFolder"
   fi
+
+  configureLauncher "$projectFolder" "$projectName"
 }
 
 setCarthageDependency() {
@@ -157,15 +156,19 @@ setBowVersionDependency() {
     fi
 }
 
-setDefaultWorkspace() {
-    local projectFolder="$1" # parameter `projectFolder`
-    podfilePath="$projectFolder/Podfile"
+configureLauncher() {
+    cd "$1"
+    local projectName="$2"   # parameter `projectName`
 
-    ! [ -f "$podfilePath" ] && continue
+    launcherName="launcher"
+    launcher=""
 
-    echo -ne "${normal}Updating podfile with ${green}default workspace${reset}..."
-    echo "workspace 'nef'" >> $podfilePath
-    echo " ✅"
+    while read -r -d $'\0' path; do
+      launcher="`pwd`/$path"
+    done < <(find . -name $launcherName -print0)
+
+    [ "$launcher" = "" ] && return
+    sed -i '' "1,/{{nef}}/s/{{nef}}/$projectName/" "$launcher"
 }
 
 ##
@@ -334,6 +337,12 @@ clean() {
 #: - MAIN
 set -e
 
+# Load common nef library
+commonNefLibName="nef-common"
+commonNefLibPath=$(which "$commonNefLibName")
+source "$commonNefLibPath"
+
+# Menu
 root=`pwd`
 projectName="$DEFAULT_PLAYGROUND"
 version=$(lastestBowVersion)
@@ -359,11 +368,13 @@ while [ "$1" != "" ]; do
     shift
 done
 
+# Fixes paths
 projectName="$projectName"
 project="$root/$projectName.app"
 projectFolder="$project/Contents/MacOS"
-cartfilePath="$root/$cartfile"
-podfilePath="$root/$podfile"
+cartfilePath=$(absoluteFilePath "$root" "$cartfile")
+podfilePath=$(absoluteFilePath "$root" "$podfile")
 
+# MAIN
 playground "$project" "$projectFolder" "$projectName"
 setDependency "$projectFolder" "$projectName" "$platform" "$version" "$branch" "$cartfilePath" "$podfilePath"