remove extra shared functions & loader

Author: stadub

Bookmarks/Bookmarks.psd1

@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'Bookmarks'
 #
 # Generated by: Dmitry Stadub
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '2.0'
+ModuleVersion = '2.1.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -69,7 +69,7 @@ Full documentation at the Github: https://github.com/stadub/PowershellScripts/tr
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
 #NestedModules = @('Aliases.ps1','Functions.ps1')
-ModuleToProcess = "Bookmarks.psm1"
+RootModule = "Bookmarks.psm1"
 
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
 FunctionsToExport = @('*')
@@ -115,6 +115,7 @@ PrivateData = @{
         Move initation logic to Loader.psm1
         Change test environment to  StrictMode=Latest
         Update icon.
+        Remove extra hared functions
         '
 
     } # End of PSData hashtable

Bookmarks/Bookmarks.psm1

@@ -1,15 +1,15 @@
-if($ModuleDevelopment){
-    . $PSScriptRoot\..\Shared-Functions\ModuleLoader.ps1 "$PSScriptRoot"
-}
-else {
-    if( -not $SharedLocal -or -not (Test-Path $SharedLocal) ){
-        throw "Shared functions folder doesn't exist. 
-        Looks like module typing to start in Develoment mode. 
-        To start Development mode set flag: `$ModuleDevelopment=`$true
-        Also you can set `$DebugPreference=`"Continue`" to getmore detalied strack trace
-        Or set `$NoExport=`$True to disable `Export-ModuleMember` functions
-        "
-    }
-    . $PSScriptRoot\Shared\ModuleLoader.ps1 "$PSScriptRoot"
-}
+. $PSScriptRoot\Functions.ps1
+. $PSScriptRoot\Shared-Functions.ps1
 
+
+_Initalize
+
+Export-ModuleMember -Function Add-PSBookmark
+Export-ModuleMember -Function Remove-PSBookmark
+Export-ModuleMember -Function Remove-AllPSBookmarks
+Export-ModuleMember -Function Open-PSBookmark
+Export-ModuleMember -Function Restore-PSBookmarks
+Export-ModuleMember -Function Save-PSBookmarks
+Export-ModuleMember -Function Get-PSBookmarks
+Export-ModuleMember -Function Update-PSBookmark 
+. $PSScriptRoot\Aliases.ps1

Bookmarks/Shared-Functions.ps1

@@ -0,0 +1,73 @@
+
+
+function CreateFolderIfNotExist {
+    param ([string]$Folder)
+    if( Test-Path $Folder -PathType Leaf){
+        Write-Error "The destanation path ${Folder} is file."
+    }
+
+    if ( ! (Test-Path $Folder -PathType Container )) { 
+        New-Item -Path $Folder  -ItemType 'Directory'
+    }
+}
+
+
+function Test-Empty {
+    param (
+        [Parameter(Position = 0)]
+        [string]$string
+    )
+    return [string]::IsNullOrWhitespace($string) 
+}
+
+function Get-ProfileDataFile {
+    param (
+        [string]$file,
+        [string]$moduleName = $null
+    )
+    return Join-Path (Get-ProfileDir $moduleName) $file
+    
+}
+function Get-ProfileDir {
+    param (
+        [string]$moduleName = $null
+    )
+    
+    $profileDir = $ENV:AppData
+
+    if( Test-Empty $moduleName ){
+
+        if ( $script:MyInvocation.MyCommand.Name.EndsWith('.psm1') ){
+            $moduleName = $script:MyInvocation.MyCommand.Name
+        }
+
+        if ( $script:MyInvocation.MyCommand.Name.EndsWith('.ps1') ){
+            $modulePath = Split-Path -Path $script:MyInvocation.MyCommand.Path
+            $moduleName = Split-Path -Path $modulePath -Leaf
+        }
+    }
+
+    if( Test-Empty $moduleName ){
+        throw "Unable to read module name."             
+    }
+    
+    $scriptProfile =  Combine-Path $profileDir '.ps1' 'ScriptData' $moduleName
+    if ( ! (Test-Path $scriptProfile -PathType Container )) { 
+        New-Item -Path $scriptProfile  -ItemType 'Directory'
+    }
+    return $scriptProfile
+}
+
+
+function Combine-Path {
+    param (
+        [string]$baseDir,
+        [string]$path
+    )
+    $allArgs = $PsBoundParameters.Values + $args
+
+    [IO.Path]::Combine([string[]]$allArgs)
+}
+
+$_sharedLoaded = $true
+