nortega/isidore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nortega:master
Branches Tags
nortega:master
nortega:devel
nortega:v0.1.0
...
compare: nortega:v0.1.0
Branches Tags
nortega:devel
nortega:master
nortega:v0.1.0

8 Commits
master ... v0.1.0

Author SHA1 Message Date
Nicolás A. Ortega Froysa
91b8b3b570 Add verbose flag to build. 2022-11-08 16:10:07 +01:00
Nicolás A. Ortega Froysa
e5bbf2dc03 Test for too few commands. 2022-11-08 16:02:38 +01:00
Nicolás A. Ortega Froysa
48bdc40932 No source dir to be found anymore. 2022-11-08 15:59:22 +01:00
Nicolás A. Ortega Froysa
805139d2ca Add example file. 2022-11-08 15:58:20 +01:00
Nicolás A. Ortega Froysa
7c1aec3497 Consolodate project directories into variables. 2022-11-08 15:52:12 +01:00
Nicolás A. Ortega Froysa
bfcd194a09 Copy other files into output. 2022-11-08 15:12:29 +01:00
Nicolás A. Ortega Froysa
c901bc3b0c Ignore configuration files for PHP variables. 2022-11-07 20:43:19 +01:00
Nicolás A. Ortega Froysa
ad5d10979d Add serve command. 2022-11-07 20:26:23 +01:00
12 changed files with 142 additions and 28 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
output/

9
README.md
View File

@ -14,9 +14,10 @@ Synopsis: `isidore <command> [options]`
Commands:
- `new <dir> <name>`: create a new project directory `<dir>` with project name
`<name>`.
- `build`: build the website (default).
- `new [-i] <dir>`: create a new project directory `<dir>`. Use `-i` for
interactive mode.
- `build [-v]`: build the website (default). Use `-v` for verbose.
- `serve`, `server`: run an HTTP server of the output on port 8080.
- `clean`: cleans build files.
- `help`: show help information.
- `version`: show Isidore version number.
@ -47,7 +48,7 @@ please take a look at what needs to be done in the [roadmap](/ROADMAP.md), or
check if there are any to-do comments in the code:
```bash
grep -r "TODO" src/
grep "TODO" isidore.sh
```
## License & Copyright

1
example/.isidore-version Normal file
View File

@ -0,0 +1 @@
0.1.0

5
example/config.php Normal file
View File

@ -0,0 +1,5 @@
<?php
$site_name = "New Project";
$site_author = "Nicolás A. Ortega Froysa";
$site_url = "http://example.com/";
?>

23
example/site/blog.html.php Normal file
View File

@ -0,0 +1,23 @@
<?php
$title = "Blog";
include("templates/header.html.php");
?>
<p>
Welcome to my blog page! Here's a list of my current entries:
</p>
<ul>
<?php
foreach(glob("site/blog/*.cfg.php") as $i)
{
include($i);
$entry_file = substr($i, 4, -8) . '.html';
echo "<li><a href='$entry_file'>$blog_date - $blog_title</a></li>";
}
?>
</ul>
<?php
include("templates/footer.html.php");
?>

4
example/site/blog/000-first.cfg.php Normal file
View File

@ -0,0 +1,4 @@
<?php
$blog_title = "My First Post";
$blog_date = "2022-11-07";
?>

9
example/site/blog/000-first.html.php Normal file
View File

@ -0,0 +1,9 @@
<?php
include("site/blog/000-first.cfg.php");
$title = $blog_title;
include("templates/header.html.php");
?>
<p>My first blog post.</p>
<?php
include("templates/footer.html.php");
?>

10
example/site/index.html.php Normal file
View File

@ -0,0 +1,10 @@
<?php
$title = "Home";
include("templates/header.html.php");
?>
<p>
Hello, World! This is an example page.
</p>
<?php
include("templates/footer.html.php");
?>

1
example/site/static-file.txt Normal file
View File

@ -0,0 +1 @@
A test file.

2
example/templates/footer.html.php Normal file
View File

@ -0,0 +1,2 @@
</body>
</html>

7
example/templates/header.html.php Normal file
View File

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title><?= $title ?> | <?= $site_name?></title>
</head>
<body>
<h1><?= $title ?></h1>

98
isidore.sh
View File

@ -26,6 +26,11 @@ ISIDORE_AUTHOR_NAME=""
PROG_NAME=$0
PROJECT_NAME="Isidore"
SOURCE_DIR="site/"
TMP_DIR="/tmp/isidore-workdesk/"
OUTPUT_DIR="output/"
TEMPLATE_DIR="templates/"
##
# Create the configuration file. This function is called if it does not already
# exist.
@ -90,6 +95,8 @@ function print_help()
Create a new Isidore project (use interactive mode with '-i')
build
Build the project rooted in the current directory
serve | server
Serve a local HTTP server of the output directory on port 8080
clean
Clean the built files
version
@ -132,8 +139,8 @@ function new_project()
read NEW_PROJECT_URL
fi
mkdir $NEW_PROJECT_DIR
mkdir -p $NEW_PROJECT_DIR/site/
mkdir -p $NEW_PROJECT_DIR/templates/
mkdir -p $NEW_PROJECT_DIR/$SOURCE_DIR
mkdir -p $NEW_PROJECT_DIR/$TEMPLATE_DIR
echo \
"<?php
\$site_name = \"$NEW_PROJECT_NAME\";
@ -153,43 +160,69 @@ function new_project()
function clean_project()
{
check_in_project
if [ -d "./output/" ]
if [ -d "$OUTPUT_DIR" ]
then
rm -r ./output/
rm -r $OUTPUT_DIR
fi
echo "Project cleaned."
}
##
# Build the project.
#
# Params:
# $1 - Verbose flag
##
function build_project()
{
check_in_project
mkdir -p ./output/
WORKDESK="/tmp/isidore-workdesk"
CFG_HEADER_FILE="$WORKDESK/config-header.php"
mkdir -p $WORKDESK
for i in $(find site/ -name '*.php')
CFG_HEADER_FILE="$TMP_DIR/config-header.php"
mkdir -p $OUTPUT_DIR
mkdir -p $TMP_DIR
echo "<?php include(getcwd() . '/config.php'); ?>" > $CFG_HEADER_FILE
for i in $(find $SOURCE_DIR -type d)
do
echo "<?php include getcwd() . '/config.php'; ?>" > $CFG_HEADER_FILE
mkdir -p $WORKDESK/${i%/*}
cat $CFG_HEADER_FILE $i > $WORKDESK/$i
# the 4 offset is to avoid including `site/`
: ${i:4}
OUT_DIR="./output/${_%/*}"
mkdir -p $OUT_DIR
: ${i: :-4}
OUT_FILE="$OUT_DIR/${_##*/}"
php $WORKDESK/$i > $OUT_FILE
mkdir -p $OUTPUT_DIR/${i:${#SOURCE_DIR}}
mkdir -p $TMP_DIR/$i
done
rm -r $WORKDESK
for i in $(find $SOURCE_DIR -name '*.php' -not -name '*.cfg.php')
do
cat $CFG_HEADER_FILE $i > $TMP_DIR/$i
: ${i:${#SOURCE_DIR}}
OUT_FILE="$OUTPUT_DIR/${_: :-4}"
if [ $1 == 1 ]
then
echo "Building $OUT_FILE ..."
fi
php $TMP_DIR/$i > $OUT_FILE
done
for i in $(find $SOURCE_DIR -type f -not -name '*.php')
do
OUT_FILE="$OUTPUT_DIR/${i:${#SOURCE_DIR}}"
if [ $1 == 1 ]
then
echo "Copying $OUT_FILE ..."
fi
cp $i $OUT_FILE
done
rm -r $TMP_DIR
}
set_config_vars
if [ $# -lt 1 ]
then
echo "No subcommand was specified. Use the 'help' subcommand."
print_usage
exit 1
fi
case $1 in
new)
if [ $# -lt 2 ]
@ -210,15 +243,32 @@ case $1 in
then
NEW_DIR="$i"
else
echo "Unknown argument for new '$i'. Use the 'help' command."
echo "Unknown argument for new '$i'. Use the 'help' subcommand."
print_usage
exit 1
fi
fi;;
esac
done
new_project $NEW_DIR $INTERACTIVE;;
build)
build_project;;
VERBOSE=0
if [ $# -gt 1 ]
then
for i in ${@:2}
do
case $i in
-v)
VERBOSE=1;;
*)
echo "Unknown argument for build '$i'. Use the 'help' subcommand."
print_usage
exit 1;;
esac
done
fi
build_project $VERBOSE;;
serve|server)
php -S localhost:8080 -t $OUTPUT_DIR/;;
clean)
clean_project;;
help)
@ -226,7 +276,7 @@ case $1 in
version)
echo "$PROJECT_NAME v$ISIDORE_VERSION";;
*)
echo "Unknown command $1. Use the 'help' command."
echo "Unknown command $1. Use the 'help' subcommand."
print_usage
exit 1;;
esac