fix for newest carp

update docs
fix for new carp
2022-01-27 12:01:03 +01:00 · 2021-01-19 10:56:58 +01:00 · 2021-01-19 10:55:37 +01:00 · 2020-05-09 22:06:20 +02:00 · 2020-05-05 14:33:45 +02:00 · 2020-05-05 13:57:56 +02:00
6 changed files with 490 additions and 470 deletions
--- a/21
+++ b/21
@@ -0,0 +1,21 @@
 MIT License
 Copyright (c) 2020 Veit Heller
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ is a simple file path library for Carp.
 ## Installation
 ```clojure
-(load "https://veitheller.de/git/carpentry/path@0.0.1")
+(load "git@git.veitheller.de:carpentry/path.git@0.0.4")
 ```
 ### Usage
@@ -16,7 +16,7 @@ has some functions to work with the `PATH` environment variable.
 It assumes either Windows or POSIX-style separators.
-Look at [the documentation](https://veitheller.de/path) for more information.
+Look at [the documentation](https://carpentry.dev/path) for more information.
 <hr/>
--- a/docs/Path.html
+++ b/docs/Path.html
@@ -9,8 +9,8 @@
    <body>
        <div class="content">
            <div class="logo">
-                <a href="http://github.com/carp-lang/Carp">
+                <a href="">
-                    <img src="logo.png">
+                    <img src="">
                </a>
                <div class="title">
                    path
@@ -25,13 +25,14 @@
                    </ul>
                </div>
            </div>
            <div class="module">
                <h1>
                    Path
                </h1>
                <div class="module-description">
                    <p>is a simple file path library for Carp.</p>
 <h2>Installation</h2>
-<pre><code class="language-clojure">(load &quot;https://veitheller.de/git/carpentry/path@0.0.1&quot;)
+<pre><code class="language-clojure">(load &quot;git@git.veitheller.de:carpentry/path.git@0.0.4&quot;)
 </code></pre>
 <h3>Usage</h3>
 <p>The <code>Path</code> module mostly operates on <code>String</code> arguments. It allows you to
@@ -50,7 +51,7 @@ has some functions to work with the <code>PATH</code> environment variable.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [a, b] String)
+                        (Fn [a, b] String)
                    </p>
                    <pre class="args">
                        (&lt;/&gt; before after)
@@ -70,7 +71,7 @@ has some functions to work with the <code>PATH</code> environment variable.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] (Maybe String))
+                        (Fn [(Ref String a)] (Maybe String))
                    </p>
                    <pre class="args">
                        (absolute p)
@@ -90,14 +91,14 @@ has some functions to work with the <code>PATH</code> environment variable.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] Bool)
+                        (Fn [(Ref String a)] Bool)
                    </p>
                    <pre class="args">
                        (absolute? p)
                    </pre>
                    <p class="doc">
                        <p>checks whether a path is absolute.</p>
-<p>As such, it is the inverse to <a href="#relative">relative</a>.</p>
+<p>As such, it is the inverse to <a href="#relative?">relative?</a>.</p>
                    </p>
                </div>
@@ -111,7 +112,7 @@ has some functions to work with the <code>PATH</code> environment variable.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String, &amp;String] String)
+                        (Fn [(Ref String a), (Ref String b)] String)
                    </p>
                    <pre class="args">
                        (add-extension p ext)
@@ -131,7 +132,7 @@ has some functions to work with the <code>PATH</code> environment variable.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] String)
+                        (Fn [(Ref String a)] String)
                    </p>
                    <pre class="args">
                        (basename p)
@@ -151,7 +152,7 @@ has some functions to work with the <code>PATH</code> environment variable.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [] (Maybe String))
+                        (Fn [] (Maybe String))
                    </p>
                    <pre class="args">
                        (cwd)
@@ -172,7 +173,7 @@ which it can fail are OS-dependent, but it should happen relatively rare.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] String)
+                        (Fn [(Ref String a)] String)
                    </p>
                    <pre class="args">
                        (drop-extension p)
@@ -193,7 +194,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] (Maybe String))
+                        (Fn [(Ref String a)] (Maybe String))
                    </p>
                    <pre class="args">
                        (extension p)
@@ -213,7 +214,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] (Maybe String))
+                        (Fn [(Ref String a)] (Maybe String))
                    </p>
                    <pre class="args">
                        (filename p)
@@ -234,7 +235,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [] (Maybe (Array String)))
+                        (Fn [] (Maybe (Array String)))
                    </p>
                    <pre class="args">
                        (get-search-path)
@@ -254,7 +255,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] Bool)
+                        (Fn [(Ref String a)] Bool)
                    </p>
                    <pre class="args">
                        (has-extension? p)
@@ -274,7 +275,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String, &amp;String] Bool)
+                        (Fn [(Ref String a), (Ref String b)] Bool)
                    </p>
                    <pre class="args">
                        (is-extension? p ext)
@@ -294,7 +295,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [(Ref (Array String))] String)
+                        (Fn [(Ref (Array String) a)] String)
                    </p>
                    <pre class="args">
                        (join ps)
@@ -335,14 +336,14 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] Bool)
+                        (Fn [(Ref String a)] Bool)
                    </p>
                    <pre class="args">
                        (relative? p)
                    </pre>
                    <p class="doc">
                        <p>checks whether a path is relative.</p>
-<p>As such, it is the inverse to <a href="#absolute">absolute</a>.</p>
+<p>As such, it is the inverse to <a href="#absolute?">absolute?</a>.</p>
                    </p>
                </div>
@@ -356,7 +357,7 @@ is none.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String, &amp;String] String)
+                        (Fn [(Ref String a), (Ref String b)] String)
                    </p>
                    <pre class="args">
                        (replace-extension p ext)
@@ -398,7 +399,7 @@ variable we use on this OS.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [Char] Bool)
+                        (Fn [Char] Bool)
                    </p>
                    <pre class="args">
                        (search-path-separator? c)
@@ -437,7 +438,7 @@ variable we use on this OS.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;Char] Bool)
+                        (Fn [(Ref Char StaticLifetime)] Bool)
                    </p>
                    <pre class="args">
                        (separator? c)
@@ -478,7 +479,7 @@ variable we use on this OS.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] (Array String))
+                        (Fn [(Ref String a)] (Array String))
                    </p>
                    <pre class="args">
                        (split p)
@@ -499,7 +500,7 @@ variable we use on this OS.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] (Maybe (Pair String String)))
+                        (Fn [(Ref String a)] (Maybe (Pair String String)))
                    </p>
                    <pre class="args">
                        (split-extension p)
@@ -536,7 +537,7 @@ the extension.</p>
                        defn
                    </div>
                    <p class="sig">
-                    (λ [&amp;String] (Array String))
+                        (Fn [(Ref String a)] (Array String))
                    </p>
                    <pre class="args">
                        (split-search-path p)
@@ -547,5 +548,6 @@ the extension.</p>
                    </p>
                </div>
            </div>
        </div>
    </body>
 </html>
--- a/gendocs.carp
+++ b/gendocs.carp
@@ -1,13 +1,10 @@
 (load "path.carp")
-(defndynamic gendocs []
+(Project.config "title" "path")
-       (do
+(Project.config "docs-directory" "./docs/")
-         (Project.config "title" "path")
+(Project.config "docs-logo" "")
-         (Project.config "docs-directory" "./docs/")
+(Project.config "docs-styling" "style.css")
-         (Project.config "docs-logo" "")
+(Project.config "docs-generate-index" false)
-         (Project.config "docs-styling" "style.css")
+(save-docs Path)
         (Project.config "docs-generate-index" false)
         (save-docs Path)))
 (gendocs)
 (quit)
--- a/path.carp
+++ b/path.carp
@@ -3,7 +3,7 @@
 ## Installation
 ```clojure
-(load \"https://veitheller.de/git/carpentry/path@0.0.1\")
+(load \"git@git.veitheller.de:carpentry/path.git@0.0.4\")
 ```
 ### Usage
@@ -16,7 +16,7 @@ It assumes either Windows or POSIX-style separators.")
 (defmodule Path
  (doc absolute? "checks whether a path is absolute.
-As such, it is the inverse to [relative](#relative).")
+As such, it is the inverse to [relative?](#relative?).")
  (doc separator "is the default separator we use on this OS.")
  (doc separators "is the possible separators we could use on this OS.")
  (doc search-path-separator "is the separator for the `PATH` environment
@@ -32,7 +32,7 @@ variable we use on this OS.")
    (def search-path-separator \;)
    (def extension-pat #"\.[^\\/\.]*$")
    (def sep-string "\\"))
-  (not-on-windows
+  (posix-only
    (defn absolute? [p] (String.starts-with? p "/"))
    (def separator \/)
    (def separators [\/])
@@ -42,7 +42,7 @@ variable we use on this OS.")
  (doc relative? "checks whether a path is relative.
-As such, it is the inverse to [absolute](#absolute).")
+As such, it is the inverse to [absolute?](#absolute?).")
  (defn relative? [p] (not (absolute? p)))
  (doc separator? "checks whether the character `c` is a path separator on this
@@ -85,7 +85,7 @@ It will return `Nothing` if an empty string is passed.")
  (doc basename "gets the basename of the path `p`.")
  (defn basename [p]
    (let [split (split p)
-          but-last (Array.prefix-array &split (dec (Array.length &split)))]
+          but-last (Array.prefix &split (dec (Array.length &split)))]
      (String.join sep-string &but-last)))
  (doc split-extension "splits the path `p` on its extension.
@@ -113,7 +113,7 @@ Examples on POSIX:
    (let [i (Pattern.find extension-pat p)]
      (if (= -1 i)
        (Maybe.Nothing)
-        (Maybe.Just (Pair.init (prefix-string p i) (suffix-string p (inc i)))))))
+        (Maybe.Just (Pair.init (prefix p i) (suffix p (inc i)))))))
  (doc extension "gets the extension of a file as a `Maybe`.")
  (defn extension [p]
@@ -127,9 +127,9 @@ Examples on POSIX:
  (doc drop-extension "drops the extension of a path `p`. Does nothing if there
 is none.")
  (defn drop-extension [p]
-    @(match (split-extension p)
+    (match (split-extension p)
-      (Maybe.Nothing) p
+      (Maybe.Nothing) @p
-      (Maybe.Just pair) (Pair.a &pair)))
+      (Maybe.Just pair) @(Pair.a &pair)))
  (doc add-extension "adds an extension `ext` to a path `p`.")
  (defn add-extension [p ext] (String.concat &[@p @"." @ext]))
@@ -148,5 +148,5 @@ an extension if there previously was none.")
  (defn split-search-path [p] (String.split-by p &[search-path-separator]))
  (doc get-search-path "gets the `PATH` environment variable and splits it.")
  (defn get-search-path []
-    (Maybe.apply (IO.getenv @"PATH") &(fn [p] (split-search-path &p))))
+    (Maybe.apply (IO.getenv "PATH") &(fn [p] (split-search-path &p))))
 )
--- a/test/path.carp
+++ b/test/path.carp
@@ -3,7 +3,7 @@
 (use-all Path Test)
-(if (not (Dynamic.or (= "windows" (os)) (= "mingw32" (os))))
+(posix-only
 (deftest test
  (assert-equal test
                "path/joined"
@@ -41,11 +41,11 @@
               "cwd works"
  )
  ; TODO why does this test not work?
-  ;(assert-equal test
+  (assert-equal test
-  ;              "file"
+                "file"
-  ;              &(drop-extension "file.txt")
+                &(drop-extension "file.txt")
-  ;              "drop-extension works if there is an extension"
+                "drop-extension works if there is an extension"
-  ;)
+  )
  (assert-equal test
                "file"
                &(drop-extension "file")
@@ -87,7 +87,7 @@
  )
 )
 ())
-(if (Dynamic.or (= "windows" (os)) (= "mingw32" (os)))
+(windows-only
 (deftest test
  (assert-true test
               false
Author	SHA1	Message	Date
Veit Heller	c734c582d4	fix for newest carp	2022-01-27 12:01:03 +01:00
hellerve	03aab46ab5	update docs	2021-01-19 10:56:58 +01:00
hellerve	4bf3e1c7c1	fix for new carp	2021-01-19 10:55:37 +01:00
hellerve	2d62dee4d0	docs: fix links between absolute? and relative?	2020-05-09 22:06:20 +02:00
hellerve	3eb542bdfd	simplify tests	2020-05-05 14:33:45 +02:00
hellerve	5b87d0bf9a	fix tests for new version of carp	2020-05-05 13:57:56 +02:00
hellerve	c822d2142e	release 0.0.3	2020-02-12 11:43:10 +01:00
hellerve	b80015bc4d	update for new carp	2020-02-12 11:42:14 +01:00
hellerve	b343ce830b	add license	2020-01-25 16:36:33 +01:00