fix: strip at char from beginning of commands (#22)

Author: edvardm

Justfile

@@ -86,8 +86,8 @@ include-file-flt:
         sys.stdout.write(entry)
 
 update-examples:
-    just run examples/02.mk > examples/02-tasks.py
-    git status examples/02-tasks.py || git commit -m "updatetd example 02"
+    just run test/02.mk > examples/02-tasks.py
+    git status examples/02-tasks.py || git commit -m "update 02-tasks.py"
 
 update-readme:
     just include-file-flt < readme.tmpl.md > README.md

README.md

@@ -1,6 +1,6 @@
 # Demake
 
-Version 0.1.2
+Version 0.1.3
 
 ## Overview
 
@@ -68,7 +68,7 @@ dev-init: .check-poetry deps quick-test ## prepare project ready for development
 
 .PHONY: .check-poetry
 .check-poetry:
-	command -v poetry 2>/dev/null || (echo "poetry not found, please see https://python-poetry.org/docs/#installation"; exit 1)
+	@command -v poetry 2>/dev/null || (echo "poetry not found, please see https://python-poetry.org/docs/#installation"; exit 1)
 
 .PHONY: deps
 deps:  ## install dependencies

bumpver.toml

@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "0.1.2"
+current_version = "0.1.3"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

examples/02.mk

@@ -1,6 +1,6 @@
 ---
 name: demake
-version: 0.1.2
+version: 0.1.3
 github: edvardm/demake
 license: MIT
 author: Edvard Majakari

package.yaml

@@ -1,6 +1,6 @@
 # Demake
 
-Version 0.1.2
+Version 0.1.3
 
 ## Overview
 
@@ -60,7 +60,7 @@ If you don't have Stack setup already, I recommend using
 With Makefile contents of
 
 ```Makefile
-{! examples/02.mk !}
+{! test/02.mk !}
 ```
 
 Resulting output:

readme.tmpl.md

@@ -155,8 +155,9 @@ instance Encodable InvCmd where
                 <> fromText ")"
                 <> nl
       where
-        formatCmd = fStringFmt . (escape . T.unpack) . rmNlsTabs
+        formatCmd = fStringFmt . (escape . T.unpack) . stripAtChar . rmNlsTabs
         rmNlsTabs = T.replace "\t" "" . T.replace "\\\n" " "
+        stripAtChar = T.dropWhile (== '@')
         fStringFmt src =
             let re = [RE.re|\$\($(.*?)\)|]
                 subst =

src/PyEncode.hs

@@ -6,7 +6,7 @@ dev-init: .check-poetry deps quick-test ## prepare project ready for development
 
 .PHONY: .check-poetry
 .check-poetry:
-	command -v poetry 2>/dev/null || (echo "poetry not found, please see https://python-poetry.org/docs/#installation"; exit 1)
+	@command -v poetry 2>/dev/null || (echo "poetry not found, please see https://python-poetry.org/docs/#installation"; exit 1)
 
 .PHONY: deps
 deps:  ## install dependencies

test/02.mk

@@ -261,6 +261,9 @@ main = hspec $ do
     it "double-escapes escaped quotes in commands" $ do
       asString (InvCmd "ls \"fname\"") `shouldBe` "    c.run('ls \"fname\"')\n"
 
+    it "ignores preceding at-char in commands" $ do
+      asString (InvCmd "@touch $!") `shouldBe` "    c.run('touch $!')\n"
+
   describe "Comments" $ do
     it "renders comments" $ do
       pending