trurl 0.3.0.4 → 0.3.1.0

raw patch · 4 files changed

+9/−13 lines, 4 files

Files

• src/Main.hs +5/−9
• src/SimpleParams.hs +1/−1
• tests/Main.hs +2/−2
• trurl.cabal +1/−1

@@ -11,12 +11,10 @@ help = do   putStrLn "trurl <command> [parameters]"   putStrLn "  update -- fetch the updates from repository"-  putStrLn "  create <name> <project_template> -j [parameters_string] -- create project of specified type with specified name; optionally add JSON parameters"-  putStrLn "  create <name> <project_template> -s [parameters_string] -- create project of specified type with specified name; optionally add string parameters"-  putStrLn "  create <name> <project_template> [parameters_string] -- create project of specified type with specified name; optionally add string parameters"+  putStrLn "  create <name> <project_template> -j [parameters_string] -- create project of specified type with specified name; optionally add JSON parameters, wrap it with \"\" or ''"+  putStrLn "  create <name> <project_template> [parameters] -- create project of specified type with specified name; optionally add parameters"   putStrLn "  new <name> <file_template> -j [parameters_string] -- create file from the template with specified JSON parameters, wrap it with \"\" or ''"-  putStrLn "  new <name> <file_template> -s [parameters_string] -- create file from the template with specified string parameters, wrap it with \"\" or ''"-  putStrLn "  new <name> <file_template> [parameters_string] -- create file from the template with specified string parameters, wrap it with \"\" or ''"+  putStrLn "  new <name> <file_template> [parameters] -- create file from the template with specified string parameters"   putStrLn "  list -- print all available templates"   putStrLn "  help <template> -- print template info"   putStrLn "  help -- print this help"@@ -35,11 +33,9 @@     ["update"]                              -> updateFromRepository     ["create", name, project]               -> createProject name project "{}"     ["create", name, project, "-j", params] -> createProject name project params-    ["create", name, project, "-s", params] -> createProject name project $ simpleParamsToJson params-    ["create", name, project, params]       -> createProject name project $ simpleParamsToJson params+    ("create": name: project: params)       -> createProject name project $ simpleParamsToJson $ foldr (\a b -> a ++ " " ++ b) "" params     ["new", name, template, "-j" ,params]   -> newTemplate name template params-    ["new", name, template, "-s" ,params]   -> newTemplate name template $ simpleParamsToJson params-    ["new", name, template, params]         -> newTemplate name template $ simpleParamsToJson params+    ("new": name: template: params)         -> newTemplate name template $ simpleParamsToJson $ foldr (\a b -> a ++ " " ++ b) "" params     ["list"]                                -> listTemplates     ["version"]                             -> printVersion     ["-v"]                                  -> printVersion

@@ -11,7 +11,7 @@ parseEmbedded str =   let splitted = split "#" str   in if length splitted /= 2 then ""-     else if endswith "!" (splitted !! 1) then "{\"name\":\"" ++ splitted !! 0 ++ "\",\"type\":\"" ++ (replace "!" "" $ splitted !! 1) ++ "\",\"last\":true}"+     else if endswith "@" (splitted !! 1) then "{\"name\":\"" ++ splitted !! 0 ++ "\",\"type\":\"" ++ (replace "@" "" $ splitted !! 1) ++ "\",\"last\":true}"           else "{\"name\":\"" ++ splitted !! 0 ++ "\",\"type\":\"" ++ splitted !! 1 ++ "\"}"  processPart :: String -> String

@@ -81,10 +81,10 @@       assertEqual "Checking parseEmbedded" "{\"name\":\"abc\",\"type\":\"efg\"}" (S.parseEmbedded "abc#efg")    , testCase "parseEmbedded with delimiter" $-      assertEqual "Checking parseEmbedded" "{\"name\":\"abc\",\"type\":\"efg\",\"last\":true}" (S.parseEmbedded "abc#efg!")+      assertEqual "Checking parseEmbedded" "{\"name\":\"abc\",\"type\":\"efg\",\"last\":true}" (S.parseEmbedded "abc#efg@")    , testCase "simpleParamsToJson" $       assertEqual "Checking simpleParamsToJson"                    "{\"abc\":123,\"efg\":456,\"zxc\":[1,2,3],\"ttt\":[{\"name\":\"abc\",\"type\":\"efg\"},{\"name\":\"hck\",\"type\":\"qwe\"},{\"name\":\"zxc\",\"type\":\"vbn\",\"last\":true}]}"-                  (S.simpleParamsToJson "abc:123,efg:456,zxc:[1,2,3],ttt:[abc#efg,hck#qwe,zxc#vbn!]")+                  (S.simpleParamsToJson "abc:123,efg:456,zxc:[1,2,3],ttt:[abc#efg,hck#qwe,zxc#vbn@]")   ]

@@ -1,5 +1,5 @@ name:                trurl-version:             0.3.0.4+version:             0.3.1.0 synopsis:            Haskell template code generator description:     Trurl is a haskell project and code generating utility. Use it for scaffolding your projects and entities.